michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: arm: core: cortex_m: fix cache disabling in init_arch_hw_at_boot

Browse source 
Use the arch-cache functions instead of the sys-cache-functions
in z_arm_init_arch_hw_at_boot to ensure that the caches are
disabled even when CONFIG_CACHE_MANAGEMENT is disabled.

Signed-off-by: Benedikt Schmidt <benedikt.schmidt@embedded-solutions.at>
This commit is contained in:
Benedikt Schmidt 2023-12-27 17:09:02 +01:00 • committed by Carles Cufí
commit 70c8df7724
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
arch/arm/core/cortex_m/scb.c
View file

@ -21,6 +21,7 @@
#include <cmsis_core.h>
#include <zephyr/linker/linker-defs.h>
#include <zephyr/cache.h>
#include <zephyr/arch/cache.h>
#if defined(CONFIG_CPU_HAS_NXP_MPU)
#include <fsl_sysmpu.h>
@ -120,15 +121,27 @@ void z_arm_init_arch_hw_at_boot(void)
* reset it to a known clean state.
*/
if (SCB->CCR & SCB_CCR_DC_Msk) {
sys_cache_data_disable();
/*
* Do not use sys_cache_data_disable at this point, but instead
* the architecture specific function. This ensures that the
* cache is disabled although CONFIG_CACHE_MANAGEMENT might be
* disabled.
*/
SCB_DisableDCache();
} else {
sys_cache_data_invd_all();
SCB_InvalidateDCache();
}
#endif /* CONFIG_DCACHE */
#if defined(CONFIG_ICACHE)
/* Reset I-Cache settings. */
sys_cache_instr_disable();
/*
* Reset I-Cache settings.
* Do not use sys_cache_data_disable at this point, but instead
* the architecture specific function. This ensures that the
* cache is disabled although CONFIG_CACHE_MANAGEMENT might be
* disabled.
*/
SCB_DisableICache();
#endif /* CONFIG_ICACHE */
#endif /* CONFIG_ARCH_CACHE */