mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-22 22:51:37 +00:00
powerpc/eeh: Keep PE during hotplug
When we do normal hotplug, the PE (shadow EEH structure) shouldn't be kept around. However, we need to keep it if the hotplug an artifial one caused by EEH errors recovery. Since we remove EEH device through the PCI hook pcibios_release_device(), the flag "purge_pe" passed to various functions is meaningless. So the patch removes the meaningless flag and introduce new flag "EEH_PE_KEEP" to save the PE while doing hotplug during EEH error recovery. Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
c7b51bce63
commit
807a827d4e
6 changed files with 30 additions and 70 deletions
|
@ -29,36 +29,7 @@
|
|||
*/
|
||||
void pcibios_release_device(struct pci_dev *dev)
|
||||
{
|
||||
eeh_remove_device(dev, 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* __pcibios_remove_pci_devices - remove all devices under this bus
|
||||
* @bus: the indicated PCI bus
|
||||
* @purge_pe: destroy the PE on removal of PCI devices
|
||||
*
|
||||
* Remove all of the PCI devices under this bus both from the
|
||||
* linux pci device tree, and from the powerpc EEH address cache.
|
||||
* By default, the corresponding PE will be destroied during the
|
||||
* normal PCI hotplug path. For PCI hotplug during EEH recovery,
|
||||
* the corresponding PE won't be destroied and deallocated.
|
||||
*/
|
||||
void __pcibios_remove_pci_devices(struct pci_bus *bus, int purge_pe)
|
||||
{
|
||||
struct pci_dev *dev, *tmp;
|
||||
struct pci_bus *child_bus;
|
||||
|
||||
/* First go down child busses */
|
||||
list_for_each_entry(child_bus, &bus->children, node)
|
||||
__pcibios_remove_pci_devices(child_bus, purge_pe);
|
||||
|
||||
pr_debug("PCI: Removing devices on bus %04x:%02x\n",
|
||||
pci_domain_nr(bus), bus->number);
|
||||
list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {
|
||||
pr_debug(" * Removing %s...\n", pci_name(dev));
|
||||
eeh_remove_bus_device(dev, purge_pe);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
}
|
||||
eeh_remove_device(dev);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -70,8 +41,21 @@ void __pcibios_remove_pci_devices(struct pci_bus *bus, int purge_pe)
|
|||
*/
|
||||
void pcibios_remove_pci_devices(struct pci_bus *bus)
|
||||
{
|
||||
__pcibios_remove_pci_devices(bus, 1);
|
||||
struct pci_dev *dev, *tmp;
|
||||
struct pci_bus *child_bus;
|
||||
|
||||
/* First go down child busses */
|
||||
list_for_each_entry(child_bus, &bus->children, node)
|
||||
pcibios_remove_pci_devices(child_bus);
|
||||
|
||||
pr_debug("PCI: Removing devices on bus %04x:%02x\n",
|
||||
pci_domain_nr(bus), bus->number);
|
||||
list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {
|
||||
pr_debug(" Removing %s...\n", pci_name(dev));
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
}
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(pcibios_remove_pci_devices);
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue