summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2015-05-18 16:09:43 +0000
committerLuka Perkov <luka.perkov@sartura.hr>2015-06-14 17:48:28 +0200
commit5730360efc153aefaddb980287a3b3c8eab26351 (patch)
tree3fa3e313a14b66dffc7ec6a15cdb09f117f42b4b /arch
parenta0aad12346b2cc848b8d592067ca74cb6a1721f8 (diff)
downloadtalos-obmc-uboot-5730360efc153aefaddb980287a3b3c8eab26351.tar.gz
talos-obmc-uboot-5730360efc153aefaddb980287a3b3c8eab26351.zip
arm: mvebu: Disable L2 cache before enabling d-cache
L2 cache may still be enabled by the BootROM. We need to first disable it before enabling d-cache support. Signed-off-by: Stefan Roese <sr@denx.de> Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mvebu/cpu.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 04681fc5a0..417fc35149 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <netdev.h>
#include <asm/io.h>
+#include <asm/pl310.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
@@ -240,6 +241,13 @@ int cpu_eth_init(bd_t *bis)
#ifndef CONFIG_SYS_DCACHE_OFF
void enable_caches(void)
{
+ struct pl310_regs *const pl310 =
+ (struct pl310_regs *)CONFIG_SYS_PL310_BASE;
+
+ /* First disable L2 cache - may still be enable from BootROM */
+ if (mvebu_soc_family() == MVEBU_SOC_A38X)
+ clrbits_le32(&pl310->pl310_ctrl, L2X0_CTRL_EN);
+
/* Avoid problem with e.g. neta ethernet driver */
invalidate_dcache_all();
OpenPOWER on IntegriCloud