Merge branch 'pci/locking' into next

* pci/locking:
  PCI: Check parent kobject in pci_destroy_dev()
  xen/pcifront: Use global PCI rescan-remove locking
  powerpc/eeh: Use global PCI rescan-remove locking
  MPT / PCI: Use pci_stop_and_remove_bus_device_locked()
  platform / x86: Use global PCI rescan-remove locking
  PCI: hotplug: Use global PCI rescan-remove locking
  pcmcia: Use global PCI rescan-remove locking
  ACPI / hotplug / PCI: Use global PCI rescan-remove locking
  ACPI / PCI: Use global PCI rescan-remove locking in PCI root hotplug
  PCI: Add global pci_lock_rescan_remove()

25 files changed, 209 insertions, 44 deletions

diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index 36bed5a12750..c17f90d0f73c 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -369,7 +369,9 @@ static void *eeh_rmv_device(void *data, void *userdata)
         edev->mode |= EEH_DEV_DISCONNECTED;
         (*removed)++;
 
+        pci_lock_rescan_remove();
         pci_stop_and_remove_bus_device(dev);
+        pci_unlock_rescan_remove();
 
         return NULL;
 }
@@ -416,10 +418,13 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus)
          * into pcibios_add_pci_devices().
          */
         eeh_pe_state_mark(pe, EEH_PE_KEEP);
-        if (bus)
+        if (bus) {
+                pci_lock_rescan_remove();
                 pcibios_remove_pci_devices(bus);
-        else if (frozen_bus)
+                pci_unlock_rescan_remove();
+        } else if (frozen_bus) {
                 eeh_pe_dev_traverse(pe, eeh_rmv_device, &removed);
+        }
 
         /* Reset the pci controller. (Asserts RST#; resets config space).
          * Reconfigure bridges and devices. Don't try to bring the system
@@ -429,6 +434,8 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus)
         if (rc)
                 return rc;
 
+        pci_lock_rescan_remove();
+
         /* Restore PE */
         eeh_ops->configure_bridge(pe);
         eeh_pe_restore_bars(pe);
@@ -462,6 +469,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus)
         pe->tstamp = tstamp;
         pe->freeze_count = cnt;
 
+        pci_unlock_rescan_remove();
         return 0;
 }
 
@@ -618,8 +626,11 @@ perm_error:
         eeh_pe_dev_traverse(pe, eeh_report_failure, NULL);
 
         /* Shut down the device drivers for good. */
-        if (frozen_bus)
+        if (frozen_bus) {
+                pci_lock_rescan_remove();
                 pcibios_remove_pci_devices(frozen_bus);
+                pci_unlock_rescan_remove();
+        }
 }
 
 static void eeh_handle_special_event(void)
@@ -692,6 +703,7 @@ static void eeh_handle_special_event(void)
         if (rc == 2 || rc == 1)
                 eeh_handle_normal_event(pe);
         else {
+                pci_lock_rescan_remove();
                 list_for_each_entry_safe(hose, tmp,
                         &hose_list, list_node) {
                         phb_pe = eeh_phb_pe_get(hose);
@@ -703,6 +715,7 @@ static void eeh_handle_special_event(void)
                         eeh_pe_dev_traverse(pe, eeh_report_failure, NULL);
                         pcibios_remove_pci_devices(bus);
                 }
+                pci_unlock_rescan_remove();
         }
 }
 
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 0703bff5e60e..07ee02aa3c51 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -596,7 +596,9 @@ static int acpi_pci_root_add(struct acpi_device *device,
                 pci_assign_unassigned_root_bus_resources(root->bus);
         }
 
+        pci_lock_rescan_remove();
         pci_bus_add_devices(root->bus);
+        pci_unlock_rescan_remove();
         return 1;
 
 end:
@@ -608,6 +610,8 @@ static void acpi_pci_root_remove(struct acpi_device *device)
 {
         struct acpi_pci_root *root = acpi_driver_data(device);
 
+        pci_lock_rescan_remove();
+
         pci_stop_root_bus(root->bus);
 
         device_set_run_wake(root->bus->bridge, false);
@@ -615,6 +619,8 @@ static void acpi_pci_root_remove(struct acpi_device *device)
 
         pci_remove_root_bus(root->bus);
 
+        pci_unlock_rescan_remove();
+
         kfree(root);
 }
 
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 767ff4d839f4..570b18a113ff 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -346,7 +346,7 @@ static int mpt_remove_dead_ioc_func(void *arg)
         if ((pdev == NULL))
                 return -1;
 
-        pci_stop_and_remove_bus_device(pdev);
+        pci_stop_and_remove_bus_device_locked(pdev);
         return 0;
 }
 
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
index 1592dbe4f904..b6162be4df40 100644
--- a/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@ -77,6 +77,8 @@ struct acpiphp_bridge {
 
         /* PCI-to-PCI bridge device */
         struct pci_dev *pci_dev;
+