diff options
| author | Will Deacon <will@kernel.org> | 2024-05-01 18:33:59 +0200 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2024-05-08 08:05:53 +0200 |
| commit | 3c142f9d02b992aec5d96b82917e4cc07850c4df (patch) | |
| tree | a0a8be01f23195d775dad5b16fa689c5fafaf24f /arch/arm64/kernel/pi/idreg-override.c | |
| parent | KVM: arm64: Convert kvm_mpidr_index() to bitmap_gather() (diff) | |
| download | linux-3c142f9d02b992aec5d96b82917e4cc07850c4df.tar.xz linux-3c142f9d02b992aec5d96b82917e4cc07850c4df.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm64/kernel/pi/idreg-override.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/pi/idreg-override.c b/arch/arm64/kernel/pi/idreg-override.c index aad399796e81..39c9253fcf23 100644 --- a/arch/arm64/kernel/pi/idreg-override.c +++ b/arch/arm64/kernel/pi/idreg-override.c @@ -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" }, |