Merge branch 'bugfix/h4_panic_handler_stuck_fix' into 'master'

ESP-Marius · ESP-Marius · commit cd48833c16ce · 2025-07-09T08:57:02.000+08:00
fix(system): fixed cpu_stall function stuck issue on H4

Closes IDF-12311

See merge request espressif/esp-idf!40420
diff --git a/components/hal/esp32h4/include/hal/cpu_utility_ll.h b/components/hal/esp32h4/include/hal/cpu_utility_ll.h
@@ -32,11 +32,12 @@ FORCE_INLINE_ATTR void cpu_utility_ll_stall_cpu(uint32_t cpu_no)
 {
     if (cpu_no == 0) {
         HAL_FORCE_MODIFY_U32_REG_FIELD(LP_AON.cpucore_cfg, aon_cpu_core0_sw_stall, 0x86);
-        while(!REG_GET_BIT(HP_SYSTEM_CORE_DEBUG_RUNSTALL_CONF_REG, HP_SYSTEM_CORE0_RUNSTALLED));
     } else {
         HAL_FORCE_MODIFY_U32_REG_FIELD(LP_AON.cpucore_cfg, aon_cpu_core1_sw_stall, 0x86);
-        while(!REG_GET_BIT(HP_SYSTEM_CORE_DEBUG_RUNSTALL_CONF_REG, HP_SYSTEM_CORE1_RUNSTALLED));
     }
+    // We do not check stalled status in HP_SYSTEM_CORE_DEBUG_RUNSTALL_CONF_REG here because
+    // it will not be set if the stalled core was in WFI when the stall happens, thus any check
+    // is unreliable
 }
 
 FORCE_INLINE_ATTR void cpu_utility_ll_unstall_cpu(uint32_t cpu_no)

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,12 @@ FORCE_INLINE_ATTR void cpu_utility_ll_stall_cpu(uint32_t cpu_no)`
`32`	`32`	`{`
`33`	`33`	`if (cpu_no == 0) {`
`34`	`34`	`HAL_FORCE_MODIFY_U32_REG_FIELD(LP_AON.cpucore_cfg, aon_cpu_core0_sw_stall, 0x86);`
`35`		`- while(!REG_GET_BIT(HP_SYSTEM_CORE_DEBUG_RUNSTALL_CONF_REG, HP_SYSTEM_CORE0_RUNSTALLED));`
`36`	`35`	`} else {`
`37`	`36`	`HAL_FORCE_MODIFY_U32_REG_FIELD(LP_AON.cpucore_cfg, aon_cpu_core1_sw_stall, 0x86);`
`38`		`- while(!REG_GET_BIT(HP_SYSTEM_CORE_DEBUG_RUNSTALL_CONF_REG, HP_SYSTEM_CORE1_RUNSTALLED));`
`39`	`37`	`}`
	`38`	`+ // We do not check stalled status in HP_SYSTEM_CORE_DEBUG_RUNSTALL_CONF_REG here because`
	`39`	`+ // it will not be set if the stalled core was in WFI when the stall happens, thus any check`
	`40`	`+ // is unreliable`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`FORCE_INLINE_ATTR void cpu_utility_ll_unstall_cpu(uint32_t cpu_no)`