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 <tabba@google.com>
Link: https://lore.kernel.org/r/20241216105057.579031-12-tabba@google.com
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c
index df30d46b7542a20610a54f118a56ec6fc608b160..2beab633d721ca3e10d5b5fc9d64a28325621c80 100644 (file)
--- 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