shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: KVM: arm64: FAR_EL2 mask as a define"

Browse Source 
This reverts commit b72132ff31.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I4632fbed70e1cc4fa4c7009e2da93cdd8a7408d1
This commit is contained in:
Will Deacon
2022-07-07 15:51:40 +01:00
parent 7d1015fa9d
commit d9cd49c2e1
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/include/asm/kvm_arm.h
View File

@@ -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 \

2
arch/arm64/kvm/mmu.c
View File

@@ -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;
}