| From ea4b3afe1eac8f88bb453798a084fba47a1f155a Mon Sep 17 00:00:00 2001 |
| From: Jaedon Shin <jaedon.shin@gmail.com> |
| Date: Fri, 16 Jun 2017 20:03:01 +0900 |
| Subject: MIPS: BMIPS: Fix missing cbr address |
| |
| From: Jaedon Shin <jaedon.shin@gmail.com> |
| |
| commit ea4b3afe1eac8f88bb453798a084fba47a1f155a upstream. |
| |
| Fix NULL pointer access in BMIPS3300 RAC flush. |
| |
| Fixes: 738a3f79027b ("MIPS: BMIPS: Add early CPU initialization code") |
| Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com> |
| Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> |
| Cc: Kevin Cernekee <cernekee@gmail.com> |
| Cc: linux-mips@linux-mips.org |
| Patchwork: https://patchwork.linux-mips.org/patch/16423/ |
| Signed-off-by: James Hogan <jhogan@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/mips/kernel/smp-bmips.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/arch/mips/kernel/smp-bmips.c |
| +++ b/arch/mips/kernel/smp-bmips.c |
| @@ -587,11 +587,11 @@ void __init bmips_cpu_setup(void) |
| |
| /* Flush and enable RAC */ |
| cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG); |
| - __raw_writel(cfg | 0x100, BMIPS_RAC_CONFIG); |
| + __raw_writel(cfg | 0x100, cbr + BMIPS_RAC_CONFIG); |
| __raw_readl(cbr + BMIPS_RAC_CONFIG); |
| |
| cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG); |
| - __raw_writel(cfg | 0xf, BMIPS_RAC_CONFIG); |
| + __raw_writel(cfg | 0xf, cbr + BMIPS_RAC_CONFIG); |
| __raw_readl(cbr + BMIPS_RAC_CONFIG); |
| |
| cfg = __raw_readl(cbr + BMIPS_RAC_ADDRESS_RANGE); |
