mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 20:53:53 +08:00
282e1d655f
Previously, when we removed a PCI device, we made two passes over the hierarchy rooted at the device. In the first pass, we stopped all the devices, and in the second, we removed them. This patch combines the two passes into one so that we remove a device as soon as it and all its children have been stopped. Note that we previously stopped devices in reverse order and removed them in forward order. Now we stop and remove them in reverse order. Tested-by: Yijing Wang <wangyijing@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Yinghai Lu <yinghai@kernel.org>
117 lines
2.7 KiB
C
117 lines
2.7 KiB
C
#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)
|
|
{
|
|
int i;
|
|
|
|
msi_remove_pci_irq_vectors(dev);
|
|
|
|
pci_cleanup_rom(dev);
|
|
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
|
struct resource *res = dev->resource + i;
|
|
if (res->parent)
|
|
release_resource(res);
|
|
}
|
|
}
|
|
|
|
static void pci_stop_dev(struct pci_dev *dev)
|
|
{
|
|
if (dev->is_added) {
|
|
pci_proc_detach_device(dev);
|
|
pci_remove_sysfs_dev_files(dev);
|
|
device_unregister(&dev->dev);
|
|
dev->is_added = 0;
|
|
}
|
|
|
|
if (dev->bus->self)
|
|
pcie_aspm_exit_link_state(dev);
|
|
}
|
|
|
|
static void pci_destroy_dev(struct pci_dev *dev)
|
|
{
|
|
/* Remove the device from the device lists, and prevent any further
|
|
* list accesses from this device */
|
|
down_write(&pci_bus_sem);
|
|
list_del(&dev->bus_list);
|
|
dev->bus_list.next = dev->bus_list.prev = NULL;
|
|
up_write(&pci_bus_sem);
|
|
|
|
pci_free_resources(dev);
|
|
pci_dev_put(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.
|
|
*/
|
|
#if 0
|
|
int pci_remove_device_safe(struct pci_dev *dev)
|
|
{
|
|
if (pci_dev_driver(dev))
|
|
return -EBUSY;
|
|
pci_destroy_dev(dev);
|
|
return 0;
|
|
}
|
|
#endif /* 0 */
|
|
|
|
void pci_remove_bus(struct pci_bus *pci_bus)
|
|
{
|
|
pci_proc_detach_bus(pci_bus);
|
|
|
|
down_write(&pci_bus_sem);
|
|
list_del(&pci_bus->node);
|
|
pci_bus_release_busn_res(pci_bus);
|
|
up_write(&pci_bus_sem);
|
|
if (!pci_bus->is_added)
|
|
return;
|
|
|
|
pci_remove_legacy_files(pci_bus);
|
|
device_unregister(&pci_bus->dev);
|
|
}
|
|
EXPORT_SYMBOL(pci_remove_bus);
|
|
|
|
/**
|
|
* 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
|
|
* that the device has been removed. We also remove any subordinate
|
|
* buses and children in a depth-first manner.
|
|
*
|
|
* For each device we remove, delete the device structure from the
|
|
* device lists, remove the /proc entry, and notify userspace
|
|
* (/sbin/hotplug).
|
|
*/
|
|
void pci_stop_and_remove_bus_device(struct pci_dev *dev)
|
|
{
|
|
struct pci_bus *bus = dev->subordinate;
|
|
struct pci_dev *child, *tmp;
|
|
|
|
/*
|
|
* Removing 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_and_remove_bus_device(child);
|
|
|
|
pci_remove_bus(bus);
|
|
dev->subordinate = NULL;
|
|
}
|
|
|
|
pci_stop_dev(dev);
|
|
pci_destroy_dev(dev);
|
|
}
|
|
EXPORT_SYMBOL(pci_stop_and_remove_bus_device);
|