1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index cd4de7e038ea..c6bcb8c719d8 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -33,6 +33,7 @@
 #include <linux/pci.h>
 #include <linux/pci-acpi.h>
 #include <linux/pci-aspm.h>
+#include <linux/dmar.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
 #include <linux/dmi.h>
@@ -525,6 +526,7 @@ static int acpi_pci_root_add(struct acpi_device *device,
         struct acpi_pci_root *root;
         acpi_handle handle = device->handle;
         int no_aspm = 0, clear_aspm = 0;
+        bool hotadd = system_state != SYSTEM_BOOTING;
 
         root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
         if (!root)
@@ -571,6 +573,11 @@ static int acpi_pci_root_add(struct acpi_device *device,
         strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);
         device->driver_data = root;
 
+        if (hotadd && dmar_device_add(handle)) {
+                result = -ENXIO;
+                goto end;
+        }
+
         pr_info(PREFIX "%s [%s] (domain %04x %pR)\n",
                acpi_device_name(device), acpi_device_bid(device),
                root->segment, &root->secondary);
@@ -597,7 +604,7 @@ static int acpi_pci_root_add(struct acpi_device *device,
                         root->segment, (unsigned int)root->secondary.start);
                 device->driver_data = NULL;
                 result = -ENODEV;
-                goto end;
+                goto remove_dmar;
         }
 
         if (clear_aspm) {
@@ -611,7 +618,7 @@ static int acpi_pci_root_add(struct acpi_device *device,
         if (device->wakeup.flags.run_wake)
                 device_set_run_wake(root->bus->bridge, true);
 
-        if (system_state != SYSTEM_BOOTING) {
+        if (hotadd) {
                 pcibios_resource_survey_bus(root->bus);
                 pci_assign_unassigned_root_bus_resources(root->bus);
         }
@@ -621,6 +628,9 @@ static int acpi_pci_root_add(struct acpi_device *device,
         pci_unlock_rescan_remove();
         return 1;
 
+remove_dmar:
+        if (hotadd)
+                dmar_device_remove(handle);
 end:
         kfree(root);
         return result;
@@ -639,6 +649,8 @@ static void acpi_pci_root_remove(struct acpi_device *device)
 
         pci_remove_root_bus(root->bus);
 
+        dmar_device_remove(device->handle);
+
         pci_unlock_rescan_remove();
 
         kfree(root);