Merge tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
[linux-3.10.git] / drivers / pci / remove.c
index 27a294b..cc875e6 100644 (file)
@@ -1,5 +1,6 @@
 #include <linux/pci.h>
 #include <linux/module.h>
+#include <linux/pci-aspm.h>
 #include "pci.h"
 
 static void pci_free_resources(struct pci_dev *dev)
@@ -16,64 +17,86 @@ static void pci_free_resources(struct pci_dev *dev)
        }
 }
 
-static void pci_destroy_dev(struct pci_dev *dev)
+static void pci_stop_dev(struct pci_dev *dev)
 {
-       if (!list_empty(&dev->global_list)) {
+       pci_pme_active(dev, false);
+
+       if (dev->is_added) {
                pci_proc_detach_device(dev);
                pci_remove_sysfs_dev_files(dev);
-               device_unregister(&dev->dev);
-               spin_lock(&pci_bus_lock);
-               list_del(&dev->global_list);
-               dev->global_list.next = dev->global_list.prev = NULL;
-               spin_unlock(&pci_bus_lock);
+               device_del(&dev->dev);
+               dev->is_added = 0;
        }
 
-       /* Remove the device from the device lists, and prevent any further
-        * list accesses from this device */
-       spin_lock(&pci_bus_lock);
+       if (dev->bus->self)
+               pcie_aspm_exit_link_state(dev);
+}
+
+static void pci_destroy_dev(struct pci_dev *dev)
+{
+       down_write(&pci_bus_sem);
        list_del(&dev->bus_list);
-       dev->bus_list.next = dev->bus_list.prev = NULL;
-       spin_unlock(&pci_bus_lock);
+       up_write(&pci_bus_sem);
 
        pci_free_resources(dev);
-       pci_dev_put(dev);
+       put_device(&dev->dev);
 }
 
-/**
- * pci_remove_device_safe - remove an unused hotplug device
- * @dev: the device to remove
- *
- * Delete the device structure from the device lists and 
- * notify userspace (/sbin/hotplug), but only if the device
- * in question is not being used by a driver.
- * Returns 0 on success.
- */
-int pci_remove_device_safe(struct pci_dev *dev)
+void pci_remove_bus(struct pci_bus *bus)
 {
-       if (pci_dev_driver(dev))
-               return -EBUSY;
-       pci_destroy_dev(dev);
-       return 0;
+       pci_proc_detach_bus(bus);
+
+       down_write(&pci_bus_sem);
+       list_del(&bus->node);
+       pci_bus_release_busn_res(bus);
+       up_write(&pci_bus_sem);
+       if (!bus->is_added)
+               return;
+
+       pci_remove_legacy_files(bus);
+       device_unregister(&bus->dev);
 }
-EXPORT_SYMBOL(pci_remove_device_safe);
+EXPORT_SYMBOL(pci_remove_bus);
 
-void pci_remove_bus(struct pci_bus *pci_bus)
+static void pci_stop_bus_device(struct pci_dev *dev)
 {
-       pci_proc_detach_bus(pci_bus);
-
-       spin_lock(&pci_bus_lock);
-       list_del(&pci_bus->node);
-       spin_unlock(&pci_bus_lock);
-       pci_remove_legacy_files(pci_bus);
-       class_device_remove_file(&pci_bus->class_dev,
-               &class_device_attr_cpuaffinity);
-       sysfs_remove_link(&pci_bus->class_dev.kobj, "bridge");
-       class_device_unregister(&pci_bus->class_dev);
+       struct pci_bus *bus = dev->subordinate;
+       struct pci_dev *child, *tmp;
+
+       /*
+        * Stopping an SR-IOV PF device removes all the associated VFs,
+        * which will update the bus->devices list and confuse the
+        * iterator.  Therefore, iterate in reverse so we remove the VFs
+        * first, then the PF.
+        */
+       if (bus) {
+               list_for_each_entry_safe_reverse(child, tmp,
+                                                &bus->devices, bus_list)
+                       pci_stop_bus_device(child);
+       }
+
+       pci_stop_dev(dev);
+}
+
+static void pci_remove_bus_device(struct pci_dev *dev)
+{
+       struct pci_bus *bus = dev->subordinate;
+       struct pci_dev *child, *tmp;
+
+       if (bus) {
+               list_for_each_entry_safe(child, tmp,
+                                        &bus->devices, bus_list)
+                       pci_remove_bus_device(child);
+
+               pci_remove_bus(bus);
+               dev->subordinate = NULL;
+       }
+
+       pci_destroy_dev(dev);
 }
-EXPORT_SYMBOL(pci_remove_bus);
 
 /**
- * pci_remove_bus_device - remove a PCI device and any children
+ * pci_stop_and_remove_bus_device - remove a PCI device and any children
  * @dev: the device to remove
  *
  * Remove a PCI device from the device lists, informing the drivers
@@ -84,39 +107,45 @@ EXPORT_SYMBOL(pci_remove_bus);
  * device lists, remove the /proc entry, and notify userspace
  * (/sbin/hotplug).
  */
-void pci_remove_bus_device(struct pci_dev *dev)
+void pci_stop_and_remove_bus_device(struct pci_dev *dev)
 {
-       if (dev->subordinate) {
-               struct pci_bus *b = dev->subordinate;
+       pci_stop_bus_device(dev);
+       pci_remove_bus_device(dev);
+}
+EXPORT_SYMBOL(pci_stop_and_remove_bus_device);
 
-               pci_remove_behind_bridge(dev);
-               pci_remove_bus(b);
-               dev->subordinate = NULL;
-       }
+void pci_stop_root_bus(struct pci_bus *bus)
+{
+       struct pci_dev *child, *tmp;
+       struct pci_host_bridge *host_bridge;
 
-       pci_destroy_dev(dev);
+       if (!pci_is_root_bus(bus))
+               return;
+
+       host_bridge = to_pci_host_bridge(bus->bridge);
+       list_for_each_entry_safe_reverse(child, tmp,
+                                        &bus->devices, bus_list)
+               pci_stop_bus_device(child);
+
+       /* stop the host bridge */
+       device_del(&host_bridge->dev);
 }
 
-/**
- * pci_remove_behind_bridge - remove all devices behind a PCI bridge
- * @dev: PCI bridge device
- *
- * Remove all devices on the bus, except for the parent bridge.
- * This also removes any child buses, and any devices they may
- * contain in a depth-first manner.
- */
-void pci_remove_behind_bridge(struct pci_dev *dev)
+void pci_remove_root_bus(struct pci_bus *bus)
 {
-       struct list_head *l, *n;
+       struct pci_dev *child, *tmp;
+       struct pci_host_bridge *host_bridge;
 
-       if (dev->subordinate) {
-               list_for_each_safe(l, n, &dev->subordinate->devices) {
-                       struct pci_dev *dev = pci_dev_b(l);
+       if (!pci_is_root_bus(bus))
+               return;
 
-                       pci_remove_bus_device(dev);
-               }
-       }
-}
+       host_bridge = to_pci_host_bridge(bus->bridge);
+       list_for_each_entry_safe(child, tmp,
+                                &bus->devices, bus_list)
+               pci_remove_bus_device(child);
+       pci_remove_bus(bus);
+       host_bridge->bus = NULL;
 
-EXPORT_SYMBOL(pci_remove_bus_device);
-EXPORT_SYMBOL(pci_remove_behind_bridge);
+       /* remove the host bridge */
+       put_device(&host_bridge->dev);
+}