espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-03 10:30:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/panic_handler_reboot_before_halt_v5.4' into 'release/v5.4'

Browse Source 
fix(panic_handler): Fixed a issue where the system reboots before halt (v5.4)

See merge request espressif/esp-idf!41267
This commit is contained in:
Marius Vikhammer
2025-08-19 09:23:21 +08:00
parent e155cfc255 80ad7ec71a
commit 77266e7c11
6 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/esp_system/panic.c
View File

@@ -262,6 +262,14 @@ static inline void disable_all_wdts(void)
wdt_hal_write_protect_enable(&rtc_wdt_ctx);
}
/* IRAM-only halt stub: reset modules, then loop */
void IRAM_ATTR esp_panic_handler_reset_modules_on_exit_and_halt(void)
{
// Do not print or call non-IRAM functions beyond this point
esp_system_reset_modules_on_exit();
ESP_INFINITE_LOOP();
}
/********************** Panic handler functions **********************/
/* This function is called from the panic handler entry point to increment the panic entry count */
@@ -455,10 +463,10 @@ void esp_panic_handler(panic_info_t *info)
panic_print_str("Rebooting...\r\n");
panic_restart();
#else /* CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT || CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT */
esp_panic_handler_feed_wdts();
panic_print_str("CPU halted.\r\n");
esp_system_reset_modules_on_exit();
disable_all_wdts();
ESP_INFINITE_LOOP();
esp_panic_handler_reset_modules_on_exit_and_halt();
#endif /* CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT || CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT */
#endif /* CONFIG_ESP_SYSTEM_PANIC_GDBSTUB */
}

4
tools/test_apps/system/panic/main/include/test_panic.h
View File

@@ -83,6 +83,10 @@ void test_setup_coredump_summary(void);
void test_coredump_summary(void);
#endif
#if CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT
void test_panic_halt(void);
#endif /* CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT */
#ifdef __cplusplus
}
#endif

3
tools/test_apps/system/panic/main/test_app_main.c
View File

@@ -127,6 +127,9 @@ void app_main(void)
HANDLE_TEST(test_name, test_tcb_corrupted);
HANDLE_TEST(test_name, test_panic_handler_stuck0);
HANDLE_TEST(test_name, test_panic_handler_crash0);
#if CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT
HANDLE_TEST(test_name, test_panic_halt);
#endif /* CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT */
#if CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH && CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF
HANDLE_TEST(test_name, test_setup_coredump_summary);
HANDLE_TEST(test_name, test_coredump_summary);

9
tools/test_apps/system/panic/main/test_panic.c
View File

@@ -443,3 +443,12 @@ void test_capture_dram(void)
assert(0);
}
#endif
#if CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT
void test_panic_halt(void)
{
printf("Triggering panic. Device should print 'CPU halted.' and stop.\n");
fflush(stdout);
assert(0);
}
#endif /* CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT */

9
tools/test_apps/system/panic/pytest_panic.py
View File

@@ -1237,3 +1237,12 @@ def test_tcb_corrupted(dut: PanicTestDut, target: str, config: str, test_func_na
expected_backtrace=None,
expected_coredump=coredump_pattern
)
@pytest.mark.generic
@pytest.mark.supported_targets
@pytest.mark.parametrize('config', ['panic_halt'], indirect=True)
def test_panic_halt(dut: PanicTestDut) -> None:
dut.run_test_func('test_panic_halt')
dut.expect_exact('CPU halted.', timeout=30)
dut.expect_none(dut.REBOOT, timeout=3)

5
tools/test_apps/system/panic/sdkconfig.ci.panic_halt Normal file
View File

@@ -0,0 +1,5 @@
# Panic halt CI config
CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=n
CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=n
CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=n