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

Commit 9acdc2af authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Catalin Marinas
Browse files

arm64: drop sleep_idmap_phys and clean up cpu_resume() 



Two cleanups of the asm function cpu_resume():
- The global variable sleep_idmap_phys always points to idmap_pg_dir,
  so we can just use that value directly in the CPU resume path.
- Unclutter the load of sleep_save_sp::save_ptr_stash_phys.

Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tested-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 5dfe9d7d

arch/arm64/kernel/sleep.S

+2 −5
Original line number Diff line number Diff line
@@ -164,15 +164,12 @@ ENTRY(cpu_resume) 
#else

	mov	x7, xzr

#endif

	adrp	x0, sleep_save_sp

	add	x0, x0, #:lo12:sleep_save_sp

	ldr	x0, [x0, #SLEEP_SAVE_SP_PHYS]

	ldr_l	x0, sleep_save_sp + SLEEP_SAVE_SP_PHYS

	ldr	x0, [x0, x7, lsl #3]

	/* load sp from context */

	ldr	x2, [x0, #CPU_CTX_SP]

	adrp	x1, sleep_idmap_phys

	/* load physical address of identity map page table in x1 */

	ldr	x1, [x1, #:lo12:sleep_idmap_phys]

	adrp	x1, idmap_pg_dir

	mov	sp, x2

	/*

	 * cpu_do_resume expects x0 to contain context physical address

arch/arm64/kernel/suspend.c

+0 −3
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ int __cpu_suspend(unsigned long arg, int (*fn)(unsigned long)) 
}



struct sleep_save_sp sleep_save_sp;

phys_addr_t sleep_idmap_phys;



static int __init cpu_suspend_init(void)

{
@@ -132,9 +131,7 @@ static int __init cpu_suspend_init(void) 


	sleep_save_sp.save_ptr_stash = ctx_ptr;

	sleep_save_sp.save_ptr_stash_phys = virt_to_phys(ctx_ptr);

	sleep_idmap_phys = virt_to_phys(idmap_pg_dir);

	__flush_dcache_area(&sleep_save_sp, sizeof(struct sleep_save_sp));

	__flush_dcache_area(&sleep_idmap_phys, sizeof(sleep_idmap_phys));



	return 0;

}