Revert "arm: tegra: Enable speculative line fill in SCU."
Krishna Reddy [Wed, 22 Aug 2012 01:51:22 +0000 (18:51 -0700)]
This reverts commit 06c880a6086183173c361b4a9d4f8047c6a39769.
This CL is reverted as it causes write perf regression with lmbench(bw_mem)
benchmark.
Bug 1026077

Change-Id: I7ff9ffbfe74e2083aa43cab75b694b1c61987bc3
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/125097
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>

arch/arm/mach-tegra/headsmp.S
arch/arm/mach-tegra/platsmp.c

index 59345cf..2fa9638 100644 (file)
@@ -82,9 +82,6 @@ ENTRY(tegra_resume)
        mov32   r0, TEGRA_ARM_PERIF_BASE
        ldr     r1, [r0]
        orr     r1, r1, #1
-#if defined(CONFIG_HAVE_ARM_SCU)
-       orr     r1, r1, #(1 << 3)       @ Enabled SCU speculative line fill.
-#endif
        str     r1, [r0]
 
 #ifdef CONFIG_TRUSTED_FOUNDATIONS
index b2261b0..dbd3024 100644 (file)
@@ -296,13 +296,5 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus)
           smp_init_cpus() which also means that it did not initialize the
           reset handler. Do it now before the secondary CPUs are started. */
        tegra_cpu_reset_handler_init();
-
-#if defined(CONFIG_HAVE_ARM_SCU)
-       {
-               u32 scu_ctrl = __raw_readl(scu_base) | 1 << 3;
-               if (!(scu_ctrl & 1))
-                       __raw_writel(scu_ctrl, scu_base);
-       }
-#endif
        scu_enable(scu_base);
 }