Merge branch 'topic/kong-acpiphp-remove' into next

* topic/kong-acpiphp-remove:
  PCI: acpiphp: remove all functions in slot, even without ACPI _EJx
  PCI: acpiphp: fix function 0 leak when disabling a slot

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 62d0ae4dfcada986fa7acd29cc1a39e2fce579d8..73af3374e915d740bab28f674b95e0aa8d95762c 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -878,6 +878,24 @@ static void disable_bridges(struct pci_bus *bus)
        }
 }
 
+/* return first device in slot, acquiring a reference on it */
+static struct pci_dev *dev_in_slot(struct acpiphp_slot *slot)
+{
+       struct pci_bus *bus = slot->bridge->pci_bus;
+       struct pci_dev *dev;
+       struct pci_dev *ret = NULL;
+
+       down_read(&pci_bus_sem);
+       list_for_each_entry(dev, &bus->devices, bus_list)
+               if (PCI_SLOT(dev->devfn) == slot->device) {
+                       ret = pci_dev_get(dev);
+                       break;
+               }
+       up_read(&pci_bus_sem);
+
+       return ret;
+}
+
 /**
  * disable_device - disable a slot
  * @slot: ACPI PHP slot
@@ -893,6 +911,7 @@ static int disable_device(struct acpiphp_slot *slot)
        pdev = pci_get_slot(bus, PCI_DEVFN(slot->device, 0));
        if (!pdev)
                goto err_exit;
+       pci_dev_put(pdev);
 
        list_for_each_entry(func, &slot->funcs, sibling) {
                if (func->bridge) {
@@ -901,18 +920,22 @@ static int disable_device(struct acpiphp_slot *slot)
                                                (u32)1, NULL, NULL);
                        func->bridge = NULL;
                }
+       }
 
-               pdev = pci_get_slot(slot->bridge->pci_bus,
-                                   PCI_DEVFN(slot->device, func->function));
-               if (pdev) {
-                       pci_stop_bus_device(pdev);
-                       if (pdev->subordinate) {
-                               disable_bridges(pdev->subordinate);
-                               pci_disable_device(pdev);
-                       }
-                       __pci_remove_bus_device(pdev);
-                       pci_dev_put(pdev);
+       /*
+        * enable_device() enumerates all functions in this device via
+        * pci_scan_slot(), whether they have associated ACPI hotplug
+        * methods (_EJ0, etc.) or not.  Therefore, we remove all functions
+        * here.
+        */
+       while ((pdev = dev_in_slot(slot))) {
+               pci_stop_bus_device(pdev);
+               if (pdev->subordinate) {
+                       disable_bridges(pdev->subordinate);
+                       pci_disable_device(pdev);
                }
+               __pci_remove_bus_device(pdev);
+               pci_dev_put(pdev);
        }
 
        list_for_each_entry(func, &slot->funcs, sibling) {

diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 9d75dc8ca602995826b80c842e40edfea1a2d866..993d4a0a24699661bc2adfef5125a6be07f50a64 100644 (file)
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -15,6 +15,8 @@
 #include "pci.h"
 
 DECLARE_RWSEM(pci_bus_sem);
+EXPORT_SYMBOL_GPL(pci_bus_sem);
+
 /*
  * find the upstream PCIe-to-PCI bridge of a PCI device
  * if the device is PCIE, return NULL