From 4105f1af6c9b1bb930d852b75735b2b7bec0db29 Mon Sep 17 00:00:00 2001 From: Jan Glauber Date: Thu, 10 May 2018 21:32:00 +0200 Subject: [PATCH] PCI: Avoid slot reset if bridge itself is broken When checking to see if a PCI slot can safely be reset, we previously checked to see if any of the children had their PCI_DEV_FLAGS_NO_BUS_RESET flag set. Some PCIe root port bridges do not behave well after a slot reset, and may cause the device in the slot to become unusable. Add a check for PCI_DEV_FLAGS_NO_BUS_RESET being set in the bridge device to prevent the slot from being reset. BugLink: https://launchpad.net/bugs/1770254 Signed-off-by: Jan Glauber Signed-off-by: Bjorn Helgaas Reviewed-by: Alex Williamson (cherry picked from commit 33ba90aa4d4432b884fc0ed57ba9dc12eb8fa288) Signed-off-by: Manoj Iyer Acked-by: Kleber Sacilotto de Souza Acked-by: Khalid Elmously Signed-off-by: Kleber Sacilotto de Souza --- drivers/pci/pci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 02e844c1e637..ba6b9b908acb 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4447,6 +4447,10 @@ static bool pci_slot_resetable(struct pci_slot *slot) { struct pci_dev *dev; + if (slot->bus->self && + (slot->bus->self->dev_flags & PCI_DEV_FLAGS_NO_BUS_RESET)) + return false; + list_for_each_entry(dev, &slot->bus->devices, bus_list) { if (!dev->slot || dev->slot != slot) continue; -- 2.39.2