RPi: Enable caches for rpi2

Now that we have support for running with caches enabled in HYP mode,
opt in to that on the Raspberry Pi 2. This brings a significant performance
boost.

Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
index 2315a134382dfd48e09d813e90d9ea1bf8a631dc..1a7baf69e59047c71f0f8c584ea45b7c06930b8e 100644 (file)
--- a/arch/arm/mach-bcm283x/Kconfig
+++ b/arch/arm/mach-bcm283x/Kconfig
@@ -12,6 +12,7 @@ config TARGET_RPI
 config TARGET_RPI_2
        bool "Raspberry Pi 2"
        select CPU_V7
+       select ARMV7_LPAE
 
 endchoice
 

diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
index d2d366ba4f1ed24f405bf1ff5b14590b26591c89..4fa94dbeeb1d4f9d8340c8e6faabcbfc833ad948 100644 (file)
--- a/arch/arm/mach-bcm283x/init.c
+++ b/arch/arm/mach-bcm283x/init.c
@@ -15,3 +15,10 @@ int arch_cpu_init(void)
 
        return 0;
 }
+
+#ifdef CONFIG_ARMV7_LPAE
+void enable_caches(void)
+{
+       dcache_enable();
+}
+#endif

diff --git a/include/configs/rpi_2.h b/include/configs/rpi_2.h
index bea4ebda7facf13a625104946f5ad99482a06b41..13dc8de14315147d798f8074a9e021cf40938125 100644 (file)
--- a/include/configs/rpi_2.h
+++ b/include/configs/rpi_2.h
@@ -10,7 +10,6 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_BCM2836
 #define CONFIG_SYS_CACHELINE_SIZE              64
-#define CONFIG_SYS_DCACHE_OFF
 
 #include "rpi-common.h"