Revert "arm: tegra: scu: Enable IC and SCU standby"
Krishna Reddy [Wed, 22 Aug 2012 01:50:09 +0000 (18:50 -0700)]
This reverts commit b25193d5c3e2c59169c127d23b59123136cfefa7.
This CL is reverted as it causes write perf regression with lmbench(bw_mem)
benchmark.
Bug 1026077

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

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

index 63852b9..59345cf 100644 (file)
@@ -83,9 +83,7 @@ ENTRY(tegra_resume)
        ldr     r1, [r0]
        orr     r1, r1, #1
 #if defined(CONFIG_HAVE_ARM_SCU)
-       orr     r1, r1, #(1 << 3)       @ Enable SCU speculative line fill.
-       orr     r1, r1, #(1 << 5)       @ Enable IC standby.
-       orr     r1, r1, #(1 << 6)       @ Enable SCU standby.
+       orr     r1, r1, #(1 << 3)       @ Enabled SCU speculative line fill.
 #endif
        str     r1, [r0]
 
index d36b189..b2261b0 100644 (file)
@@ -299,10 +299,7 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus)
 
 #if defined(CONFIG_HAVE_ARM_SCU)
        {
-               u32 scu_ctrl = __raw_readl(scu_base) |
-                               1 << 3 | /* Enable speculative line fill*/
-                               1 << 5 | /* Enable IC standby */
-                               1 << 6; /* Enable SCU standby */
+               u32 scu_ctrl = __raw_readl(scu_base) | 1 << 3;
                if (!(scu_ctrl & 1))
                        __raw_writel(scu_ctrl, scu_base);
        }