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

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

Browse Source 
fix(esp_system): fix possible cache_error by another core accessing flash in esp_restart (v5.4)

See merge request espressif/esp-idf!37586
This commit is contained in:
Jiang Jiang Jian
2025-03-10 21:04:24 +08:00
parent 9fcb33d3ac 6de3fde3c2
commit 8e031cf8c3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/esp_system/port/soc/esp32s3/system_internal.c
View File

@ -1,6 +1,6 @@
/* /*
* SPDX-FileCopyrightText: 2018-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2018-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -102,10 +102,6 @@ void IRAM_ATTR esp_restart_noos(void)
} }
#endif #endif
// Disable cache
Cache_Disable_ICache();
Cache_Disable_DCache();
// Reset and stall the other CPU. // Reset and stall the other CPU.
// CPU must be reset before stalling, in case it was running a s32c1i // CPU must be reset before stalling, in case it was running a s32c1i
// instruction. This would cause memory pool to be locked by arbiter // instruction. This would cause memory pool to be locked by arbiter
@ -117,6 +113,10 @@ void IRAM_ATTR esp_restart_noos(void)
esp_cpu_stall(other_core_id); esp_cpu_stall(other_core_id);
#endif #endif
// Disable cache
Cache_Disable_ICache();
Cache_Disable_DCache();
// 2nd stage bootloader reconfigures SPI flash signals. // 2nd stage bootloader reconfigures SPI flash signals.
// Reset them to the defaults expected by ROM. // Reset them to the defaults expected by ROM.
WRITE_PERI_REG(GPIO_FUNC0_IN_SEL_CFG_REG, 0x30); WRITE_PERI_REG(GPIO_FUNC0_IN_SEL_CFG_REG, 0x30);