Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 22 insertions, 88 deletions

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 9f07cfcbd3a5..b49d00da2aed 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",
@@ -67,89 +68,23 @@ int dma_set_mask(struct device *dev, u64 mask)
 }
 EXPORT_SYMBOL(dma_set_mask);
 
-#if defined(CONFIG_X86_64) && !defined(CONFIG_NUMA)
-static __initdata void *dma32_bootmem_ptr;
-static unsigned long dma32_bootmem_size __initdata = (128ULL<<20);
-
-static int __init parse_dma32_size_opt(char *p)
-{
-        if (!p)
-                return -EINVAL;
-        dma32_bootmem_size = memparse(p, &p);
-        return 0;
-}
-early_param("dma32_size", parse_dma32_size_opt);
-
-void __init dma32_reserve_bootmem(void)
-{
-        unsigned long size, align;
-        if (max_pfn <= MAX_DMA32_PFN)
-                return;
-
-        /*
-         * check aperture_64.c allocate_aperture() for reason about
-         * using 512M as goal
-         */
-        align = 64ULL<<20;
-        size = roundup(dma32_bootmem_size, align);
-        dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align,
-                                 512ULL<<20);
-        /*
-         * Kmemleak should not scan this block as it may not be mapped via the
-         * kernel direct mapping.
-         */
-        kmemleak_ignore(dma32_bootmem_ptr);
-        if (dma32_bootmem_ptr)
-                dma32_bootmem_size = size;
-        else
-                dma32_bootmem_size = 0;
-}
-static void __init dma32_free_bootmem(void)
-{
-
-        if (max_pfn <= MAX_DMA32_PFN)
-                return;
-
-        if (!dma32_bootmem_ptr)
-                return;
-
-        free_bootmem(__pa(dma32_bootmem_ptr), dma32_bootmem_size);
-
-        dma32_bootmem_ptr = NULL;
-        dma32_bootmem_size = 0;
-}
-#else
-void __init dma32_reserve_bootmem(void)
-{
-}
-static void __init dma32_free_bootmem(void)
-{
-}
-
-#endif
-
 void __init pci_iommu_alloc(void)
 {
-        /* 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();
-
-        /* needs to be called after gart_iommu_hole_init */
-        amd_iommu_detect();
-out:
-        pci_xen_swiotlb_init();
-
-        pci_swiotlb_init();
+        struct iommu_table_entry *p;
+
+        sort_iommu_table(__iommu_table, __iommu_table_end);
+        check_iommu_entries(__iommu_table, __iommu_table_end);
+
+        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 +227,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 +235,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;
 }