ARM: CPU: arm926ejs: Consolidate cache routines to common file
Subsystems (4)
PATCH v2 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]>
---
V2: Remove some additional reduant functions causing build issues
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 ) {
arch/arm/mach-at91/arm926ejs/Makefile +0 -1
@@ -16,7 +16,6 @@ obj-$(CONFIG_AT91SAM9N12) += at91sam9n12_devices.o obj-$(CONFIG_AT91SAM9X5) += at91sam9x5_devices.o obj-$(CONFIG_AT91_EFLASH) += eflash.o obj-$(CONFIG_AT91_LED) += led.o -obj-y += cache.o obj-y += clock.o obj-y += cpu.o obj-y += reset.o
arch/arm/mach-at91/arm926ejs/cache.c deleted +0 -28
@@ -1,28 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* (C) Copyright 2016 -* Heiko Schocher, DENX Software Engineering, hs at denx.de. -*/ -#include <linux/types.h> -#include <common.h> - -void enable_caches (void ) -{ -#ifndef CONFIG_SYS_ICACHE_OFF -icache_enable (); -#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
Signature · 1 line
2.17.1