Răsfoiți Sursa

freertos: ensure the interrupt stack is aligned

CONFIG_FREERTOS_ISR_STACKSIZE was set to 2100 when ELF core dump was
enabled, which resulted in a non-16-byte-aligned interrupt stack
offset. This triggered "is SP corrupted" check in the backtrace,
terminating the backtrace early.

Fix the default value, and make sure that the stack is always aligned,
regardless of the value of CONFIG_FREERTOS_ISR_STACKSIZE.
Ivan Grokhotkov 5 ani în urmă
părinte
comite
4e7e8598f3

+ 2 - 2
components/freertos/Kconfig

@@ -174,8 +174,8 @@ menu "FreeRTOS"
 
     config FREERTOS_ISR_STACKSIZE
         int "ISR stack size"
-        range 2100 32768 if ESP32_COREDUMP_DATA_FORMAT_ELF
-        default 2100 if ESP32_COREDUMP_DATA_FORMAT_ELF
+        range 2096 32768 if ESP32_COREDUMP_DATA_FORMAT_ELF
+        default 2096 if ESP32_COREDUMP_DATA_FORMAT_ELF
         range 1536 32768
         default 1536
         help

+ 9 - 3
components/freertos/xtensa/include/freertos/FreeRTOSConfig.h

@@ -196,10 +196,16 @@ int xt_clock_freq(void) __attribute__((deprecated));
 #define configIDLE_TASK_STACK_SIZE CONFIG_FREERTOS_IDLE_TASK_STACKSIZE
 #endif
 
-/* The Xtensa port uses a separate interrupt stack. Adjust the stack size */
-/* to suit the needs of your specific application.                        */
+/* Stack alignment, architecture specifc. Must be a power of two. */
+#define configSTACK_ALIGNMENT			16
+
+/* The Xtensa port uses a separate interrupt stack. Adjust the stack size
+ * to suit the needs of your specific application.
+ * Size needs to be aligned to the stack increment, since the location of
+ * the stack for the 2nd CPU will be calculated using configISR_STACK_SIZE.
+ */
 #ifndef configISR_STACK_SIZE
-#define configISR_STACK_SIZE			CONFIG_FREERTOS_ISR_STACKSIZE
+#define configISR_STACK_SIZE			((CONFIG_FREERTOS_ISR_STACKSIZE + configSTACK_ALIGNMENT - 1) & (~(configSTACK_ALIGNMENT - 1)))
 #endif
 
 /* Minimal heap size to make sure examples can run on memory limited