[v5,6/7] arm_boot: Pass base address of GIC CPU interface, not whole GIC

Message ID CAFEAcA-ufnKtpK8608-nQG+3XWhhnS5UfetuwiZYFaD6PBMBfw@mail.gmail.com
State New
Headers show

Commit Message

Peter Maydell Feb. 15, 2012, 3:13 p.m.
On 15 February 2012 14:36, Peter Maydell <peter.maydell@linaro.org> wrote:
> The arm_boot secondary boot loader code needs the address of
> the GIC CPU interface. Obtaining this from the base address
> of the private peripheral region was possible for A9 and 11MPcore,
> but the A15 puts the GIC CPU interface in a different place.
> So make boards pass in the GIC CPU interface address directly.
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Post-exynos4-landing this is going to need an extra hunk:

I'm not going to rebroadcast the patchset for this minor rebase
fixup, unless anybody specifically wants me to...

-- PMM


diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c
index 329efbe..553a02b 100644
--- a/hw/exynos4_boards.c
+++ b/hw/exynos4_boards.c
@@ -112,7 +112,8 @@  static Exynos4210State *exynos4_boards_init_common(
     exynos4_board_binfo.kernel_filename = kernel_filename;
     exynos4_board_binfo.initrd_filename = initrd_filename;
     exynos4_board_binfo.kernel_cmdline = kernel_cmdline;
-    exynos4_board_binfo.smp_priv_base = EXYNOS4210_SMP_PRIVATE_BASE_ADDR;
+    exynos4_board_binfo.gic_cpu_if_addr =
+            EXYNOS4210_SMP_PRIVATE_BASE_ADDR + 0x100;

     PRINT_DEBUG("\n ram_size: %luMiB [0x%08lx]\n"
             " kernel_filename: %s\n"