iommu: Move IOMMU specific code to intel-iommu.c

Move the IOMMU specific routines to intel-iommu.c leaving the
dmar.c to the common ACPI dmar code shared between DMA-remapping
and Interrupt-remapping.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: yinghai@kernel.org
Cc: youquan.song@intel.com
Cc: joerg.roedel@amd.com
Cc: tony.luck@intel.com
Cc: dwmw2@infradead.org
Link: http://lkml.kernel.org/r/20110824001456.282401285@sbsiddha-desk.sc.intel.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 159 insertions, 163 deletions

diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 17adf1ebcb13..a10ccf2432c8 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -118,8 +118,8 @@ static int __init dmar_parse_one_dev_scope(struct acpi_dmar_device_scope *scope,
         return 0;
 }
 
-static int __init dmar_parse_dev_scope(void *start, void *end, int *cnt,
-                                       struct pci_dev ***devices, u16 segment)
+int __init dmar_parse_dev_scope(void *start, void *end, int *cnt,
+                                struct pci_dev ***devices, u16 segment)
 {
         struct acpi_dmar_device_scope *scope;
         void * tmp = start;
@@ -217,133 +217,6 @@ static int __init dmar_parse_dev(struct dmar_drhd_unit *dmaru)
         return ret;
 }
 
-#ifdef CONFIG_DMAR
-LIST_HEAD(dmar_rmrr_units);
-
-static void __init dmar_register_rmrr_unit(struct dmar_rmrr_unit *rmrr)
-{
-        list_add(&rmrr->list, &dmar_rmrr_units);
-}
-
-
-static int __init
-dmar_parse_one_rmrr(struct acpi_dmar_header *header)
-{
-        struct acpi_dmar_reserved_memory *rmrr;
-        struct dmar_rmrr_unit *rmrru;
-
-        rmrru = kzalloc(sizeof(*rmrru), GFP_KERNEL);
-        if (!rmrru)
-                return -ENOMEM;
-
-        rmrru->hdr = header;
-        rmrr = (struct acpi_dmar_reserved_memory *)header;
-        rmrru->base_address = rmrr->base_address;
-        rmrru->end_address = rmrr->end_address;
-
-        dmar_register_rmrr_unit(rmrru);
-        return 0;
-}
-
-static int __init
-rmrr_parse_dev(struct dmar_rmrr_unit *rmrru)
-{
-        struct acpi_dmar_reserved_memory *rmrr;
-        int ret;
-
-        rmrr = (struct acpi_dmar_reserved_memory *) rmrru->hdr;
-        ret = dmar_parse_dev_scope((void *)(rmrr + 1),
-                ((void *)rmrr) + rmrr->header.length,
-                &rmrru->devices_cnt, &rmrru->devices, rmrr->segment);
-
-        if (ret || (rmrru->devices_cnt == 0)) {
-                list_del(&rmrru->list);
-                kfree(rmrru);
-        }
-        return ret;
-}
-
-static LIST_HEAD(dmar_atsr_units);
-
-static int __init dmar_parse_one_atsr(struct acpi_dmar_header *hdr)
-{
-        struct acpi_dmar_atsr *atsr;
-        struct dmar_atsr_unit *atsru;
-
-        atsr = container_of(hdr, struct acpi_dmar_atsr, header);
-        atsru = kzalloc(sizeof(*atsru), GFP_KERNEL);
-        if (!atsru)
-                return -ENOMEM;
-
-        atsru->hdr = hdr;
-        atsru->include_all = atsr->flags & 0x1;
-
-        list_add(&atsru->list, &dmar_atsr_units);
-
-        return 0;
-}
-
-static int __init atsr_parse_dev(struct dmar_atsr_unit *atsru)
-{
-        int rc;
-        struct acpi_dmar_atsr *atsr;
-
-        if (atsru->include_all)
-                return 0;
-
-        atsr = container_of(atsru->hdr, struct acpi_dmar_atsr, header);
-        rc = dmar_parse_dev_scope((void *)(atsr + 1),
-                                (void *)atsr + atsr->header.length,
-                                &atsru->devices_cnt, &atsru->devices,
-                                atsr->segment);
-        if (rc || !atsru->devices_cnt) {
-                list_del(&atsru->list);
-                kfree(atsru);
-        }
-
-        return rc;
-}
-
-int dmar_find_matched_atsr_unit(struct pci_dev *dev)
-{
-        int i;
-        struct pci_bus *bus;
-        struct acpi_dmar_atsr *atsr;
-        struct dmar_atsr_unit *atsru;
-
-        dev = pci_physfn(dev);
-
-        list_for_each_entry(atsru, &dmar_atsr_units, list) {
-                atsr = container_of(atsru->hdr, struct acpi_dmar_atsr, header);
-                if (atsr->segment == pci_domain_nr(dev->bus))
-                        goto found;
-        }
-
-        return 0;
-
-found:
-        for (bus = dev->bus; bus; bus = bus->parent) {
-                struct pci_dev *bridge = bus->self;
-
-                if (!bridge || !pci_is_pcie(bridge) ||
-                    bridge->pcie_type == PCI_EXP_TYPE_PCI_BRIDGE)
-                        return 0;
-
-                if (bridge->pcie_type == PCI_EXP_TYPE_ROOT_PORT) {
-                        for (i = 0; i < atsru->devices_cnt; i++)
-                                if (atsru->devices[i] == bridge)
-                                        return 1;
-                        break;
-                }
-        }
-
-        if (atsru->include_all)
-                return 1;
-
-        return 0;
-}
-#endif
-
 #ifdef CONFIG_ACPI_NUMA
 static int __init
 dmar_parse_one_rhsa(struct acpi_dmar_header *header)
@@ -484,14 +357,10 @@ parse_dmar_table(void)
                         ret = dmar_parse_one_drhd(entry_header);
                         break;
                 case ACPI_DMAR_TYPE_RESERVED_MEMORY:
-#ifdef CONFIG_DMAR
                         ret = dmar_parse_one_rmrr(entry_header);
-#endif
                         break;
                 case ACPI_DMAR_TYPE_ATSR:
-#ifdef CONFIG_DMAR
                         ret = dmar_parse_one_atsr(entry_header);
-#endif
                         break;
                 case ACPI_DMAR_HARDWARE_AFFINITY:
 #ifdef CONFIG_ACPI_NUMA
@@ -564,30 +433,18 @@ int __init dmar_dev_scope_init(void)
         if (dmar_dev_scope_initialized)
                 return dmar_dev_scope_initialized;
 
+        if (list_empty(&dmar_drhd_units))
+                goto fail;
+
         list_for_each_entry_safe(drhd, drhd_n, &dmar_drhd_units, list) {
                 ret = dmar_parse_dev(drhd);
                 if (ret)
                         goto fail;
         }
 
-#ifdef CONFIG_DMAR
-        {
-                struct dmar_rmrr_unit *rmrr, *rmrr_n;
-                struct dmar_atsr_unit *atsr, *atsr_n;
-
-                list_for_each_entry_safe(rmrr, rmrr_n, &dmar_rmrr_units, list) {
-                        ret = rmrr_parse_dev(rmrr);
-                        if (ret)
-                                goto fail;
-                }
-
-                list_for_each_entry_safe(atsr, atsr_n, &dmar_atsr_units, list) {
-                        ret = atsr_parse_dev(atsr);
-                        if (ret)
-                                goto fail;
-                }
-        }
-#endif
+        ret = dmar_parse_rmrr_atsr_dev();
+        if (ret)
+                goto fail;
 
         dmar_dev_scope_initialized = 1;
         return 0;
@@ -620,14 +477,6 @@ int __init dmar_table_init(void)
                 return -ENODEV;
         }
 
-#ifdef CONFIG_DMAR
-        if (list_empty(&dmar_rmrr_units))
-                printk(KERN_INFO PREFIX "No RMRR found\n");
-
-        if (list_empty(&dmar_atsr_units))
-                printk(KERN_INFO PREFIX "No ATSR found\n");
-#endif
-
         return 0;
 }
 
@@ -767,7 +616,6 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
                 goto err_unmap;
         }
 
-#ifdef CONFIG_DMAR
         agaw = iommu_calculate_agaw(iommu);
         if (agaw < 0) {
                 printk(KERN_ERR
@@ -782,7 +630,6 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
                         iommu->seq_id);
                 goto err_unmap;
         }
-#endif
         iommu->agaw = agaw;
         iommu->msagaw = msagaw;
 
@@ -826,9 +673,7 @@ void free_iommu(struct intel_iommu *iommu)
         if (!iommu)
                 return;
 
-#ifdef CONFIG_DMAR
         free_dmar_iommu(iommu);
-#endif
 
         if (iommu->reg)
                 iounmap(iommu->reg);
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index df69618177c5..e8eb4c5302b0 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3390,6 +3390,151 @@ static void __init init_iommu_pm_ops(void)
 static inline void init_iommu_pm_ops(void) {}
 #endif  /* CONFIG_PM */
 
+LIST_HEAD(dmar_rmrr_units);
+
+static void __init dmar_register_rmrr_unit(struct dmar_rmrr_unit *rmrr)
+{
+        list_add(&rmrr->list, &dmar_rmrr_units);
+}
+
+
+int __init dmar_parse_one_rmrr(struct acpi_dmar_header *header)
+{
+        struct acpi_dmar_reserved_memory *rmrr;
+        struct dmar_rmrr_unit *rmrru;
+
+        rmrru = kzalloc(sizeof(*rmrru), GFP_KERNEL);
+        if (!rmrru)
+                return -ENOMEM;
+
+        rmrru->hdr = header;
+        rmrr = (struct acpi_dmar_reserved_memory *)header;
+        rmrru->base_address = rmrr->base_address;
+        rmrru->end_address = rmrr->end_address;
+
+        dmar_register_rmrr_unit(rmrru);
+        return 0;
+}
+
+static int __init
+rmrr_parse_dev(struct dmar_rmrr_unit *rmrru)
+{
+        struct acpi_dmar_reserved_memory *rmrr;
+        int ret;
+
+        rmrr = (struct acpi_dmar_reserved_memory *) rmrru->hdr;
+        ret = dmar_parse_dev_scope((void *)(rmrr + 1),
+                ((void *)rmrr) + rmrr->header.length,
+                &rmrru->devices_cnt, &rmrru->devices, rmrr->segment);
+
+        if (ret || (rmrru->devices_cnt == 0)) {
+                list_del(&rmrru->list);
+                kfree(rmrru);
+        }
+        return ret;
+}
+
+static LIST_HEAD(dmar_atsr_units);
+
+int __init dmar_parse_one_atsr(struct acpi_dmar_header *hdr)
+{
+        struct acpi_dmar_atsr *atsr;
+        struct dmar_atsr_unit *atsru;
+
+        atsr = container_of(hdr, struct acpi_dmar_atsr, header);
+        atsru = kzalloc(sizeof(*atsru), GFP_KERNEL);
+        if (!atsru)
+                return -ENOMEM;
+
+        atsru->hdr = hdr;
+        atsru->include_all = atsr->flags & 0x1;
+
+        list_add(&atsru->list, &dmar_atsr_units);
+
+        return 0;
+}
+
+static int __init atsr_parse_dev(struct dmar_atsr_unit *atsru)
+{
+        int rc;
+        struct acpi_dmar_atsr *atsr;
+
+        if (atsru->include_all)
+                return 0;
+
+        atsr = container_of(atsru->hdr, struct acpi_dmar_atsr, header);
+        rc = dmar_parse_dev_scope((void *)(atsr + 1),
+                                (void *)atsr + atsr->header.length,
+                                &atsru->devices_cnt, &atsru->devices,
+                                atsr->segment);
+        if (rc || !atsru->devices_cnt) {
+                list_del(&atsru->list);
+                kfree(atsru);
+        }
+
+        return rc;
+}
+
+int dmar_find_matched_atsr_unit(struct pci_dev *dev)
+{
+        int i;
+        struct pci_bus *bus;
+        struct acpi_dmar_atsr *atsr;
+        struct dmar_atsr_unit *atsru;
+
+        dev = pci_physfn(dev);
+
+        list_for_each_entry(atsru, &dmar_atsr_units, list) {
+                atsr = container_of(atsru->hdr, struct acpi_dmar_atsr, header);
+                if (atsr->segment == pci_domain_nr(dev->bus))
+                        goto found;
+        }
+
+        return 0;
+
+found:
+        for (bus = dev->bus; bus; bus = bus->parent) {
+                struct pci_dev *bridge = bus->self;
+
+                if (!bridge || !pci_is_pcie(bridge) ||
+                    bridge->pcie_type == PCI_EXP_TYPE_PCI_BRIDGE)
+                        return 0;
+
+                if (bridge->pcie_type == PCI_EXP_TYPE_ROOT_PORT) {
+                        for (i = 0; i < atsru->devices_cnt; i++)
+                                if (atsru->devices[i] == bridge)
+                                        return 1;
+                        break;
+                }
+        }
+
+        if (atsru->include_all)
+                return 1;
+
+        return 0;
+}
+
+int dmar_parse_rmrr_atsr_dev(void)
+{
+        struct dmar_rmrr_unit *rmrr, *rmrr_n;
+        struct dmar_atsr_unit *atsr, *atsr_n;
+        int ret = 0;
+
+        list_for_each_entry_safe(rmrr, rmrr_n, &dmar_rmrr_units, list) {
+                ret = rmrr_parse_dev(rmrr);
+                if (ret)
+                        return ret;
+        }
+
+        list_for_each_entry_safe(atsr, atsr_n, &dmar_atsr_units, list) {
+                ret = atsr_parse_dev(atsr);
+                if (ret)
+                        return ret;
+        }
+
+        return ret;
+}
+
 /*
  * Here we only respond to action of unbound device from driver.
  *
@@ -3454,6 +3599,12 @@ int __init intel_iommu_init(void)
                 return  -ENODEV;
         }
 
+        if (list_empty(&dmar_rmrr_units))
+                printk(KERN_INFO "DMAR: No RMRR found\n");
+
+        if (list_empty(&dmar_atsr_units))
+                printk(KERN_INFO "DMAR: No ATSR found\n");
+
         if (dmar_init_reserved_ranges()) {
                 if (force_on)
                         panic("tboot: Failed to reserve iommu ranges\n");