]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
PCI: Avoid slot reset if bridge itself is broken
authorJan Glauber <jglauber@cavium.com>
Thu, 10 May 2018 19:32:00 +0000 (21:32 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 23 May 2018 07:08:43 +0000 (09:08 +0200)
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 <jglauber@cavium.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
(cherry picked from commit 33ba90aa4d4432b884fc0ed57ba9dc12eb8fa288)
Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/pci/pci.c

index 02e844c1e63755e4e4a00e4b7d16d35942f35958..ba6b9b908acbefcabaf8a67512f81f5a347e1fd2 100644 (file)
@@ -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;