From: Fuad Tabba Date: Mon, 16 Dec 2024 10:50:51 +0000 (+0000) Subject: KVM: arm64: Remove redundant setting of HCR_EL2 trap bit X-Git-Tag: v6.14-rc1~60^2~6^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=092e7b2c3b1a5591bbabc358f3b709dfa2289b91;p=thirdparty%2Flinux.git KVM: arm64: Remove redundant setting of HCR_EL2 trap bit In hVHE mode, HCR_E2H should be set for both protected and non-protected VMs. Since commit b56680de9c64 ("KVM: arm64: Initialize trap register values in hyp in pKVM"), this has been fixed, and the setting of the flag here is redundant. Signed-off-by: Fuad Tabba Link: https://lore.kernel.org/r/20241216105057.579031-12-tabba@google.com Signed-off-by: Marc Zyngier --- diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index df30d46b7542a..2beab633d721c 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -57,9 +57,6 @@ static void pvm_init_traps_hcr(struct kvm_vcpu *vcpu) /* No support for AArch32. */ val |= HCR_RW; - if (has_hvhe()) - val |= HCR_E2H; - /* * Always trap: * - Feature id registers: to control features exposed to guests