diff options
| -rw-r--r-- | arch/arm/mach-tegra/cortex-a9.S | 54 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/power.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/suspend.c | 2 |
3 files changed, 1 insertions, 56 deletions
diff --git a/arch/arm/mach-tegra/cortex-a9.S b/arch/arm/mach-tegra/cortex-a9.S index 30d4ec9a30c7..da571910ca06 100644 --- a/arch/arm/mach-tegra/cortex-a9.S +++ b/arch/arm/mach-tegra/cortex-a9.S @@ -715,60 +715,6 @@ l2_done: b __cortex_a9_restore -/* - * __cortex_a9_l2x0_reenable(void) - * - * This reenables L2 after a power event. It is called from - * tegra_suspend_dram (and differs between default and secureos - * environments). - * - * In a default build, __cortex_a9_l2x0_restart is able to - * restore all the full L2 config from saved state. Note: at - * the time it was saved the L2X0_CTRL would've been disabled, - * but since all the other state had been restored, calling - * l2x0_restart is sufficient. - * - * In a secureos build, __cortex_a9_l2x0_restart is non-secure - * so it can't restore any registers. Like the default path, - * L2X0_CTRL was saved as disabled (and we can't/don't make - * the SMC to have it reenabled). - * - * The problem with just calling l2x0_restart like the default - * build is it doesn't support an update of the AUX_CTRL, so - * would leave it at the POR value. Instead, we make the same - * SMC as l2x0_restart would, but supplying our saved AUX_CTRL. - */ - .align L1_CACHE_SHIFT -ENTRY(__cortex_a9_l2x0_reenable) -#ifndef CONFIG_TRUSTED_FOUNDATIONS - b l2x0_restart -#else - /* nothing to do, if already enabled */ - mov32 r0, (TEGRA_ARM_PL310_BASE-IO_CPU_PHYS+IO_CPU_VIRT) - ldr r1, [r0, #L2X0_CTRL] - cmp r1, #0 - bne reenable_done - - stmfd sp!, {r3-r4} - - ctx_ptr r4, r3 - add r3, r4, #CTX_L2_AUX - ldr r4, [r3] - - ldr r0, =0xFFFFF100 - mov r1, #1 @ restart opcode - mov r2, r4 @ AUX register - ldr r3, =0x00000000 - ldr r4, =0x00000000 - smc 0 - - ldmfd sp!, {r3-r4} -reenable_done: - bx lr -#endif -ENDPROC(__cortex_a9_l2x0_reenable) - - .align L1_CACHE_SHIFT ENTRY(__shut_off_mmu) mrc p15, 0, r3, c1, c0, 0 diff --git a/arch/arm/mach-tegra/power.h b/arch/arm/mach-tegra/power.h index 40fb76733c69..5e462aceef50 100644 --- a/arch/arm/mach-tegra/power.h +++ b/arch/arm/mach-tegra/power.h @@ -130,7 +130,6 @@ void tegra_lp2_in_idle(bool enable); unsigned long tegra_lp2_timer_remain(void); void __cortex_a9_save(unsigned int mode); void __cortex_a9_restore(void); -void __cortex_a9_l2x0_reenable(void); void __shut_off_mmu(void); void tegra_secondary_startup(void); void tegra_lp2_startup(void); diff --git a/arch/arm/mach-tegra/suspend.c b/arch/arm/mach-tegra/suspend.c index 921be57346af..933c9b3e3611 100644 --- a/arch/arm/mach-tegra/suspend.c +++ b/arch/arm/mach-tegra/suspend.c @@ -734,7 +734,7 @@ void tegra_suspend_dram(bool do_lp0) restore_cpu_complex(); #ifdef CONFIG_CACHE_L2X0 - __cortex_a9_l2x0_reenable(); + l2x0_restart(); #endif if (!do_lp0) { |