Skip to content

Commit

Permalink
Merge branch 'bugfix/esp32s3_int_wdt' into 'master'
Browse files Browse the repository at this point in the history
system: disable interrupts in esp_restart_noos_dig to fix infinite int_wdt on ESP32-S3

Closes IDF-6559

See merge request espressif/esp-idf!21755
  • Loading branch information
Dazza0 committed Dec 22, 2022
2 parents 0215575 + 0c9ac7d commit 68e1e7d
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions components/esp_system/port/esp_system_chip.c
Expand Up @@ -16,6 +16,15 @@

void IRAM_ATTR esp_restart_noos_dig(void)
{
// In case any of the calls below results in re-enabling of interrupts
// (for example, by entering a critical section), disable all the
// interrupts (e.g. from watchdogs) here.
#ifdef CONFIG_IDF_TARGET_ARCH_RISCV
rv_utils_intr_global_disable();
#else
xt_ints_off(0xFFFFFFFF);
#endif

// make sure all the panic handler output is sent from UART FIFO
if (CONFIG_ESP_CONSOLE_UART_NUM >= 0) {
esp_rom_uart_tx_wait_idle(CONFIG_ESP_CONSOLE_UART_NUM);
Expand Down

0 comments on commit 68e1e7d

Please sign in to comment.