ARM: CPU: arm926ejs: Consolidate cache routines to common file
Subsystems (2)
PATCH 1/1 ARM: CPU: arm926ejs: Consolidate cache routines to common file
Four different boards had different options for enabling cache that were virtually all the same. This consolidates these common functions into arch/arm/cpu/arm926ejs/cache.c
This also has the positive side-effect of enabling cache on the Davinci (da850) boards.
Signed-off-by Adam Ford <[email protected]>
--- arch/arm/cpu/arm926ejs/cache.c | 23 +++++++++++++++++++++++ arch/arm/cpu/arm926ejs/mx25/generic.c | 8 -------- arch/arm/cpu/arm926ejs/mx27/generic.c | 8 -------- arch/arm/cpu/arm926ejs/mxs/mxs.c | 10 ---------- arch/arm/cpu/arm926ejs/spear/cpu.c | 10 ---------- 5 files changed, 23 insertions(+), 36 deletions(-)
arch/arm/cpu/arm926ejs/cache.c +23 -0
@@ -65,3 +65,26 @@ __weak void l2_cache_disable(void) {}#if CONFIG_IS_ENABLED (SYS_THUMB_BUILD )__weak void invalidate_l2_cache (void ) {}#endif + +#ifndef CONFIG_SYS_ICACHE_OFF +/* Invalidate entire I-cache and branch predictor array */ +void invalidate_icache_all (void ) +{ +unsigned long i =0 ; + + asm ("mcr p15, 0, %0, c7, c5, 0" : :"r" (i)); +} +#else +void invalidate_icache_all (void ) {} +#endif + +void enable_caches (void ) +{ +#ifndef CONFIG_SYS_ICACHE_OFF +icache_enable (); +#endif +#ifndef CONFIG_SYS_DCACHE_OFF +dcache_enable (); +#endif +} +
arch/arm/cpu/arm926ejs/mx25/generic.c +0 -8
@@ -214,14 +214,6 @@ int print_cpuinfo(void) }#endif -void enable_caches (void ) -{ -#ifndef CONFIG_SYS_DCACHE_OFF -/* Enable D-cache. I-cache is already enabled in start.S */ -dcache_enable (); -#endif -} -#if defined(CONFIG_FEC_MXC )/* * Initializes on-chip ethernet controllers.
arch/arm/cpu/arm926ejs/mx27/generic.c +0 -8
@@ -374,11 +374,3 @@ void mx27_sd2_init_pins(void) }#endif /* CONFIG_MMC_MXC */ - -#ifndef CONFIG_SYS_DCACHE_OFF -void enable_caches (void ) -{ -/* Enable D-cache. I-cache is already enabled in start.S */ -dcache_enable (); -} -#endif /* CONFIG_SYS_DCACHE_OFF */
arch/arm/cpu/arm926ejs/mxs/mxs.c +0 -10
@@ -49,16 +49,6 @@ void reset_cpu(ulong ignored) ; } -void enable_caches (void ) -{ -#ifndef CONFIG_SYS_ICACHE_OFF -icache_enable (); -#endif -#ifndef CONFIG_SYS_DCACHE_OFF -dcache_enable (); -#endif -} -/* * This function will craft a jumptable at 0x0 which will redirect interrupt * vectoring to proper location of U-Boot in RAM.
arch/arm/cpu/arm926ejs/spear/cpu.c +0 -10
@@ -55,16 +55,6 @@ int arch_cpu_init(void)return 0 ; } -void enable_caches (void ) -{ -#ifndef CONFIG_SYS_ICACHE_OFF -icache_enable (); -#endif -#ifndef CONFIG_SYS_DCACHE_OFF -dcache_enable (); -#endif -} -#ifdef CONFIG_DISPLAY_CPUINFO int print_cpuinfo (void ) {
Signature · 1 line
2.17.1
Quoted 8 lines · Adam Ford
Four different boards had different options for enabling cache that were virtually all the same. This consolidates these common functions into
arch/arm/cpu/arm926ejs/cache.cThis also has the positive side-effect of enabling cache on the Davinci (da850) boards.
Signed-off-by Adam Ford <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180911/b13f981c/attachment.sig>