arm: mvebu: Update CBAR with SOC regs base
authorKevin Smith <kevin.smith@elecsyscorp.com>
Mon, 18 May 2015 16:09:44 +0000 (16:09 +0000)
committerLuka Perkov <luka.perkov@sartura.hr>
Sun, 14 Jun 2015 15:48:28 +0000 (17:48 +0200)
SMP-enabled Linux kernels read the CBAR register in CP15 to find
the address of the SCU registers.  After remapping internal
registers, also update the CBAR so the kernel can find them.

Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Acked-by: Stefan Roese <sr@denx.de>
arch/arm/mach-mvebu/cpu.c

index 417fc35149b538b83911140f79a711d22f095c67..0121db8bb5d838069981158028b2ce506ab6377f 100644 (file)
@@ -161,10 +161,17 @@ static void update_sdram_window_sizes(void)
 }
 
 #ifdef CONFIG_ARCH_CPU_INIT
+static void set_cbar(u32 addr)
+{
+       asm("mcr p15, 4, %0, c15, c0" : : "r" (addr));
+}
+
+
 int arch_cpu_init(void)
 {
        /* Linux expects the internal registers to be at 0xf1000000 */
        writel(SOC_REGS_PHY_BASE, INTREG_BASE_ADDR_REG);
+       set_cbar(SOC_REGS_PHY_BASE + 0xC000);
 
        /*
         * We need to call mvebu_mbus_probe() before calling