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

Commit 62b2d07c authored by Russell King's avatar Russell King
Browse files

ARM: pm: get rid of cpu_resume_turn_mmu_on 



We don't require cpu_resume_turn_mmu_on as we can combine the ldr
instruction with the following code provided we ensure that
cpu_resume_mmu is aligned for older CPUs.  Note that we also align
to a 32-byte boundary to ensure that the code can't cross a section
boundary.

Tested-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: default avatarShawn Guo <shawn.guo@linaro.org>
Tested-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1aede681

arch/arm/kernel/sleep.S

+2 −6
Original line number Diff line number Diff line
@@ -72,19 +72,15 @@ ENDPROC(cpu_suspend_abort) 
/*

 * r0 = control register value

 */

	.align	5

ENTRY(cpu_resume_mmu)

	ldr	r3, =cpu_resume_after_mmu

	b	cpu_resume_turn_mmu_on

ENDPROC(cpu_resume_mmu)

	.ltorg

	.align	5

ENTRY(cpu_resume_turn_mmu_on)

	mcr	p15, 0, r0, c1, c0, 0	@ turn on MMU, I-cache, etc

	mrc	p15, 0, r0, c0, c0, 0	@ read id reg

	mov	r0, r0

	mov	r0, r0

	mov	pc, r3			@ jump to virtual address

ENDPROC(cpu_resume_turn_mmu_on)

ENDPROC(cpu_resume_mmu)

cpu_resume_after_mmu:

	bl	cpu_init		@ restore the und/abt/irq banked regs

	mov	r0, #0			@ return zero on success

arch/arm/kernel/suspend.c

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
static pgd_t *suspend_pgd;



extern int __cpu_suspend(int, long, unsigned long, int (*)(unsigned long));

extern void cpu_resume_turn_mmu_on(void);

extern void cpu_resume_mmu(void);



/*

 * Hide the first two arguments to __cpu_suspend - these are an implementation
@@ -43,7 +43,7 @@ static int __init cpu_suspend_init(void) 
{

	suspend_pgd = pgd_alloc(&init_mm);

	if (suspend_pgd) {

		unsigned long addr = virt_to_phys(cpu_resume_turn_mmu_on);

		unsigned long addr = virt_to_phys(cpu_resume_mmu);

		identity_mapping_add(suspend_pgd, addr, addr + SECTION_SIZE);

	}

	return suspend_pgd ? 0 : -ENOMEM;