1 files changed, 21 insertions, 23 deletions

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 9f07cfcbd3a5..9ea999a4dcc1 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -11,9 +11,8 @@
 #include <asm/iommu.h>
 #include <asm/gart.h>
 #include <asm/calgary.h>
-#include <asm/amd_iommu.h>
 #include <asm/x86_init.h>
-#include <asm/xen/swiotlb-xen.h>
+#include <asm/iommu_table.h>
 
 static int forbid_dac __read_mostly;
 
@@ -45,6 +44,8 @@ int iommu_detected __read_mostly = 0;
  */
 int iommu_pass_through __read_mostly;
 
+extern struct iommu_table_entry __iommu_table[], __iommu_table_end[];
+
 /* Dummy device used for NULL arguments (normally ISA). */
 struct device x86_dma_fallback_dev = {
         .init_name = "fallback device",
@@ -130,26 +131,24 @@ static void __init dma32_free_bootmem(void)
 
 void __init pci_iommu_alloc(void)
 {
+        struct iommu_table_entry *p;
+
         /* free the range so iommu could get some range less than 4G */
         dma32_free_bootmem();
 
-        if (pci_xen_swiotlb_detect() || pci_swiotlb_detect())
-                goto out;
-
-        gart_iommu_hole_init();
-
-        detect_calgary();
-
-        detect_intel_iommu();
+        sort_iommu_table(__iommu_table, __iommu_table_end);
+        check_iommu_entries(__iommu_table, __iommu_table_end);
 
-        /* needs to be called after gart_iommu_hole_init */
-        amd_iommu_detect();
-out:
-        pci_xen_swiotlb_init();
-
-        pci_swiotlb_init();
+        for (p = __iommu_table; p < __iommu_table_end; p++) {
+                if (p && p->detect && p->detect() > 0) {
+                        p->flags |= IOMMU_DETECTED;
+                        if (p->early_init)
+                                p->early_init();
+                        if (p->flags & IOMMU_FINISH_IF_DETECTED)
+                                break;
+                }
+        }
 }
-
 void *dma_generic_alloc_coherent(struct device *dev, size_t size,
                                  dma_addr_t *dma_addr, gfp_t flag)
 {
@@ -292,6 +291,7 @@ EXPORT_SYMBOL(dma_supported);
 
 static int __init pci_iommu_init(void)
 {
+        struct iommu_table_entry *p;
         dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
 
 #ifdef CONFIG_PCI
@@ -299,12 +299,10 @@ static int __init pci_iommu_init(void)
 #endif
         x86_init.iommu.iommu_init();
 
-        if (swiotlb || xen_swiotlb) {
-                printk(KERN_INFO "PCI-DMA: "
-                       "Using software bounce buffering for IO (SWIOTLB)\n");
-                swiotlb_print_info();
-        } else
-                swiotlb_free();
+        for (p = __iommu_table; p < __iommu_table_end; p++) {
+                if (p && (p->flags & IOMMU_DETECTED) && p->late_init)
+                        p->late_init();
+        }
 
         return 0;
 }