From b57d6ecc81ca76b6485ae477b4039f02e7678ed8 Mon Sep 17 00:00:00 2001 From: wuzhenghui Date: Tue, 12 Nov 2024 22:04:08 +0800 Subject: [PATCH] fix(esp_pm): fix deadlock in pm_mode switching --- components/esp_pm/pm_impl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/components/esp_pm/pm_impl.c b/components/esp_pm/pm_impl.c index 0b189fc0a3..4f96565581 100644 --- a/components/esp_pm/pm_impl.c +++ b/components/esp_pm/pm_impl.c @@ -108,6 +108,9 @@ #endif static portMUX_TYPE s_switch_lock = portMUX_INITIALIZER_UNLOCKED; +static portMUX_TYPE s_cpu_freq_switch_lock[CONFIG_FREERTOS_NUMBER_OF_CORES] = { + [0 ... (CONFIG_FREERTOS_NUMBER_OF_CORES - 1)] = portMUX_INITIALIZER_UNLOCKED +}; /* The following state variables are protected using s_switch_lock: */ /* Current sleep mode; When switching, contains old mode until switch is complete */ static pm_mode_t s_mode = PM_MODE_CPU_MAX; @@ -638,6 +641,7 @@ static void IRAM_ATTR do_switch(pm_mode_t new_mode) s_is_switching = true; bool config_changed = s_config_changed; s_config_changed = false; + portENTER_CRITICAL_ISR(&s_cpu_freq_switch_lock[core_id]); portEXIT_CRITICAL_ISR(&s_switch_lock); rtc_cpu_freq_config_t new_config = s_cpu_freq_by_mode[new_mode]; @@ -677,6 +681,7 @@ static void IRAM_ATTR do_switch(pm_mode_t new_mode) } portENTER_CRITICAL_ISR(&s_switch_lock); + portEXIT_CRITICAL_ISR(&s_cpu_freq_switch_lock[core_id]); s_mode = new_mode; s_is_switching = false; portEXIT_CRITICAL_ISR(&s_switch_lock);