feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/panic_cache_err_dig_reset_v3.3' into 'release/v3.3'

Browse Source 
esp32: panic: do digital reset if cache error interrupt is set (backport v3.3)

See merge request espressif/esp-idf!7485
This commit is contained in:
Jiang Jiang Jian
2020-02-12 15:30:59 +08:00
parent 72e7978f89 f6e1a12b34
commit 8c3cefca81
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp32/cache_err_int.c
View File

@@ -73,7 +73,6 @@ void esp_cache_err_int_init()
int IRAM_ATTR esp_cache_err_get_cpuid() int IRAM_ATTR esp_cache_err_get_cpuid()
{ {
esp_dport_access_int_pause();
const uint32_t pro_mask = const uint32_t pro_mask =
DPORT_PRO_CPU_DISABLED_CACHE_IA_DRAM1 | DPORT_PRO_CPU_DISABLED_CACHE_IA_DRAM1 |
DPORT_PRO_CPU_DISABLED_CACHE_IA_DROM0 | DPORT_PRO_CPU_DISABLED_CACHE_IA_DROM0 |

2
components/esp32/panic.c
View File

@@ -623,7 +623,7 @@ static __attribute__((noreturn)) void commonErrorHandler(XtExcFrame *frame)
rtc_wdt_disable(); rtc_wdt_disable();
#if CONFIG_ESP32_PANIC_PRINT_REBOOT || CONFIG_ESP32_PANIC_SILENT_REBOOT #if CONFIG_ESP32_PANIC_PRINT_REBOOT || CONFIG_ESP32_PANIC_SILENT_REBOOT
panicPutStr("Rebooting...\r\n"); panicPutStr("Rebooting...\r\n");
if (frame->exccause != PANIC_RSN_CACHEERR) { if (esp_cache_err_get_cpuid() == -1) {
esp_restart_noos(); esp_restart_noos();
} else { } else {
// The only way to clear invalid cache access interrupt is to reset the digital part // The only way to clear invalid cache access interrupt is to reset the digital part