From 59983fe4193541acfd8c7df7bf98139e2ec44d11 Mon Sep 17 00:00:00 2001 From: Krishna Reddy Date: Tue, 21 Aug 2012 18:51:22 -0700 Subject: Revert "arm: tegra: Enable speculative line fill in SCU." 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 Reviewed-on: http://git-master/r/125097 Reviewed-by: Aleksandr Frid --- arch/arm/mach-tegra/headsmp.S | 3 --- arch/arm/mach-tegra/platsmp.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/arch/arm/mach-tegra/headsmp.S b/arch/arm/mach-tegra/headsmp.S index 59345cfb299d..2fa96381f68f 100644 --- a/arch/arm/mach-tegra/headsmp.S +++ b/arch/arm/mach-tegra/headsmp.S @@ -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 diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c index b2261b025310..dbd302414c67 100644 --- a/arch/arm/mach-tegra/platsmp.c +++ b/arch/arm/mach-tegra/platsmp.c @@ -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); } -- cgit v1.2.3