1 files changed, 105 insertions, 18 deletions

diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index b952ebc7a78b..33ead97f0c4b 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -35,6 +35,7 @@
 #include <linux/interrupt.h>
 #include <linux/tboot.h>
 #include <linux/dmi.h>
+#include <linux/slab.h>
 
 #define PREFIX "DMAR: "
 
@@ -320,7 +321,7 @@ found:
         for (bus = dev->bus; bus; bus = bus->parent) {
                 struct pci_dev *bridge = bus->self;
 
-                if (!bridge || !bridge->is_pcie ||
+                if (!bridge || !pci_is_pcie(bridge) ||
                     bridge->pcie_type == PCI_EXP_TYPE_PCI_BRIDGE)
                         return 0;
 
@@ -339,6 +340,35 @@ found:
 }
 #endif
 
+#ifdef CONFIG_ACPI_NUMA
+static int __init
+dmar_parse_one_rhsa(struct acpi_dmar_header *header)
+{
+        struct acpi_dmar_rhsa *rhsa;
+        struct dmar_drhd_unit *drhd;
+
+        rhsa = (struct acpi_dmar_rhsa *)header;
+        for_each_drhd_unit(drhd) {
+                if (drhd->reg_base_addr == rhsa->base_address) {
+                        int node = acpi_map_pxm_to_node(rhsa->proximity_domain);
+
+                        if (!node_online(node))
+                                node = -1;
+                        drhd->iommu->node = node;
+                        return 0;
+                }
+        }
+        WARN(1, "Your BIOS is broken; RHSA refers to non-existent DMAR unit at %llx\n"
+             "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+             drhd->reg_base_addr,
+             dmi_get_system_info(DMI_BIOS_VENDOR),
+             dmi_get_system_info(DMI_BIOS_VERSION),
+             dmi_get_system_info(DMI_PRODUCT_VERSION));
+
+        return 0;
+}
+#endif
+
 static void __init
 dmar_table_print_dmar_entry(struct acpi_dmar_header *header)
 {
@@ -458,7 +488,9 @@ parse_dmar_table(void)
 #endif
                         break;
                 case ACPI_DMAR_HARDWARE_AFFINITY:
-                        /* We don't do anything with RHSA (yet?) */
+#ifdef CONFIG_ACPI_NUMA
+                        ret = dmar_parse_one_rhsa(entry_header);
+#endif
                         break;
                 default:
                         printk(KERN_WARNING PREFIX
@@ -582,6 +614,8 @@ int __init dmar_table_init(void)
         return 0;
 }
 
+static int bios_warned;
+
 int __init check_zero_address(void)
 {
         struct acpi_table_dmar *dmar;
@@ -601,6 +635,9 @@ int __init check_zero_address(void)
                 }
 
                 if (entry_header->type == ACPI_DMAR_TYPE_HARDWARE_UNIT) {
+                        void __iomem *addr;
+                        u64 cap, ecap;
+
                         drhd = (void *)entry_header;
                         if (!drhd->address) {
                                 /* Promote an attitude of violence to a BIOS engineer today */
@@ -609,17 +646,40 @@ int __init check_zero_address(void)
                                      dmi_get_system_info(DMI_BIOS_VENDOR),
                                      dmi_get_system_info(DMI_BIOS_VERSION),
                                      dmi_get_system_info(DMI_PRODUCT_VERSION));
-#ifdef CONFIG_DMAR
-                                dmar_disabled = 1;
-#endif
-                                return 0;
+                                bios_warned = 1;
+                                goto failed;
+                        }
+
+                        addr = early_ioremap(drhd->address, VTD_PAGE_SIZE);
+                        if (!addr ) {
+                                printk("IOMMU: can't validate: %llx\n", drhd->address);
+                                goto failed;
+                        }
+                        cap = dmar_readq(addr + DMAR_CAP_REG);
+                        ecap = dmar_readq(addr + DMAR_ECAP_REG);
+                        early_iounmap(addr, VTD_PAGE_SIZE);
+                        if (cap == (uint64_t)-1 && ecap == (uint64_t)-1) {
+                                /* Promote an attitude of violence to a BIOS engineer today */
+                                WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"
+                                     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+                                      drhd->address,
+                                      dmi_get_system_info(DMI_BIOS_VENDOR),
+                                      dmi_get_system_info(DMI_BIOS_VERSION),
+                                      dmi_get_system_info(DMI_PRODUCT_VERSION));
+                                bios_warned = 1;
+                                goto failed;
                         }
-                        break;
                 }
 
                 entry_header = ((void *)entry_header + entry_header->length);
         }
         return 1;
+
+failed:
+#ifdef CONFIG_DMAR
+        dmar_disabled = 1;
+#endif
+        return 0;
 }
 
 void __init detect_intel_iommu(void)
@@ -645,9 +705,15 @@ void __init detect_intel_iommu(void)
                                "x2apic and Intr-remapping.\n");
 #endif
 #ifdef CONFIG_DMAR
-                if (ret && !no_iommu && !iommu_detected && !swiotlb &&
-                    !dmar_disabled)
+                if (ret && !no_iommu && !iommu_detected && !dmar_disabled) {
                         iommu_detected = 1;
+                        /* Make sure ACS will be enabled */
+                        pci_request_acs();
+                }
+#endif
+#ifdef CONFIG_X86
+                if (ret)
+                        x86_init.iommu.iommu_init = intel_iommu_init;
 #endif
         }
         early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
@@ -664,6 +730,18 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
         int agaw = 0;
         int msagaw = 0;
 
+        if (!drhd->reg_base_addr) {
+                if (!bios_warned) {
+                        WARN(1, "Your BIOS is broken; DMAR reported at address zero!\n"
+                             "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+                             dmi_get_system_info(DMI_BIOS_VENDOR),
+                             dmi_get_system_info(DMI_BIOS_VERSION),
+                             dmi_get_system_info(DMI_PRODUCT_VERSION));
+                        bios_warned = 1;
+                }
+                return -EINVAL;
+        }
+
         iommu = kzalloc(sizeof(*iommu), GFP_KERNEL);
         if (!iommu)
                 return -ENOMEM;
@@ -680,13 +758,16 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
         iommu->ecap = dmar_readq(iommu->reg + DMAR_ECAP_REG);
 
         if (iommu->cap == (uint64_t)-1 && iommu->ecap == (uint64_t)-1) {
-                /* Promote an attitude of violence to a BIOS engineer today */
-                WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"
-                     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
-                     drhd->reg_base_addr,
-                     dmi_get_system_info(DMI_BIOS_VENDOR),
-                     dmi_get_system_info(DMI_BIOS_VERSION),
-                     dmi_get_system_info(DMI_PRODUCT_VERSION));
+                if (!bios_warned) {
+                        /* Promote an attitude of violence to a BIOS engineer today */
+                        WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"
+                             "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+                             drhd->reg_base_addr,
+                             dmi_get_system_info(DMI_BIOS_VENDOR),
+                             dmi_get_system_info(DMI_BIOS_VERSION),
+                             dmi_get_system_info(DMI_PRODUCT_VERSION));
+                        bios_warned = 1;
+                }
                 goto err_unmap;
         }
 
@@ -709,6 +790,8 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
         iommu->agaw = agaw;
         iommu->msagaw = msagaw;
 
+        iommu->node = -1;
+
         /* the registers might be more than one page */
         map_size = max_t(int, ecap_max_iotlb_offset(iommu->ecap),
                 cap_max_fault_reg_offset(iommu->cap));
@@ -1050,6 +1133,7 @@ static void __dmar_enable_qi(struct intel_iommu *iommu)
 int dmar_enable_qi(struct intel_iommu *iommu)
 {
         struct q_inval *qi;
+        struct page *desc_page;
 
         if (!ecap_qis(iommu->ecap))
                 return -ENOENT;
@@ -1066,13 +1150,16 @@ int dmar_enable_qi(struct intel_iommu *iommu)
 
         qi = iommu->qi;
 
-        qi->desc = (void *)(get_zeroed_page(GFP_ATOMIC));
-        if (!qi->desc) {
+
+        desc_page = alloc_pages_node(iommu->node, GFP_ATOMIC | __GFP_ZERO, 0);
+        if (!desc_page) {
                 kfree(qi);
                 iommu->qi = 0;
                 return -ENOMEM;
         }
 
+        qi->desc = page_address(desc_page);
+
         qi->desc_status = kmalloc(QI_LENGTH * sizeof(int), GFP_ATOMIC);
         if (!qi->desc_status) {
                 free_page((unsigned long) qi->desc);