From ede56033b2328d3cf136290e98636d732b349e9c Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 8 Apr 2025 10:09:16 +0000 Subject: [PATCH] Revert "ANDROID: KVM: arm64: iommu: Allow to boot without IOMMU driver" This reverts commit 247011a0ccb858e0a179ddbbfea0ae755cc9fed5. We require an IOMMU for pVM confidentiality. Bug: 357781595 Bug: 384432312 Change-Id: I858ed7063ef3fc02cef1155c21b7ffdf921a333e Signed-off-by: Keir Fraser --- arch/arm64/kvm/hyp/nvhe/iommu/iommu.c | 2 +- arch/arm64/kvm/iommu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/iommu/iommu.c b/arch/arm64/kvm/hyp/nvhe/iommu/iommu.c index 656428235c9b..1c612502be06 100644 --- a/arch/arm64/kvm/hyp/nvhe/iommu/iommu.c +++ b/arch/arm64/kvm/hyp/nvhe/iommu/iommu.c @@ -215,7 +215,7 @@ int kvm_iommu_init(struct kvm_iommu_ops *ops, !ops->init || !ops->alloc_domain || !ops->free_domain) - return 0; + return -ENODEV; ret = hyp_pool_init_empty(&iommu_host_pool, 64); if (ret) diff --git a/arch/arm64/kvm/iommu.c b/arch/arm64/kvm/iommu.c index 31b0d4982bf8..079779deddf5 100644 --- a/arch/arm64/kvm/iommu.c +++ b/arch/arm64/kvm/iommu.c @@ -42,7 +42,7 @@ int kvm_iommu_init_driver(void) { if (!smp_load_acquire(&iommu_driver) || !iommu_driver->get_iommu_id_by_of) { kvm_err("pKVM enabled without an IOMMU driver, do not run confidential workloads in virtual machines\n"); - return 0; + return -ENODEV; } kvm_hyp_iommu_domains = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,