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

Merge branch 'bugfix/rtc_brownout_isr_handler_stall' into 'master'

Browse Source 
system: fix brownout ISR triggering assert on single-core configs.

Closes IDFGH-7939

See merge request espressif/esp-idf!19304
This commit is contained in:
Marius Vikhammer
2022-08-02 10:38:29 +08:00
parent 5d23a757d6 0f555b2a1d
commit 67d0a10548
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_system/port/brownout.c
View File

@@ -41,8 +41,14 @@ IRAM_ATTR static void rtc_brownout_isr_handler(void *arg)
* cleared manually. * cleared manually.
*/ */
brownout_hal_intr_clear(); brownout_hal_intr_clear();
// Stop the other core. // Stop the other core.
esp_cpu_stall(!esp_cpu_get_core_id()); #if !CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE
const uint32_t core_id = esp_cpu_get_core_id();
const uint32_t other_core_id = (core_id == 0) ? 1 : 0;
esp_cpu_stall(other_core_id);
#endif
esp_reset_reason_set_hint(ESP_RST_BROWNOUT); esp_reset_reason_set_hint(ESP_RST_BROWNOUT);
#if CONFIG_SPI_FLASH_BROWNOUT_RESET #if CONFIG_SPI_FLASH_BROWNOUT_RESET
if (spi_flash_brownout_need_reset()) { if (spi_flash_brownout_need_reset()) {