From a8951d41fa841759aff0a933850cbf1b404e68e4 Mon Sep 17 00:00:00 2001 From: Fuad Tabba Date: Tue, 12 Oct 2021 15:18:45 +0100 Subject: [PATCH] ANDROID: KVM: arm64: FAR_EL2 mask as a define Create a macro definition for the FAR_EL2 mask and use it instead of a hard-coded value, and put it in a share header to be used by hyp. No functional change intended. Bug: 357781595 Change-Id: Ib83932d670cba6bf8f1ed45d2c0e1ed34331d98d Signed-off-by: Fuad Tabba --- arch/arm64/include/asm/kvm_arm.h | 2 ++ arch/arm64/kvm/mmu.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index ca21f2a4f6e5..d7481aaef6bc 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -406,6 +406,8 @@ #define PAR_TO_HPFAR(par) \ (((par) & GENMASK_ULL(52 - 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 c39e36ed6200..c50db39e4fb5 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1999,7 +1999,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) * faulting VA. This is always 12 bits, irrespective * of the page size. */ - ipa |= kvm_vcpu_get_hfar(vcpu) & GENMASK(11, 0); + ipa |= kvm_vcpu_get_hfar(vcpu) & FAR_MASK; ret = io_mem_abort(vcpu, ipa); goto out_unlock; }