From d9cd49c2e1b08db3cdf1d2001338d98b442935a9 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:40 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: FAR_EL2 mask as a define" This reverts commit b72132ff31645c4fa1a346bcf0d60d40180042f4. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I4632fbed70e1cc4fa4c7009e2da93cdd8a7408d1 --- arch/arm64/include/asm/kvm_arm.h | 2 -- arch/arm64/kvm/mmu.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index a28af6579c20..01d47c5886dc 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -342,8 +342,6 @@ #define PAR_TO_HPFAR(par) \ (((par) & GENMASK_ULL(PHYS_MASK_SHIFT - 1, 12)) >> 8) -#define FAR_MASK GENMASK_ULL(11, 0) - #define ECN(x) { ESR_ELx_EC_##x, #x } #define kvm_arm_exception_class \ diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index bda4d9eb7c68..9a43373c7c45 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1393,7 +1393,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) * faulting VA. This is always 12 bits, irrespective * of the page size. */ - fault_ipa |= kvm_vcpu_get_hfar(vcpu) & FAR_MASK; + fault_ipa |= kvm_vcpu_get_hfar(vcpu) & ((1 << 12) - 1); ret = io_mem_abort(vcpu, fault_ipa); goto out_unlock; }