espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 21:54:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp_ipc_isr_freertos_deadlock' into 'master'

Browse Source 
esp_system: Workaround esp_ipc_isr_stall_other_cpu() deadlock with SMP FreeRTOS

Closes IDF-5250 and IDF-5251

See merge request espressif/esp-idf!18565
This commit is contained in:
Darian
2022-06-20 16:31:44 +08:00
parent b6e6adddc3 95955ed170
commit 7756b6e2c7
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/esp_system/port/arch/xtensa/esp_ipc_isr.c
View File

@@ -105,6 +105,13 @@ void esp_ipc_isr_waiting_for_finish_cmd(void* finish_cmd);
*/ */
void IRAM_ATTR esp_ipc_isr_stall_other_cpu(void) void IRAM_ATTR esp_ipc_isr_stall_other_cpu(void)
{ {
#if CONFIG_FREERTOS_SMP
/*
Temporary workaround to prevent deadlocking on the SMP FreeRTOS kernel lock after stalling the other CPU.
See IDF-5257
*/
taskENTER_CRITICAL();
#endif
if (s_stall_state == STALL_STATE_RUNNING) { if (s_stall_state == STALL_STATE_RUNNING) {
#if CONFIG_FREERTOS_SMP #if CONFIG_FREERTOS_SMP
BaseType_t intLvl = portDISABLE_INTERRUPTS(); BaseType_t intLvl = portDISABLE_INTERRUPTS();
@@ -145,6 +152,13 @@ void IRAM_ATTR esp_ipc_isr_release_other_cpu(void)
assert(0); assert(0);
} }
} }
#if CONFIG_FREERTOS_SMP
/*
Temporary workaround to prevent deadlocking on the SMP FreeRTOS kernel lock after stalling the other CPU.
See IDF-5257
*/
taskEXIT_CRITICAL();
#endif
} }
void IRAM_ATTR esp_ipc_isr_stall_pause(void) void IRAM_ATTR esp_ipc_isr_stall_pause(void)