From c33d5e5a8e1c1587e7b5c5d9d80f5ffb0a793719 Mon Sep 17 00:00:00 2001
From: Kent McLeod <Kent.Mcleod@data61.csiro.au>
Date: Wed, 20 Feb 2019 19:15:06 +1100
Subject: [PATCH] gic_500: Move redist init code to own function
Separate system register initialisation from redistributor register
initialisation
---
src/arch/arm/machine/gic_500.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/arch/arm/machine/gic_500.c b/src/arch/arm/machine/gic_500.c
index fc6f0c8f0..d3e212fd4 100644
--- a/src/arch/arm/machine/gic_500.c
+++ b/src/arch/arm/machine/gic_500.c
@@ -216,7 +216,7 @@ BOOT_CODE static void gicr_locate_interface(void)
}
-BOOT_CODE static void cpu_iface_init(void)
+BOOT_CODE static void gicr_init(void)
{
int i;
uint32_t priority;
@@ -245,6 +245,10 @@ BOOT_CODE static void cpu_iface_init(void)
gic_rdist_sgi_ppi_map[CURRENT_CPU_INDEX()]->icfgrn_rw = 0x0;
gicv3_redist_wait_for_rwp();
+}
+
+BOOT_CODE static void cpu_iface_init(void)
+{
/* Enable system registers */
gicv3_enable_sre();
@@ -277,6 +281,7 @@ BOOT_CODE void cpu_initLocalIRQController(void)
mpidr_map[CURRENT_CPU_INDEX()] = mpidr;
+ gicr_init();
cpu_iface_init();
}
--
GitLab