Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-03 03:31:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/remove_intwdt_config_critical_for_chips_except_esp32_v6.0' into 'release/v6.0'

Browse Source 
fix(esp_system): remove intwdt config critical area for chips except esp32 (v6.0)

See merge request espressif/esp-idf!48844
This commit is contained in:
Jiang Jiang Jian
2026-05-29 10:27:59 +08:00
parent 97db803782 fcad5f0a1d
commit 3747a7025d
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_system/int_wdt.c
+4 -5
View File
@@ -87,23 +87,22 @@ static esp_err_t esp_int_wdt_retention_enable(uint32_t group_id)
#endif
static wdt_hal_context_t iwdt_context;
static portMUX_TYPE s_iwdt_configure_lock = portMUX_INITIALIZER_UNLOCKED;
static void ESP_SYSTEM_IRAM_ATTR reconfigure_ticks(uint32_t stage0_ticks, uint32_t stage1_ticks)
{
portENTER_CRITICAL_SAFE(&s_iwdt_configure_lock);
wdt_hal_write_protect_disable(&iwdt_context);
wdt_hal_config_stage(&iwdt_context, WDT_STAGE0, stage0_ticks, WDT_STAGE_ACTION_INT);
wdt_hal_config_stage(&iwdt_context, WDT_STAGE1, stage1_ticks, WDT_STAGE_ACTION_RESET_SYSTEM);
wdt_hal_feed(&iwdt_context);
wdt_hal_write_protect_enable(&iwdt_context);
portEXIT_CRITICAL_SAFE(&s_iwdt_configure_lock);
}
#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX
static portMUX_TYPE s_iwdt_configure_lock = portMUX_INITIALIZER_UNLOCKED;
void ESP_SYSTEM_IRAM_ATTR esp_int_wdt_reconfigure_ticks(uint32_t stage0_ticks, uint32_t stage1_ticks)
{
portENTER_CRITICAL_SAFE(&s_iwdt_configure_lock);
reconfigure_ticks(stage0_ticks, stage1_ticks);
portEXIT_CRITICAL_SAFE(&s_iwdt_configure_lock);
}
#endif
@@ -128,7 +127,7 @@ static void ESP_SYSTEM_IRAM_ATTR tick_hook(void)
#endif
#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX
esp_int_wdt_set_livelock_params(CONFIG_ESP_INT_WDT_TIMEOUT_MS);
reconfigure_ticks(esp_int_wdt_livelock_get_feed_stage0_ticks(), IWDT_STAGE1_TIMEOUT_US);
esp_int_wdt_reconfigure_ticks(esp_int_wdt_livelock_get_feed_stage0_ticks(), IWDT_STAGE1_TIMEOUT_US);
#else
reconfigure_ticks(IWDT_STAGE0_TIMEOUT_US, IWDT_STAGE1_TIMEOUT_US);
#endif
components/esp_system/port/soc/esp32/CMakeLists.txt
+1 -1
View File
@@ -4,7 +4,7 @@ set(srcs "highint_hdl.S"
"system_internal.c"
"cache_err_int.c")
if(CONFIG_ESP32_ECO3_CACHE_LOCK_FIX)
if(CONFIG_ESP32_ECO3_CACHE_LOCK_FIX AND CONFIG_ESP_INT_WDT)
list(APPEND srcs "eco3_livelock_workaround.c")
endif()