Merge branch 'x86/core' into x86/x2apic

1 files changed, 37 insertions, 14 deletions

diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 66c0fd21894b..bb0642318a95 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1637,12 +1637,43 @@ static inline int iommu_prepare_rmrr_dev(struct dmar_rmrr_unit *rmrr,
 }
 
 #ifdef CONFIG_DMAR_GFX_WA
-extern int arch_get_ram_range(int slot, u64 *addr, u64 *size);
+struct iommu_prepare_data {
+        struct pci_dev *pdev;
+        int ret;
+};
+
+static int __init iommu_prepare_work_fn(unsigned long start_pfn,
+                                         unsigned long end_pfn, void *datax)
+{
+        struct iommu_prepare_data *data;
+
+        data = (struct iommu_prepare_data *)datax;
+
+        data->ret = iommu_prepare_identity_map(data->pdev,
+                                start_pfn<<PAGE_SHIFT, end_pfn<<PAGE_SHIFT);
+        return data->ret;
+
+}
+
+static int __init iommu_prepare_with_active_regions(struct pci_dev *pdev)
+{
+        int nid;
+        struct iommu_prepare_data data;
+
+        data.pdev = pdev;
+        data.ret = 0;
+
+        for_each_online_node(nid) {
+                work_with_active_regions(nid, iommu_prepare_work_fn, &data);
+                if (data.ret)
+                        return data.ret;
+        }
+        return data.ret;
+}
+
 static void __init iommu_prepare_gfx_mapping(void)
 {
         struct pci_dev *pdev = NULL;
-        u64 base, size;
-        int slot;
         int ret;
 
         for_each_pci_dev(pdev) {
@@ -1651,17 +1682,9 @@ static void __init iommu_prepare_gfx_mapping(void)
                         continue;
                 printk(KERN_INFO "IOMMU: gfx device %s 1-1 mapping\n",
                         pci_name(pdev));
-                slot = arch_get_ram_range(0, &base, &size);
-                while (slot >= 0) {
-                        ret = iommu_prepare_identity_map(pdev,
-                                        base, base + size);
-                        if (ret)
-                                goto error;
-                        slot = arch_get_ram_range(slot, &base, &size);
-                }
-                continue;
-error:
-                printk(KERN_ERR "IOMMU: mapping reserved region failed\n");
+                ret = iommu_prepare_with_active_regions(pdev);
+                if (ret)
+                        printk(KERN_ERR "IOMMU: mapping reserved region failed\n");
         }
 }
 #endif