Skip to content

Commit

Permalink
PCI: add pci_stop_bus_device
Browse files Browse the repository at this point in the history
This patch adds pci_stop_bus_device() which stops a PCI device (detach
the driver, remove from the global list and so on) and any children.
This is needed for ACPI based PCI-to-PCI bridge hot-remove, and it will
be also needed for ACPI based PCI root bridge hot-remove.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: MUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>
Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Satoru Takeuchi authored and Greg Kroah-Hartman committed Sep 27, 2006
1 parent 9b1d19e commit 24f8aa9
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
37 changes: 36 additions & 1 deletion drivers/pci/remove.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ 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 (!dev->global_list.next)
return;

if (!list_empty(&dev->global_list)) {
pci_proc_detach_device(dev);
pci_remove_sysfs_dev_files(dev);
Expand All @@ -27,6 +30,11 @@ static void pci_destroy_dev(struct pci_dev *dev)
dev->global_list.next = dev->global_list.prev = NULL;
up_write(&pci_bus_sem);
}
}

static void pci_destroy_dev(struct pci_dev *dev)
{
pci_stop_dev(dev);

/* Remove the device from the device lists, and prevent any further
* list accesses from this device */
Expand Down Expand Up @@ -119,5 +127,32 @@ void pci_remove_behind_bridge(struct pci_dev *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);
1 change: 1 addition & 0 deletions include/linux/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ extern struct pci_dev *pci_dev_get(struct pci_dev *dev);
extern void pci_dev_put(struct pci_dev *dev);
extern void pci_remove_bus(struct pci_bus *b);
extern void pci_remove_bus_device(struct pci_dev *dev);
extern void pci_stop_bus_device(struct pci_dev *dev);
void pci_setup_cardbus(struct pci_bus *bus);

/* Generic PCI functions exported to card drivers */
Expand Down

0 comments on commit 24f8aa9

Please sign in to comment.