diff mbox series

[v2] arm64: mm: fix resume for 52-bit enabled builds

Message ID 20220909124311.38489-1-joey.gouly@arm.com (mailing list archive)
State New, archived
Headers show
Series [v2] arm64: mm: fix resume for 52-bit enabled builds | expand

Commit Message

Joey Gouly Sept. 9, 2022, 12:43 p.m. UTC 
__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: Joey Gouly <joey.gouly@arm.com>
Fixes: 0aaa68532e9d ("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: Ard Biesheuvel <ardb@kernel.org>
---
 arch/arm64/kernel/sleep.S | 3 +++
 1 file changed, 3 insertions(+)

Comments

Will Deacon Sept. 10, 2022, 2 p.m. UTC | #1 
On Fri, 9 Sep 2022 13:43:11 +0100, Joey Gouly wrote:
> __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.
> 
> [...]

Applied to arm64 (for-next/fixes), thanks!

[1/1] arm64: mm: fix resume for 52-bit enabled builds
      https://git.kernel.org/arm64/c/3fe3fd5f3072

Cheers,
diff mbox series

Patch

diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S
index 617f78ad43a1..97c9de57725d 100644
--- a/arch/arm64/kernel/sleep.S
+++ b/arch/arm64/kernel/sleep.S
@@ -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