Merge branch 'bugfix/int_wdt_default_psram_v5.5' into 'release/v5.5'

fix(iwdt): increased default timeout if using PSRAM (v5.5)

See merge request espressif/esp-idf!49482
This commit is contained in:
Jiang Jiang Jian
2026-06-17 19:46:31 +08:00
3 changed files with 10 additions and 6 deletions
+2 -2
View File
@@ -458,8 +458,8 @@ menu "ESP System Settings"
config ESP_INT_WDT_TIMEOUT_MS config ESP_INT_WDT_TIMEOUT_MS
int "Interrupt watchdog timeout (ms)" int "Interrupt watchdog timeout (ms)"
depends on ESP_INT_WDT depends on ESP_INT_WDT
default 300 if !(SPIRAM && IDF_TARGET_ESP32) default 300 if !SPIRAM
default 800 if (SPIRAM && IDF_TARGET_ESP32) default 800 if SPIRAM
range 10 10000 range 10 10000
help help
The timeout of the watchdog, in milliseconds. Make this higher than the FreeRTOS tick rate. The timeout of the watchdog, in milliseconds. Make this higher than the FreeRTOS tick rate.
+4 -2
View File
@@ -68,8 +68,10 @@ Configuration
- The IWDT is enabled by default via the :ref:`CONFIG_ESP_INT_WDT` option. - The IWDT is enabled by default via the :ref:`CONFIG_ESP_INT_WDT` option.
- The IWDT's timeout is configured by setting the :ref:`CONFIG_ESP_INT_WDT_TIMEOUT_MS` option. - The IWDT's timeout is configured by setting the :ref:`CONFIG_ESP_INT_WDT_TIMEOUT_MS` option.
- Note that the default timeout is higher if PSRAM support is enabled, as a critical section or interrupt routine that accesses a large amount of PSRAM takes longer to complete in some circumstances. .. list::
- The timeout should always at least twice longer than the period between FreeRTOS ticks (see :ref:`CONFIG_FREERTOS_HZ`).
:SOC_SPIRAM_SUPPORTED: - Note that the default timeout is higher if PSRAM support is enabled, as a critical section or interrupt routine that accesses a large amount of PSRAM takes longer to complete in some circumstances.
- The configured timeout duration for IWDT should always be at least twice longer than the period between two FreeRTOS ticks, e.g., if two FreeRTOS ticks occur 10 ms apart, then IWDT timeout duration should at least be more than 20 ms (see :ref:`CONFIG_FREERTOS_HZ`).
Tuning Tuning
^^^^^^ ^^^^^^
+4 -2
View File
@@ -68,8 +68,10 @@ IWDT 利用 {IDF_TARGET_IWDT_TIMER_GROUP} 中的 MWDT_WDT 看门狗定时器作
- IWDT 默认通过 :ref:`CONFIG_ESP_INT_WDT` 选项启用。 - IWDT 默认通过 :ref:`CONFIG_ESP_INT_WDT` 选项启用。
- 通过 :ref:`CONFIG_ESP_INT_WDT_TIMEOUT_MS` 选项设置 IWDT 超时。 - 通过 :ref:`CONFIG_ESP_INT_WDT_TIMEOUT_MS` 选项设置 IWDT 超时。
- 注意,如果启用了 PSRAM 支持,那么默认的超时时间会更长,因为在某些情况下,临界区或中断例程访问大量 PSRAM 需要更长时间。 .. list::
- 超时时间至少应是 FreeRTOS tick 周期的两倍时长(参见 :ref:`CONFIG_FREERTOS_HZ`)。
:SOC_SPIRAM_SUPPORTED: - 注意,如果启用了 PSRAM 支持,那么默认的超时时间会更长,因为在某些情况下,临界区或中断例程访问大量 PSRAM 需要更长时间。
- IWDT 的配置超时时间应至少为 FreeRTOS tick 周期的两倍时长。例如,如果 FreeRTOS tick 周期间隔为 10 毫秒,则 IWDT 的超时时间应至少为 20 毫秒(参见 :ref:`CONFIG_FREERTOS_HZ`)。
调优 调优
^^^^^^ ^^^^^^