blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 17:49:10 -04:00
Code Issues Projects Releases Wiki Activity

fix(esp_pm): fix deadlock in pm_mode switching

Browse Source
This commit is contained in:
wuzhenghui 2024-11-12 22:04:08 +08:00
parent 2607022204
commit b57d6ecc81
No known key found for this signature in database
GPG Key ID: 3EFEDECDEBA39BB9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/esp_pm/pm_impl.c
View File

@ -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);