feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/unstall_other_cpu_on_core_reset_v4.4' into 'release/v4.4'

Browse Source 
bugfix: unstall other cpu on core reset (backport v4.4)

See merge request espressif/esp-idf!21496
This commit is contained in:
Jiang Jiang Jian
2022-12-21 19:55:01 +08:00
parent 1d4f6af1bc e2b299660e
commit c88d8829cf
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/esp_system/esp_system.c
View File

@ -36,10 +36,19 @@ void IRAM_ATTR esp_restart_noos_dig(void)
// switch to XTAL (otherwise we will keep running from the PLL) // switch to XTAL (otherwise we will keep running from the PLL)
rtc_clk_cpu_freq_set_xtal(); rtc_clk_cpu_freq_set_xtal();
#if CONFIG_IDF_TARGET_ESP32 // esp_restart_noos_dig() will generates a core reset, which does not reset the
esp_cpu_unstall(PRO_CPU_NUM); // registers of the RTC domain, so the CPU's stall state remains after the reset,
// we need to release them here
#if !CONFIG_FREERTOS_UNICORE
// Unstall all other cores
int core_id = cpu_hal_get_core_id();
for (uint32_t i = 0; i < SOC_CPU_CORES_NUM; i++) {
if (i != core_id) {
esp_cpu_unstall(i);
}
}
#endif #endif
// reset the digital part // generate core reset
SET_PERI_REG_MASK(RTC_CNTL_OPTIONS0_REG, RTC_CNTL_SW_SYS_RST); SET_PERI_REG_MASK(RTC_CNTL_OPTIONS0_REG, RTC_CNTL_SW_SYS_RST);
while (true) { while (true) {
; ;