diff options
| author | Sang-Hun Lee <sanlee@nvidia.com> | 2012-04-16 10:53:05 -0700 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-04-19 07:39:47 -0700 |
| commit | 73005f0d83526d615387a8f19669013feace1443 (patch) | |
| tree | ad5bc8c871346f902ce9db212d00e9dfa7156f2e /arch/arm/mach-tegra/sleep-t2.S | |
| parent | 357b6cf49ab72b94b1c77e03d7a5fa777f946973 (diff) | |
Revert "ARM: tegra: rethink the cpu suspend-resume code path"
This reverts commit f31ca2d9e0580b58dc51fde31fc8ace190dd253b.
Bug 967887
Change-Id: I3fe975f7a6939cace5e208947bcb82e09008c0ac
Signed-off-by: Sang-Hun Lee <sanlee@nvidia.com>
Reviewed-on: http://git-master/r/96787
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/sleep-t2.S')
| -rw-r--r-- | arch/arm/mach-tegra/sleep-t2.S | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/arch/arm/mach-tegra/sleep-t2.S b/arch/arm/mach-tegra/sleep-t2.S index fc7b3db22318..6289541da8e9 100644 --- a/arch/arm/mach-tegra/sleep-t2.S +++ b/arch/arm/mach-tegra/sleep-t2.S @@ -179,29 +179,25 @@ ENDPROC(tegra2_cpu_is_resettable_soon) * enters suspend in LP0 or LP1 by turning off the mmu and jumping to * tegra2_tear_down_core in IRAM */ -ENTRY(tegra2_sleep_core_finish) - bl tegra_cpu_exit_coherency +ENTRY(tegra2_sleep_core) + mov r12, pc @ return here is via r12 + b tegra_cpu_save mov32 r1, tegra2_tear_down_core mov32 r2, tegra2_iram_start sub r1, r1, r2 mov32 r2, TEGRA_IRAM_CODE_AREA add r1, r1, r2 b tegra_turn_off_mmu -ENDPROC(tegra2_sleep_core_finish) +ENDPROC(tegra2_sleep_core) /* * tegra2_sleep_wfi(unsigned long v2p) */ ENTRY(tegra2_sleep_wfi) - stmfd sp!, {r4 - r9, lr} - mov r9, sp @ save sp for aborted suspend - adr r1, BSYM(tegra_sleep_cpu_save_finish) - bl cpu_suspend - ldmfd sp!, {r4 - r9, pc} - -tegra_sleep_cpu_save_finish: - mrc p15, 0, r11, c1, c0, 1 @ save actlr before exiting coherency - bl tegra_cpu_exit_coherency + mrc p15, 0, r2, c1, c0, 1 @ save actlr before exiting coherency + mov r12, pc @ return here is via r12 + b tegra_cpu_save + mov r11, r2 mov32 r0, TEGRA_PMC_VIRT + PMC_SCRATCH41 mov r3, #CPU_RESETTABLE @@ -223,7 +219,7 @@ tegra_sleep_cpu_save_finish: * r11 contains the original actlr */ - mov sp, r9 @ restore SP for aborted suspend + mov sp, r7 @ restore SP for aborted suspend bl tegra_pen_lock mov32 r3, TEGRA_PMC_VIRT @@ -266,7 +262,8 @@ tegra_sleep_cpu_save_finish: no_l2_sync: #endif - ldmfd sp!, {r4 - r9, pc} + pop_ctx_regs r0, r1 @ restore context registers + mov pc, lr ENDPROC(tegra2_sleep_wfi) /* |