Commit 3fe3fd5f authored by Joey Gouly's avatar Joey Gouly Committed by Will Deacon
Browse files

arm64: mm: fix resume for 52-bit enabled builds 



__cpu_setup() was changed to take the actual number of VA bits in x0,
however the resume path was not updated at the same time.

Load `vabits_actual` in the resume path, to ensure that the correct
number of VA bits is used.

This fixes booting v6.0-rc kernels on my Juno.

Signed-off-by: default avatarJoey Gouly <joey.gouly@arm.com>
Fixes: 0aaa6853 ("arm64: mm: fix booting with 52-bit address space")
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20220909124311.38489-1-joey.gouly@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent d105d692

arch/arm64/kernel/sleep.S

+3 −0
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ SYM_FUNC_END(__cpu_suspend_enter) 
SYM_CODE_START(cpu_resume)

	bl	init_kernel_el

	bl	finalise_el2

#if VA_BITS > 48

	ldr_l	x0, vabits_actual

#endif

	bl	__cpu_setup

	/* enable the MMU early - so we can access sleep_save_stash by va */

	adrp	x1, swapper_pg_dir