Merge branch 'pci/reset'
- Wait for each level of downstream bus, not just the first, to become accessible before restoring devices on that bus (Ilpo Järvinen) * pci/reset: PCI: Wait for Link before restoring Downstream Buses
This commit is contained in:
+6
-2
@@ -5694,8 +5694,10 @@ static void pci_bus_restore_locked(struct pci_bus *bus)
|
||||
|
||||
list_for_each_entry(dev, &bus->devices, bus_list) {
|
||||
pci_dev_restore(dev);
|
||||
if (dev->subordinate)
|
||||
if (dev->subordinate) {
|
||||
pci_bridge_wait_for_secondary_bus(dev, "bus reset");
|
||||
pci_bus_restore_locked(dev->subordinate);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5729,8 +5731,10 @@ static void pci_slot_restore_locked(struct pci_slot *slot)
|
||||
if (!dev->slot || dev->slot != slot)
|
||||
continue;
|
||||
pci_dev_restore(dev);
|
||||
if (dev->subordinate)
|
||||
if (dev->subordinate) {
|
||||
pci_bridge_wait_for_secondary_bus(dev, "slot reset");
|
||||
pci_bus_restore_locked(dev->subordinate);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user