alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-17 23:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(panic_handler): Updated panic handler to use RTC WDT

Browse Source 
This commit updates the following:
- Updates the panic handler to use only the RTC WDT to reset the system.
- Refactors some of the panic handler code.
- Updates Bluetooth files where in they now feed the WDTs instead of
  reconfiguring them.
- Removes some unnecessary configuration of WDTs from various files.
- Added a unit test to verify that the system does not lock up when the
  panic handler is stuck.
- Updates the memprot unit tests to work with the refactored panic
  handler.

Closes https://github.com/espressif/esp-idf/issues/15166
Closes https://github.com/espressif/esp-idf/issues/15018
Closes https://github.com/espressif/esp-idf/issues/10110
This commit is contained in:
Sudeep Mohanty
2025-01-27 17:48:09 +01:00
parent 96876be6c7
commit ed720503fb
19 changed files with 573 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tools/test_apps/system/memprot/main/esp32s3/test_panic.c
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -12,10 +12,11 @@ extern void esp_panic_handler(panic_info_t *info);
extern volatile bool g_override_illegal_instruction;
void __real_esp_panic_handler(panic_info_t *info);
void __real_esp_panic_handler_reconfigure_wdts(void);
void __real_esp_panic_handler_feed_wdts(void);
void __real_esp_panic_handler_enable_rtc_wdt(uint32_t timeout_ms);
void __real_esp_panic_handler_increment_entry_count(void);
void __real_esp_cpu_stall(int core_id);
static void disable_all_wdts(void)
{
wdt_hal_context_t wdt0_context = {.inst = WDT_MWDT0, .mwdt_dev = &TIMERG0};
@@ -30,11 +31,17 @@ static void disable_all_wdts(void)
wdt_hal_write_protect_enable(&wdt0_context);
#if SOC_TIMER_GROUPS >= 2
//Interupt WDT is the Main Watchdog Timer of Timer Group 1
//Interrupt WDT is the Main Watchdog Timer of Timer Group 1
wdt_hal_write_protect_disable(&wdt1_context);
wdt_hal_disable(&wdt1_context);
wdt_hal_write_protect_enable(&wdt1_context);
#endif
//Disable RTC WDT
wdt_hal_context_t rtc_wdt_ctx = RWDT_HAL_CONTEXT_DEFAULT();
wdt_hal_write_protect_disable(&rtc_wdt_ctx);
wdt_hal_disable(&rtc_wdt_ctx);
wdt_hal_write_protect_enable(&rtc_wdt_ctx);
}
/* Memprot test specific IllegalInstruction exception handler:
@@ -59,13 +66,31 @@ void __wrap_esp_panic_handler(panic_info_t *info)
}
}
void __wrap_esp_panic_handler_reconfigure_wdts(void)
void __wrap_esp_panic_handler_feed_wdts(void)
{
if ( g_override_illegal_instruction == true ) {
disable_all_wdts();
return;
} else {
__real_esp_panic_handler_reconfigure_wdts();
__real_esp_panic_handler_feed_wdts();
}
}
void __wrap_esp_panic_handler_enable_rtc_wdt(uint32_t timeout_ms)
{
if ( g_override_illegal_instruction == true ) {
return;
} else {
__real_esp_panic_handler_enable_rtc_wdt(timeout_ms);
}
}
void __wrap_esp_panic_handler_increment_entry_count(void)
{
if ( g_override_illegal_instruction == true ) {
return;
} else {
__real_esp_panic_handler_increment_entry_count();
}
}