From 751dadca3371bdf19b5943381cb526525ce921a8 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:15 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Plumb MMIO checking into the fault handling" This reverts commit 24483ac2dbf5e7bba5430c6f978371e6c0196b5d. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: Ic8ae32142b60443fe53a12bf9b62278bc5e11ef1 --- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index 803512cf8436..230f1e7025b6 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -329,7 +329,8 @@ static void handle_pvm_exit_iabt(struct kvm_vcpu *host_vcpu, struct kvm_vcpu *sh static void handle_pvm_exit_dabt(struct kvm_vcpu *host_vcpu, struct kvm_vcpu *shadow_vcpu) { - shadow_vcpu->mmio_needed = __pkvm_check_ioguard_page(shadow_vcpu); + /* FIXME: Revisit once MMIO-guard is available */ + shadow_vcpu->mmio_needed = true; if (shadow_vcpu->mmio_needed) { /* r0 as transfer register between the guest and the host. */