3682a3946d
During test busn_res allocation with cardbus, found pci card removal is not
working anymore, and it turns out it is broken by:
|commit 79cc9601c3
|Date: Tue Nov 22 21:06:53 2011 -0800
|
| PCI: Only call pci_stop_bus_device() one time for child devices at remove
The above changed the behavior of pci_remove_behind_bridge that
yenta_cardbus depended on. So restore the old behavoir of
pci_remove_behind_bridge (which requires stopping and removing of all
devices) by:
1. rename pci_remove_behind_bridge to __pci_remove_behind_bridge, and let
__pci_remove_bus_device() call it instead.
2. add pci_stop_behind_bridge that will stop devices behind a bridge
3. add back pci_remove_behind_bridge that will stop and remove devices
under bridge.
-v2: update commit description a little bit.
Tested-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
171 lines
4 KiB
C
171 lines
4 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);
|
|
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);
|
|
|
|
static void __pci_remove_behind_bridge(struct pci_dev *dev);
|
|
/**
|
|
* pci_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).
|
|
*/
|
|
static void __pci_remove_bus_device(struct pci_dev *dev)
|
|
{
|
|
if (dev->subordinate) {
|
|
struct pci_bus *b = dev->subordinate;
|
|
|
|
__pci_remove_behind_bridge(dev);
|
|
pci_remove_bus(b);
|
|
dev->subordinate = NULL;
|
|
}
|
|
|
|
pci_destroy_dev(dev);
|
|
}
|
|
void pci_remove_bus_device(struct pci_dev *dev)
|
|
{
|
|
pci_stop_bus_device(dev);
|
|
__pci_remove_bus_device(dev);
|
|
}
|
|
|
|
static void __pci_remove_behind_bridge(struct pci_dev *dev)
|
|
{
|
|
struct list_head *l, *n;
|
|
|
|
if (dev->subordinate)
|
|
list_for_each_safe(l, n, &dev->subordinate->devices)
|
|
__pci_remove_bus_device(pci_dev_b(l));
|
|
}
|
|
|
|
static void pci_stop_behind_bridge(struct pci_dev *dev)
|
|
{
|
|
struct list_head *l, *n;
|
|
|
|
if (dev->subordinate)
|
|
list_for_each_safe(l, n, &dev->subordinate->devices)
|
|
pci_stop_bus_device(pci_dev_b(l));
|
|
}
|
|
|
|
/**
|
|
* 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)
|
|
{
|
|
pci_stop_behind_bridge(dev);
|
|
__pci_remove_behind_bridge(dev);
|
|
}
|
|
|
|
static void pci_stop_bus_devices(struct pci_bus *bus)
|
|
{
|
|
struct list_head *l, *n;
|
|
|
|
list_for_each_safe(l, n, &bus->devices) {
|
|
struct pci_dev *dev = pci_dev_b(l);
|
|
pci_stop_bus_device(dev);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* pci_stop_bus_device - stop a PCI device and any children
|
|
* @dev: the device to stop
|
|
*
|
|
* Stop a PCI device (detach the driver, remove from the global list
|
|
* and so on). This also stop any subordinate buses and children in a
|
|
* depth-first manner.
|
|
*/
|
|
void pci_stop_bus_device(struct pci_dev *dev)
|
|
{
|
|
if (dev->subordinate)
|
|
pci_stop_bus_devices(dev->subordinate);
|
|
|
|
pci_stop_dev(dev);
|
|
}
|
|
|
|
EXPORT_SYMBOL(pci_remove_bus_device);
|
|
EXPORT_SYMBOL(pci_remove_behind_bridge);
|
|
EXPORT_SYMBOL_GPL(pci_stop_bus_device);
|