ARM: 6755/1: omap4: l2x0: Populate set_debug() function and enable Errata 727915

Populate the l2x0 set_debug function pointer with OMAP secure call
and enable the PL310 Errata 727915

This patch has dependency on the earlier patch
ARM: l2x0: Errata fix for flush by Way operation can cause data
corruption

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 1a2cf6226a55f8a10adde44d31c808fc40dc57b8..b69fa0a0299ece641814ea3a1f6c1084b5723e4f 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -45,6 +45,7 @@ config ARCH_OMAP4
        select CPU_V7
        select ARM_GIC
        select PL310_ERRATA_588369
+       select PL310_ERRATA_727915
        select ARM_ERRATA_720789
        select ARCH_HAS_OPP
        select PM_OPP if PM

diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index 19268647ce367750af1c419323bd7da3947e6fb3..9ef8c29dd817091bb2b8c49ed2332ba2023dff6c 100644 (file)
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -52,6 +52,12 @@ static void omap4_l2x0_disable(void)
        omap_smc1(0x102, 0x0);
 }
 
+static void omap4_l2x0_set_debug(unsigned long val)
+{
+       /* Program PL310 L2 Cache controller debug register */
+       omap_smc1(0x100, val);
+}
+
 static int __init omap_l2_cache_init(void)
 {
        u32 aux_ctrl = 0;
@@ -99,6 +105,7 @@ static int __init omap_l2_cache_init(void)
         * specific one
        */
        outer_cache.disable = omap4_l2x0_disable;
+       outer_cache.set_debug = omap4_l2x0_set_debug;
 
        return 0;
 }