From 14c83ba9a58362982b47fc5cbfd9aecf1aec9172 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:52:03 +0100 Subject: [PATCH] Revert "FROMLIST: KVM: arm64: pkvm: Stub io map functions" This reverts commit 396a43c5bd474a86603fbe700dc050fc6e6c7619. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: Ica1e8b441dc1c434c6f61cbb097b199942434929 --- arch/arm64/kvm/mmu.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 3b968f238bb1..8e506ba8988e 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -525,9 +525,6 @@ int create_hyp_io_mappings(phys_addr_t phys_addr, size_t size, unsigned long addr; int ret; - if (is_protected_kvm_enabled()) - return -EPERM; - *kaddr = ioremap(phys_addr, size); if (!*kaddr) return -ENOMEM; @@ -771,9 +768,6 @@ int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa, KVM_PGTABLE_PROT_R | (writable ? KVM_PGTABLE_PROT_W : 0); - if (is_protected_kvm_enabled()) - return -EPERM; - size += offset_in_page(guest_ipa); guest_ipa &= PAGE_MASK;