Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fefbcd5 authored by Russell King's avatar Russell King
Browse files

ARM: 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.

Acked-by: default avatarFrank Hofmann <frank.hofmann@tomtom.com>
Tested-by: default avatarKevin Hilman <khilman@ti.com>
Acked-by: default avatarJean Pihet <j-pihet@ti.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6b5f6ab0

arch/arm/kernel/sleep.S

+8 −8
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
 * r0-r3,r9,r10,lr corrupted

 * r0-r3,r9,r10,lr corrupted

 */

 */

ENTRY(cpu_suspend)

ENTRY(cpu_suspend)

	stmfd	sp!, {r3}

	mov	r9, lr

	mov	r9, lr

#ifdef MULTI_CPU

#ifdef MULTI_CPU

	ldr	r10, =processor

	ldr	r10, =processor
@@ -24,7 +25,7 @@ ENTRY(cpu_suspend) 
	sub	sp, sp, r0		@ allocate CPU state on stack

	sub	sp, sp, r0		@ allocate CPU state on stack

	mov	r0, sp			@ save pointer

	mov	r0, sp			@ save pointer

	add	ip, ip, r1		@ convert resume fn to phys

	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

	ldr	r3, =sleep_save_sp

	ldr	r3, =sleep_save_sp

	add	r2, sp, r1		@ convert SP to phys

	add	r2, sp, r1		@ convert SP to phys

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP
@@ -44,7 +45,7 @@ ENTRY(cpu_suspend) 
	sub	sp, sp, r0		@ allocate CPU state on stack

	sub	sp, sp, r0		@ allocate CPU state on stack

	mov	r0, sp			@ save pointer

	mov	r0, sp			@ save pointer

	add	ip, ip, r1		@ convert resume fn to phys

	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

	ldr	r3, =sleep_save_sp

	ldr	r3, =sleep_save_sp

	add	r2, sp, r1		@ convert SP to phys

	add	r2, sp, r1		@ convert SP to phys

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP
@@ -99,7 +100,7 @@ ENDPROC(cpu_resume_turn_mmu_on) 
cpu_resume_after_mmu:

cpu_resume_after_mmu:

	str	r5, [r2, r4, lsl #2]	@ restore old mapping

	str	r5, [r2, r4, lsl #2]	@ restore old mapping

	mcr	p15, 0, r0, c1, c0, 0	@ turn on D-cache

	mcr	p15, 0, r0, c1, c0, 0	@ turn on D-cache

	mov	pc, lr

	ldmfd	sp!, {pc}

ENDPROC(cpu_resume_after_mmu)

ENDPROC(cpu_resume_after_mmu)





/*

/*
@@ -122,12 +123,11 @@ ENTRY(cpu_resume) 
	ldr	r0, sleep_save_sp	@ stack phys addr

	ldr	r0, sleep_save_sp	@ stack phys addr

#endif

#endif

	setmode	PSR_I_BIT | PSR_F_BIT | SVC_MODE, r1  @ set SVC, irqs off

	setmode	PSR_I_BIT | PSR_F_BIT | SVC_MODE, r1  @ set SVC, irqs off

	@ load v:p, stack, return fn, resume fn

	@ load v:p, stack, resume fn

  ARM(	ldmia	r0!, {r1, sp, lr, pc}	)

  ARM(	ldmia	r0!, {r1, sp, pc}	)

THUMB(	ldmia	r0!, {r1, r2, r3, r4}	)

THUMB(	ldmia	r0!, {r1, r2, r3}	)

THUMB(	mov	sp, r2			)

THUMB(	mov	sp, r2			)

THUMB(	mov	lr, r3			)

THUMB(	bx	r3			)

THUMB(	bx	r4			)

ENDPROC(cpu_resume)

ENDPROC(cpu_resume)





sleep_save_sp:

sleep_save_sp: