diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-06 17:17:07 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-22 23:49:26 -0700 |
| commit | 39dc9e7c3b98a7909a427aa29303b387ffba7e18 (patch) | |
| tree | 1225b24efedfb38d3d8221c20d3de042d2028d3c /arch/arm/mach-tegra/sleep.S | |
| parent | 12ff971f1e0bf776742ac0ba53bc7382abea7a7d (diff) | |
arm: tegra: pm: move return address (for cpu_resume) to top of stack
Move the return address for cpu_resume to the top of stack so that
cpu_resume looks more like a normal function.
Original commit: 2fefbcd58590cf33189c6178098e12b31b994b5f
Bug 911002
Change-Id: I275930306a3b4ecb551a32da5f9f26dba53459ec
Acked-by: Frank Hofmann <frank.hofmann@tomtom.com>
Tested-by: Kevin Hilman <khilman@ti.com>
Acked-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Rebase-Id: R54ebcedde6a84a538f44bcec759af88fef0abe4c
Diffstat (limited to 'arch/arm/mach-tegra/sleep.S')
| -rw-r--r-- | arch/arm/mach-tegra/sleep.S | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S index e041f2d5368e..2dab27ce7180 100644 --- a/arch/arm/mach-tegra/sleep.S +++ b/arch/arm/mach-tegra/sleep.S @@ -162,12 +162,11 @@ ENTRY(tegra_cpu_resume_phys) #endif setmode PSR_I_BIT | PSR_F_BIT | SVC_MODE, r1 @ set SVC, irqs off #ifdef MULTI_CPU - @ load v:p, stack, return fn, resume fn - ARM( ldmia r0!, {r1, sp, lr, pc} ) -THUMB( ldmia r0!, {r1, r2, r3, r4} ) + @ load v:p, stack, resume fn + ARM( ldmia r0!, {r1, sp, pc} ) +THUMB( ldmia r0!, {r1, r2, r3} ) THUMB( mov sp, r2 ) -THUMB( mov lr, r3 ) -THUMB( bx r4 ) +THUMB( bx r3 ) #else @ load v:p, stack, return fn ARM( ldmia r0!, {r1, sp, lr} ) @@ -208,6 +207,7 @@ tegra_phys_sleep_sp: .align L1_CACHE_SHIFT ENTRY(tegra_cpu_suspend) #if USE_TEGRA_CPU_SUSPEND + stmfd sp!, {r3} mov r9, lr #ifdef MULTI_CPU mov32 r10, processor @@ -217,7 +217,7 @@ ENTRY(tegra_cpu_suspend) sub sp, sp, r0 @ allocate CPU state on stack mov r0, sp @ save pointer add ip, ip, r1 @ convert resume fn to phys - stmfd sp!, {r1, r2, r3, ip} @ save v:p, virt SP, retfn, phys resume fn + stmfd sp!, {r1, r2, ip} @ save v:p, virt SP, phys resume fn mov lr, pc ldr pc, [r10, #CPU_DO_SUSPEND] @ save CPU state #else @@ -225,7 +225,7 @@ ENTRY(tegra_cpu_suspend) mov32 r0, cpu_suspend_size sub sp, sp, r0 @ allocate CPU state on stack mov r0, sp @ save pointer - stmfd sp!, {r1, r2, r3} @ save v:p, virt SP, return fn + stmfd sp!, {r1, r2, ip} @ save v:p, virt SP, phys resume fn bl cpu_do_suspend #endif dsb |