Merge branch 'fix-bind_int_wdt_to_cache_livelock_fix_v6.0' into 'release/v6.0'

fix(esp_system): bind int_wdt to cache livelock workaround (v6.0)

See merge request espressif/esp-idf!49169
This commit is contained in:
Jiang Jiang Jian
2026-06-29 15:36:59 +08:00
6 changed files with 16 additions and 13 deletions
+2 -2
View File
@@ -46,7 +46,7 @@ _l4_save_ctx:
xt_highint4:
#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX
#if CONFIG_ESP_INT_WDT && CONFIG_ESP32_ECO3_CACHE_LOCK_FIX
/*
Here, Timer2 is used to count a little time(50us).
The subsequent dram0 write operation is blocked due to live lock, which will
@@ -96,7 +96,7 @@ xt_highint4:
rsr a2, EPC1
s32i a2, a0, 24
#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX
#if CONFIG_ESP_INT_WDT && CONFIG_ESP32_ECO3_CACHE_LOCK_FIX
movi a0, 0
xsr a0, XT_REG_INTENABLE /* disable all interrupts */
movi a2, ~(1<<16)