Commit 3c142f9d authored by Will Deacon's avatar Will Deacon Committed by Marc Zyngier
Browse files

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: default avatarWill Deacon <will@kernel.org>
Acked-by: default avatarOliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20240501163400.15838-2-will@kernel.org


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 838d992b

arch/arm64/kernel/pi/idreg-override.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static const struct { 
	char	alias[FTR_ALIAS_NAME_LEN];

	char	feature[FTR_ALIAS_OPTION_LEN];

} aliases[] __initconst = {

	{ "kvm_arm.mode=nvhe",		"id_aa64mmfr1.vh=0" },

	{ "kvm_arm.mode=nvhe",		"arm64_sw.hvhe=0 id_aa64mmfr1.vh=0" },

	{ "kvm_arm.mode=protected",	"id_aa64mmfr1.vh=0" },

	{ "arm64.nosve",		"id_aa64pfr0.sve=0" },

	{ "arm64.nosme",		"id_aa64pfr1.sme=0" },