tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: Revert^2 "KVM: arm64: iommu: Allow to boot without IOMMU driver""

Browse Source 
This reverts commit 234a951b24.

Change-Id: I96bdea39f682840c79957b87286f47ce261a3daa
Signed-off-by: Sebastian Ene <sebastianene@google.com>
This commit is contained in:
Sebastian Ene
2025-05-01 09:22:37 +00:00
parent 8d139a5479
commit d9d550aef0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/kvm/hyp/nvhe/iommu/iommu.c
+1 -1
View File
@@ -274,7 +274,7 @@ int kvm_iommu_init(struct kvm_iommu_ops *ops,
!ops->alloc_domain || !ops->alloc_domain ||
!ops->free_domain || !ops->free_domain ||
!ops->get_iommu_by_id) !ops->get_iommu_by_id)
return 0; return -ENODEV;
ret = hyp_pool_init_empty(&iommu_host_pool, 64); ret = hyp_pool_init_empty(&iommu_host_pool, 64);
if (ret) if (ret)
arch/arm64/kvm/iommu.c
+1 -1
View File
@@ -84,7 +84,7 @@ int kvm_iommu_init_driver(void)
{ {
if (!smp_load_acquire(&iommu_driver) || !iommu_driver->get_iommu_id_by_of) { 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"); 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, kvm_hyp_iommu_domains = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,