[1/3] PCI: Avoid bus reset if bridge itself is broken

Message ID 20180510193254.32224-2-manoj.iyer@canonical.com
State New
Headers show
  • [1/3] PCI: Avoid bus reset if bridge itself is broken
Related show

Commit Message

Manoj Iyer May 10, 2018, 7:32 p.m.
From: David Daney <david.daney@cavium.com>

When checking to see if a PCI bus can safely be reset, we previously
checked to see if any of the children had their PCI_DEV_FLAGS_NO_BUS_RESET
flag set.  Children marked with that flag are known not to behave well
after a bus reset.

Some PCIe root port bridges also do not behave well after a bus reset,
sometimes causing the devices behind the bridge to become unusable.

Add a check for PCI_DEV_FLAGS_NO_BUS_RESET being set in the bridge device
to allow these bridges to be flagged, and prevent their secondary buses
from being reset.

BugLink: https://launchpad.net/bugs/1770254

Signed-off-by: David Daney <david.daney@cavium.com>
[jglauber@cavium.com: fixed typo]
Signed-off-by: Jan Glauber <jglauber@cavium.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
(cherry picked from commit 357027786f3523d26f42391aa4c075b8495e5d28)
Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
 drivers/pci/pci.c | 4 ++++
 1 file changed, 4 insertions(+)


diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index a47f55e3057a..2cce730f8ce9 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4362,6 +4362,10 @@  static bool pci_bus_resetable(struct pci_bus *bus)
 	struct pci_dev *dev;
+	if (bus->self && (bus->self->dev_flags & PCI_DEV_FLAGS_NO_BUS_RESET))
+		return false;
 	list_for_each_entry(dev, &bus->devices, bus_list) {
 		if (dev->dev_flags & PCI_DEV_FLAGS_NO_BUS_RESET ||
 		    (dev->subordinate && !pci_bus_resetable(dev->subordinate)))