arch/init: call up_color_intstack before up_irq_enable

Make sure interrupt stack is colored before IRQ is enabled.

Currently, after calling irq_initialize in nx_start to
enable interrupts, there is still a period of execution
path before the interrupt stack is colored.

Signed-off-by: guoshengyuan1 <guoshengyuan1@xiaomi.com>

arch/arm/src/a1x/a1x_irq.c

@@ -151,6 +151,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 

arch/arm/src/am335x/am335x_irq.c

@@ -125,6 +125,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/armv8-r/arm_doirq.c

@@ -127,6 +127,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/at32/at32_irq.c

@@ -364,6 +364,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/c5471/c5471_irq.c

@@ -158,6 +158,7 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
+  arm_color_intstack();
   up_irq_restore(PSR_MODE_SYS | PSR_F_BIT);
 #endif
 }

arch/arm/src/common/arm_checkstack.c

@@ -49,6 +49,31 @@
  * Public Functions
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: arm_color_intstack
+ *
+ * Description:
+ *   Set the interrupt stack to a value so that later we can determine how
+ *   much stack space was used by interrupt handling logic
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_ARCH_INTERRUPTSTACK) && CONFIG_ARCH_INTERRUPTSTACK > 3
+void arm_color_intstack(void)
+{
+#ifdef CONFIG_SMP
+  int cpu;
+
+  for (cpu = 0; cpu < CONFIG_SMP_NCPUS; cpu++)
+    {
+      arm_stack_color((void *)up_get_intstackbase(cpu), INTSTACK_SIZE);
+    }
+#else
+  arm_stack_color((void *)g_intstackalloc, INTSTACK_SIZE);
+#endif
+}
+#endif
+
 /****************************************************************************
  * Name: arm_stack_check
  *

arch/arm/src/common/arm_initialize.c

@@ -38,37 +38,6 @@
 
 volatile bool g_interrupt_context[CONFIG_SMP_NCPUS];
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: arm_color_intstack
- *
- * Description:
- *   Set the interrupt stack to a value so that later we can determine how
- *   much stack space was used by interrupt handling logic
- *
- ****************************************************************************/
-
-#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 3
-static inline void arm_color_intstack(void)
-{
-#ifdef CONFIG_SMP
-  int cpu;
-
-  for (cpu = 0; cpu < CONFIG_SMP_NCPUS; cpu++)
-    {
-      arm_stack_color((void *)up_get_intstackbase(cpu), INTSTACK_SIZE);
-    }
-#else
-  arm_stack_color((void *)g_intstackalloc, INTSTACK_SIZE);
-#endif
-}
-#else
-#  define arm_color_intstack()
-#endif
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -98,10 +67,6 @@ void up_initialize(void)
   arm_initialize_stack();
 #endif
 
-  /* Colorize the interrupt stack */
-
-  arm_color_intstack();
-
   /* Add any extra memory fragments to the memory manager */
 
   arm_addregion();

arch/arm/src/common/arm_internal.h

@@ -479,6 +479,13 @@ size_t arm_stack_check(void *stackbase, size_t nbytes);
 void arm_stack_color(void *stackbase, size_t nbytes);
 #endif
 
+#if defined(CONFIG_STACK_COLORATION) &&\
+    defined(CONFIG_ARCH_INTERRUPTSTACK) && CONFIG_ARCH_INTERRUPTSTACK > 3
+void arm_color_intstack(void);
+#else
+#  define arm_color_intstack()
+#endif
+
 #ifdef CONFIG_ARCH_TRUSTZONE_SECURE
 int arm_gen_nonsecurefault(int irq, uint32_t *regs);
 #else

arch/arm/src/csk6/csk6_irq.c

@@ -208,6 +208,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/cxd32xx/cxd32_irq.c

@@ -317,6 +317,7 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/cxd56xx/cxd56_irq.c

@@ -368,6 +368,7 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/dm320/dm320_irq.c

@@ -91,6 +91,7 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
+  arm_color_intstack();
   up_irq_restore(PSR_MODE_SYS | PSR_F_BIT);
 #endif
 }

arch/arm/src/efm32/efm32_irq.c

@@ -366,6 +366,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/eoss3/eoss3_irq.c

@@ -347,6 +347,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/gd32f4/gd32f4xx_irq.c

@@ -371,6 +371,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/goldfish/goldfish_irq.c

@@ -124,6 +124,7 @@ void up_irqinitialize(void)
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/imx1/imx_irq.c

@@ -63,6 +63,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_restore(PSR_MODE_SYS | PSR_F_BIT);
 #endif
 }

arch/arm/src/imx6/imx_irq.c

@@ -149,6 +149,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/imxrt/imxrt_irq.c

@@ -510,6 +510,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/kinetis/kinetis_irq.c

@@ -398,6 +398,7 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/kl/kl_irq.c

@@ -222,6 +222,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/lc823450/lc823450_irq.c

@@ -525,6 +525,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c

@@ -371,6 +371,7 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/lpc214x/lpc214x_irq.c

@@ -74,6 +74,7 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
+  arm_color_intstack();
   up_irq_restore(PSR_MODE_SYS | PSR_F_BIT);
 #endif
 }

arch/arm/src/lpc2378/lpc23xx_irq.c

@@ -87,6 +87,7 @@ void up_irqinitialize(void)
   /* Enable global ARM interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
+  arm_color_intstack();
   up_irq_restore(PSR_MODE_SYS | PSR_F_BIT);
 #endif
 }

arch/arm/src/lpc31xx/lpc31_irq.c

@@ -87,6 +87,7 @@ void up_irqinitialize(void)
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_restore(PSR_MODE_SYS | PSR_F_BIT);
 #endif
 }

arch/arm/src/lpc43xx/lpc43_irq.c

@@ -351,6 +351,7 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/lpc54xx/lpc54_irq.c

@@ -356,6 +356,7 @@ void up_irqinitialize(void)
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/max326xx/common/max326_irq.c

@@ -356,6 +356,7 @@ void up_irqinitialize(void)
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/moxart/moxart_irq.c

@@ -116,6 +116,7 @@ void up_irqinitialize(void)
           getreg32(0x98800020));
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
+  arm_color_intstack();
   up_irq_restore(PSR_MODE_SYS | PSR_F_BIT);
 #endif
 }

arch/arm/src/mps/mps_irq.c

@@ -251,6 +251,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/mx8mp/mx8mp_irq.c

@@ -416,6 +416,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/nrf52/nrf52_irq.c

@@ -362,6 +362,7 @@ void up_irqinitialize(void)
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/nrf53/nrf53_irq.c

@@ -360,6 +360,7 @@ void up_irqinitialize(void)
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/nrf91/nrf91_irq.c

@@ -368,6 +368,7 @@ void up_irqinitialize(void)
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/nuc1xx/nuc_irq.c

@@ -214,6 +214,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/phy62xx/irq.c

@@ -345,6 +345,7 @@ void up_irqinitialize(void)
 
   /* svc(SVC_CALL_WR); */
 
+  arm_color_intstack();
   up_irq_enable();
 
 #endif

arch/arm/src/qemu/qemu_irq.c

@@ -130,6 +130,7 @@ void up_irqinitialize(void)
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/rp2040/rp2040_irq.c

@@ -261,6 +261,7 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/rtl8720c/ameba_nvic.c

@@ -369,6 +369,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 }
 

arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c

@@ -177,6 +177,7 @@ void up_irqinitialize(void)
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c

@@ -391,6 +391,7 @@ void up_irqinitialize(void)
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/s32k3xx/s32k3xx_irq.c

@@ -396,6 +396,7 @@ void up_irqinitialize(void)
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/sam34/sam_irq.c

@@ -420,6 +420,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/sama5/sam_irq.c

@@ -536,6 +536,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/samd2l2/sam_irq.c

@@ -170,6 +170,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/samd5e5/sam_irq.c

@@ -505,6 +505,7 @@ void up_irqinitialize(void)
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
   /* And finally, enable global interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/samv7/sam_irq.c

@@ -429,6 +429,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/stm32/stm32_irq.c

@@ -365,6 +365,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }

arch/arm/src/stm32f0l0g0/stm32_irq.c

@@ -223,6 +223,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
+  arm_color_intstack();
   up_irq_enable();
 #endif
 }