LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: v7R: Add support for enabling caches 

Cache maintenance procedure is same for v7A and v7R
processors. So re-use cache-cp15.c file except for
mmu parts.

Tested-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Lokesh Vutla 2018-04-26 18:21:31 +05:30 committed by Tom Rini
parent f2ef204312
commit a43d46a73c
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/cpu/armv7/mpu_v7r.c
View File

@ -106,3 +106,14 @@ void setup_mpu_regions(struct mpu_region_config *rgns, u32 num_rgns)
icache_enable(); icache_enable();
} }
void enable_caches(void)
{
/*
* setup_mpu_regions() might have enabled Icache. So add a check
* before enabling Icache
*/
if (!icache_status())
icache_enable();
dcache_enable();
}

12
arch/arm/lib/cache-cp15.c
View File

@ -8,11 +8,13 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/armv7_mpu.h>
#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF)) #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_SYS_ARM_MMU
__weak void arm_init_before_mmu(void) __weak void arm_init_before_mmu(void)
{ {
} }
@ -201,15 +203,23 @@ static int mmu_enabled(void)
{ {
return get_cr() & CR_M; return get_cr() & CR_M;
} }
#endif /* CONFIG_SYS_ARM_MMU */
/* cache_bit must be either CR_I or CR_C */ /* cache_bit must be either CR_I or CR_C */
static void cache_enable(uint32_t cache_bit) static void cache_enable(uint32_t cache_bit)
{ {
uint32_t reg; uint32_t reg;
/* The data cache is not active unless the mmu is enabled too */ /* The data cache is not active unless the mmu/mpu is enabled too */
#ifdef CONFIG_SYS_ARM_MMU
if ((cache_bit == CR_C) && !mmu_enabled()) if ((cache_bit == CR_C) && !mmu_enabled())
mmu_setup(); mmu_setup();
#elif defined(CONFIG_SYS_ARM_MPU)
if ((cache_bit == CR_C) && !mpu_enabled()) {
printf("Consider enabling MPU before enabling caches\n");
return;
}
#endif
reg = get_cr(); /* get control reg. */ reg = get_cr(); /* get control reg. */
set_cr(reg | cache_bit); set_cr(reg | cache_bit);
} }