arm64: mm: fix resume for 52-bit enabled builds
authorJoey Gouly <joey.gouly@arm.com>
Fri, 9 Sep 2022 12:43:11 +0000 (13:43 +0100)
committerWill Deacon <will@kernel.org>
Sat, 10 Sep 2022 13:46:28 +0000 (14:46 +0100)
commit3fe3fd5f30720b4afd3345cc186808125e7f5848
tree3cd913759eaad03e6ee043059a82b142b8206611
parentd105d6920ec758125b69c0b097bf498348888a9d
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: 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>
Link: https://lore.kernel.org/r/20220909124311.38489-1-joey.gouly@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/kernel/sleep.S