KVM: arm64: Fix hvhe/nvhe early alias parsing
authorWill Deacon <will@kernel.org>
Wed, 1 May 2024 16:33:59 +0000 (17:33 +0100)
committerMarc Zyngier <maz@kernel.org>
Wed, 8 May 2024 06:05:53 +0000 (07:05 +0100)
commit3c142f9d02b992aec5d96b82917e4cc07850c4df
treea0a8be01f23195d775dad5b16fa689c5fafaf24f
parent838d992b84486311e6039170d28b79a7a0633f06
KVM: arm64: Fix hvhe/nvhe early alias parsing

Booting a kernel with "arm64_sw.hvhe=1 kvm-arm.mode=nvhe" on the
command-line results in KVM initialising using hVHE, whereas one might
expect the latter option to override the former.

Fix this by adding "arm64_sw.hvhe=0" to the alias expansion for
"kvm-arm.mode=nvhe".

Signed-off-by: Will Deacon <will@kernel.org>
Acked-by: Oliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20240501163400.15838-2-will@kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kernel/pi/idreg-override.c