michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arm: aarch32: Use proper sys functions for cache mainteinance

Browse source 
This patchset is fixing two things:

1. The proper sys_* functions are used for cache mainteinance
   operations.

2. To check the status of the L1 cache the SCB registers are probed so
   the code is assuming a core architecture cache is present, thus make
   the code conditionally compiled on CONFIG_ARCH_CACHE.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione 2023-01-10 16:33:11 +01:00 • committed by Anas Nashif
commit 34e0294652
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/core/aarch32/cortex_m/scb.c
View file

@ -19,6 +19,7 @@
#include <zephyr/sys/util.h> #include <zephyr/sys/util.h>
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h> #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
#include <zephyr/linker/linker-defs.h> #include <zephyr/linker/linker-defs.h>
#include <zephyr/cache.h>
#if defined(CONFIG_CPU_HAS_NXP_MPU) #if defined(CONFIG_CPU_HAS_NXP_MPU)
#include <fsl_sysmpu.h> #include <fsl_sysmpu.h>
@ -108,6 +109,7 @@ void z_arm_init_arch_hw_at_boot(void)
NVIC->ICPR[i] = 0xFFFFFFFF; NVIC->ICPR[i] = 0xFFFFFFFF;
} }
#if defined(CONFIG_ARCH_CACHE)
#if defined(CONFIG_DCACHE) #if defined(CONFIG_DCACHE)
/* Reset D-Cache settings. If the D-Cache was enabled, /* Reset D-Cache settings. If the D-Cache was enabled,
* SCB_DisableDCache() takes care of cleaning and invalidating it. * SCB_DisableDCache() takes care of cleaning and invalidating it.
@ -115,16 +117,17 @@ void z_arm_init_arch_hw_at_boot(void)
* reset it to a known clean state. * reset it to a known clean state.
*/ */
if (SCB->CCR & SCB_CCR_DC_Msk) { if (SCB->CCR & SCB_CCR_DC_Msk) {
SCB_DisableDCache(); sys_cache_data_disable();
} else { } else {
SCB_InvalidateDCache(); sys_cache_data_invd_all();
} }
#endif /* CONFIG_DCACHE */ #endif /* CONFIG_DCACHE */
#if defined(CONFIG_ICACHE) #if defined(CONFIG_ICACHE)
/* Reset I-Cache settings. */ /* Reset I-Cache settings. */
SCB_DisableICache(); sys_cache_instr_disable();
#endif /* CONFIG_ICACHE */ #endif /* CONFIG_ICACHE */
#endif /* CONFIG_ARCH_CACHE */
/* Restore Interrupts */ /* Restore Interrupts */
__enable_irq(); __enable_irq();