Skip to content

Commit ea4b3af

Browse files
jaedonamalon
authored andcommitted
MIPS: BMIPS: Fix missing cbr address
Fix NULL pointer access in BMIPS3300 RAC flush. Fixes: 738a3f7 ("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 Cc: <stable@vger.kernel.org> # 4.7+ Patchwork: https://patchwork.linux-mips.org/patch/16423/ Signed-off-by: James Hogan <jhogan@kernel.org>
1 parent 39dae59 commit ea4b3af

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/mips/kernel/smp-bmips.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,11 +591,11 @@ void __init bmips_cpu_setup(void)
591591

592592
/* Flush and enable RAC */
593593
cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG);
594-
__raw_writel(cfg | 0x100, BMIPS_RAC_CONFIG);
594+
__raw_writel(cfg | 0x100, cbr + BMIPS_RAC_CONFIG);
595595
__raw_readl(cbr + BMIPS_RAC_CONFIG);
596596

597597
cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG);
598-
__raw_writel(cfg | 0xf, BMIPS_RAC_CONFIG);
598+
__raw_writel(cfg | 0xf, cbr + BMIPS_RAC_CONFIG);
599599
__raw_readl(cbr + BMIPS_RAC_CONFIG);
600600

601601
cfg = __raw_readl(cbr + BMIPS_RAC_ADDRESS_RANGE);

0 commit comments

Comments
 (0)