Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79cc9601 authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes
Browse files

PCI: Only call pci_stop_bus_device() one time for child devices at remove 



During debugging pcie hotplug with SRIOV with pcie switch, I found
pci_stop_bus_device() is called several times for some child devices.

So change original pci_remove_bus_device() to __pci_remove_bus_device(),
and make it only do remove work, and add a new pci_remove_bus_device
that calls pci_stop_bus_device() one time, and then call
__pci_remove_bus_device().

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent ca3671a8

drivers/pci/remove.c

+7 −3
Original line number Diff line number Diff line
@@ -89,9 +89,8 @@ 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)

static void __pci_remove_bus_device(struct pci_dev *dev)

{

	pci_stop_bus_device(dev);

	if (dev->subordinate) {

		struct pci_bus *b = dev->subordinate;
@@ -102,6 +101,11 @@ void pci_remove_bus_device(struct pci_dev *dev) 


	pci_destroy_dev(dev);

}

void pci_remove_bus_device(struct pci_dev *dev)

{

	pci_stop_bus_device(dev);

	__pci_remove_bus_device(dev);

}



/**

 * pci_remove_behind_bridge - remove all devices behind a PCI bridge
@@ -117,7 +121,7 @@ void pci_remove_behind_bridge(struct pci_dev *dev) 


	if (dev->subordinate)

		list_for_each_safe(l, n, &dev->subordinate->devices)

			pci_remove_bus_device(pci_dev_b(l));

			__pci_remove_bus_device(pci_dev_b(l));

}



static void pci_stop_bus_devices(struct pci_bus *bus)