From d3d0b0fd7e32489c827d6a7c8357360161cc070a Mon Sep 17 00:00:00 2001
From: hebinglin <hebinglin@espressif.com>
Date: Mon, 5 Jan 2026 15:50:57 +0800
Subject: [PATCH] fix(esp_hal_wdt): replace the erroneous RWDT timeout config
 in ROM with the code in ram

---
 components/esp_hal_wdt/esp32p4/rom.wdt.ld    |  2 +-
 components/esp_hal_wdt/include/hal/wdt_hal.h |  2 +-
 components/esp_hal_wdt/rom_patch.c           | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/components/esp_hal_wdt/esp32p4/rom.wdt.ld b/components/esp_hal_wdt/esp32p4/rom.wdt.ld
index 6b872fa581..ed3bfd3d81 100644
--- a/components/esp_hal_wdt/esp32p4/rom.wdt.ld
+++ b/components/esp_hal_wdt/esp32p4/rom.wdt.ld
@@ -20,7 +20,7 @@
 /* Functions */
 wdt_hal_init = 0x4fc001fc;
 wdt_hal_deinit = 0x4fc00200;
-wdt_hal_config_stage = 0x4fc00204;
+rom_wdt_hal_config_stage = 0x4fc00204;
 wdt_hal_write_protect_disable = 0x4fc00208;
 wdt_hal_write_protect_enable = 0x4fc0020c;
 wdt_hal_enable = 0x4fc00210;
diff --git a/components/esp_hal_wdt/include/hal/wdt_hal.h b/components/esp_hal_wdt/include/hal/wdt_hal.h
index eb6a8aa382..da9c9f5d09 100644
--- a/components/esp_hal_wdt/include/hal/wdt_hal.h
+++ b/components/esp_hal_wdt/include/hal/wdt_hal.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/components/esp_hal_wdt/rom_patch.c b/components/esp_hal_wdt/rom_patch.c
index 4f31da8c4a..659ffa9796 100644
--- a/components/esp_hal_wdt/rom_patch.c
+++ b/components/esp_hal_wdt/rom_patch.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -113,4 +113,17 @@ void wdt_hal_deinit(wdt_hal_context_t *hal)
     //Deinit HAL context
     hal->mwdt_dev = NULL;
 }
+
+#if SOC_IS(ESP32P4)
+extern void rom_wdt_hal_config_stage(wdt_hal_context_t *hal, wdt_stage_t stage, uint32_t timeout, wdt_stage_action_t behavior);
+
+/* rwdt_ll_config_stage is implemented erroneously in ESP32P4 rom code, TODO: PM-654*/
+void wdt_hal_config_stage(wdt_hal_context_t *hal, wdt_stage_t stage, uint32_t timeout_ticks, wdt_stage_action_t behavior)
+{
+    if (hal->inst == WDT_RWDT && stage == WDT_STAGE0) {
+        timeout_ticks = timeout_ticks >> (1 + REG_GET_FIELD(EFUSE_RD_REPEAT_DATA1_REG, EFUSE_WDT_DELAY_SEL));
+    }
+    rom_wdt_hal_config_stage(hal, stage, timeout_ticks, behavior);
+}
+#endif // SOC_IS(ESP32P4)
 #endif // ESP_ROM_WDT_INIT_PATCH