feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/xtensa_startup_stack' into 'master'

Browse Source 
fix(system): fixed potential double exception when booting on xtensa

Closes IDFGH-13515

See merge request espressif/esp-idf!33190
This commit is contained in:
Marius Vikhammer
2024-09-29 10:18:12 +08:00
parent e770372810 4bf8d49159
commit 794cf2ea0e
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/port.c
View File

@@ -348,6 +348,11 @@ BaseType_t xPortStartScheduler( void )
}
#endif // configNUM_CORES > 1
// Windows contain references to the startup stack which will be reclaimed by the main task
// Spill the windows to create a clean environment to ensure we do not carry over any such references
// to invalid SPs which will cause problems if main_task does a windowoverflow to them
xthal_window_spill();
// Cannot be directly called from C; never returns
__asm__ volatile ("call0 _frxt_dispatch\n");

5
components/freertos/FreeRTOS-Kernel/portable/xtensa/port.c
View File

@@ -108,6 +108,11 @@ BaseType_t xPortStartScheduler( void )
port_xSchedulerRunning[xPortGetCoreID()] = 1;
// Windows contain references to the startup stack which will be reclaimed by the main task
// Spill the windows to create a clean environment to ensure we do not carry over any such references
// to invalid SPs which will cause problems if main_task does a windowoverflow to them
xthal_window_spill();
// Cannot be directly called from C; never returns
__asm__ volatile ("call0 _frxt_dispatch\n");