sim: fix sim smp boot regression

This commit fixes the regression from apache#13716 Signed-off-by: hujun5 <[email protected]>
hujun260 · Oct 9, 2024 · d6ce32f · d6ce32f
1 parent a3568af
commit d6ce32f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/arch/sim/src/sim/posix/sim_hostsmp.c b/arch/sim/src/sim/posix/sim_hostsmp.c
@@ -106,6 +106,8 @@ static void *sim_idle_trampoline(void *arg)
 
   host_cpu_started();
 
+  sim_unlock();
+
   /* The idle Loop */
 
   for (; ; )

diff --git a/arch/sim/src/sim/sim_doirq.c b/arch/sim/src/sim/sim_doirq.c
@@ -27,13 +27,23 @@
 #include <stdbool.h>
 #include <nuttx/arch.h>
 #include <sched/sched.h>
+#include <nuttx/init.h>
 
 #include "sim_internal.h"
 
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
+void  sim_unlock(void)
+{
+  /* wait until cpu0 in idle() */
+
+  while (!OSINIT_IDLELOOP());
+
+  sched_unlock();
+}
+
 /****************************************************************************
  * Name: sim_doirq
  ****************************************************************************/

diff --git a/arch/sim/src/sim/sim_internal.h b/arch/sim/src/sim/sim_internal.h
@@ -206,6 +206,7 @@ extern char **g_argv;
 
 void sim_copyfullstate(xcpt_reg_t *dest, xcpt_reg_t *src);
 void *sim_doirq(int irq, void *regs);
+void  sim_unlock(void);
 
 /* sim_hostmisc.c ***********************************************************/
 

diff --git a/include/nuttx/irq.h b/include/nuttx/irq.h
@@ -80,10 +80,7 @@
   do \
     { \
       g_cpu_irqset = 0; \
-      SP_DMB(); \
-      g_cpu_irqlock = SP_UNLOCKED; \
-      SP_DSB(); \
-      SP_SEV(); \
+      spin_unlock_wo_note(&g_cpu_irqlock); \
     } \
   while (0)
 #endif