espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp_idf_p4_pm-654_v5.4' into 'release/v5.4'

Browse Source 
fix(esp_hal_wdt): ESP32P4 RTC WDT stage0 timeout set error(v5.4)

See merge request espressif/esp-idf!45306
This commit is contained in:
Jiang Jiang Jian
2026-01-26 10:56:05 +08:00
parent f95a4389f3 c74cee25b5
commit ffaaabc265
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_rom/esp32p4/ld/esp32p4.rom.wdt.ld
+1 -1
View File
@@ -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;
components/esp_rom/patches/esp_rom_wdt.c
+14 -1
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -118,6 +118,19 @@ void wdt_hal_deinit(wdt_hal_context_t *hal)
//Deinit HAL context
hal->mwdt_dev = NULL;
}
#if CONFIG_IDF_TARGET_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 // CONFIG_IDF_TARGET_ESP32P4
#endif // ESP_ROM_WDT_INIT_PATCH
#endif // CONFIG_HAL_WDT_USE_ROM_IMPL
components/hal/include/hal/wdt_hal.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/