From 234a951b246d8500f6b621fe23c238bdc2afcef5 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 9 Apr 2025 05:25:40 -0700 Subject: [PATCH] ANDROID: Revert^2 "KVM: arm64: iommu: Allow to boot without IOMMU driver" This reverts commit ede56033b2328d3cf136290e98636d732b349e9c. Reason for revert: Breaks pixel6_pkvm presubmit tests Bug: 409494103 Change-Id: I6cf1cda14c35c748a11f0ecd31720613ffa18372 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 1c612502be06..656428235c9b 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 -ENODEV; + return 0; 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 079779deddf5..31b0d4982bf8 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 -ENODEV; + return 0; } kvm_hyp_iommu_domains = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,