espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

pm: prevent interrupt nesting during esp_pm_impl_isr_hook

Browse Source 
Follows the approach proposed in https://github.com/espressif/esp-idf/pull/3110,
but masks the interrupts during the entire ISR hook, not only during
leave_idle. Interrupt nesting during update_ccompare may also cause
issues.

Closes https://github.com/espressif/esp-idf/issues/3057
This commit is contained in:
Ivan Grokhotkov
2019-04-09 13:25:24 +08:00
parent d91272f280
commit 84d16f970e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/esp32/pm_esp32.c
View File

@ -453,6 +453,10 @@ void IRAM_ATTR esp_pm_impl_isr_hook()
{ {
int core_id = xPortGetCoreID(); int core_id = xPortGetCoreID();
ESP_PM_TRACE_ENTER(ISR_HOOK, core_id); ESP_PM_TRACE_ENTER(ISR_HOOK, core_id);
/* Prevent higher level interrupts (than the one this function was called from)
* from happening in this section, since they will also call into esp_pm_impl_isr_hook.
*/
uint32_t state = portENTER_CRITICAL_NESTED();
#if portNUM_PROCESSORS == 2 #if portNUM_PROCESSORS == 2
if (s_need_update_ccompare[core_id]) { if (s_need_update_ccompare[core_id]) {
update_ccompare(); update_ccompare();
@ -463,6 +467,7 @@ void IRAM_ATTR esp_pm_impl_isr_hook()
#else #else
leave_idle(); leave_idle();
#endif // portNUM_PROCESSORS == 2 #endif // portNUM_PROCESSORS == 2
portEXIT_CRITICAL_NESTED(state);
ESP_PM_TRACE_EXIT(ISR_HOOK, core_id); ESP_PM_TRACE_EXIT(ISR_HOOK, core_id);
} }