From 7f0ab52b123cdef306fb085db740ade4a6435e65 Mon Sep 17 00:00:00 2001
From: Bowen Wang <wangbowen6@xiaomi.com>
Date: Thu, 2 Nov 2023 18:45:25 +0800
Subject: [PATCH] arm_gicv2: cpu 0 wait other cpu gic init done

After move the SGI irq to group1, other cpu can't response the
sgi request from cpu0 when its gic not initialized.
So let cpu0 wait until all other cpus gic initialize done.

Signed-off-by: Bowen Wang <wangbowen6@xiaomi.com>
---
 arch/arm/src/armv7-a/arm_gicv2.c | 42 ++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/arch/arm/src/armv7-a/arm_gicv2.c b/arch/arm/src/armv7-a/arm_gicv2.c
index 4f1a66912b4..dd676f885d0 100644
--- a/arch/arm/src/armv7-a/arm_gicv2.c
+++ b/arch/arm/src/armv7-a/arm_gicv2.c
@@ -43,6 +43,47 @@
 
 #ifdef CONFIG_ARMV7A_HAVE_GICv2
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#if defined(CONFIG_SMP) && CONFIG_SMP_NCPUS > 1
+static volatile bool g_gic_init_done[CONFIG_SMP_NCPUS];
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: arm_gic_init_done
+ *
+ * Description:
+ *   Indicates gic init done, and only cpu0 need wait the gic initialize
+ *   done. Because cpu1 ~ (CONFIG_SMP_NCPUS - 1) may not response the
+ *   interrupt request by cpu0 when the gic not initialize done.
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_SMP) && CONFIG_SMP_NCPUS > 1
+static void arm_gic_init_done(void)
+{
+  int cpu = up_cpu_index();
+  int i;
+
+  g_gic_init_done[cpu] = true;
+  if (cpu == 0)
+    {
+      for (i = 1; i < CONFIG_SMP_NCPUS; i++)
+        {
+          while (!g_gic_init_done[i]);
+        }
+    }
+}
+#else
+#define arm_gic_init_done()
+#endif
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -326,6 +367,7 @@ void arm_gic_initialize(void)
 
   putreg32(icddcr, GIC_ICDDCR);
   arm_gic_dump("Exit arm_gic_initialize", true, 0);
+  arm_gic_init_done();
 }
 
 /****************************************************************************