diff options
| author | Krishna Reddy <vdumpa@nvidia.com> | 2012-08-21 18:50:09 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-08-24 18:12:02 -0700 |
| commit | d07ff495e37de161764204121324dab6c1e5ff2a (patch) | |
| tree | d41c255f03bbfbda046aaee5a21e03bafee370c3 | |
| parent | 2b7b55a2a52fc714d0074598bb81bae277e6b1e9 (diff) | |
Revert "arm: tegra: scu: Enable IC and SCU standby"
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>
| -rw-r--r-- | arch/arm/mach-tegra/headsmp.S | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/platsmp.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/headsmp.S b/arch/arm/mach-tegra/headsmp.S index 63852b99b3d3..59345cfb299d 100644 --- a/arch/arm/mach-tegra/headsmp.S +++ b/arch/arm/mach-tegra/headsmp.S @@ -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] diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c index d36b18934acd..b2261b025310 100644 --- a/arch/arm/mach-tegra/platsmp.c +++ b/arch/arm/mach-tegra/platsmp.c @@ -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); } |