1 files changed, 4 insertions, 0 deletions

diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c
index 82a346e6e2e4..4f67957d2b42 100644
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
@@ -597,6 +597,10 @@ static int __init pci_iommu_init(void)
         if (swiotlb)
                 return -ENODEV;
 
+        /* Did we detect a different HW IOMMU? */
+        if (iommu_detected && !iommu_aperture)
+                return -1;
+
         if (no_iommu ||
             (!force_iommu && end_pfn <= MAX_DMA32_PFN) ||
             !iommu_aperture ||