Commit 29d0d441 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-thunder' into next 

* pci/host-thunder:
  PCI: Avoid slot reset if bridge itself is broken
  PCI: Avoid bus reset if bridge itself is broken
  PCI: Mark Cavium CN8xxx to avoid bus reset
parents d238be69 33ba90aa

drivers/pci/pci.c

+8 −0
Original line number Diff line number Diff line
@@ -4436,6 +4436,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)))
@@ -4500,6 +4504,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;

drivers/pci/quirks.c

+7 −0
Original line number Diff line number Diff line
@@ -3365,6 +3365,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0032, quirk_no_bus_reset); 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x003c, quirk_no_bus_reset);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0033, quirk_no_bus_reset);



/*

 * Root port on some Cavium CN8xxx chips do not successfully complete a bus

 * reset when used with certain child devices.  After the reset, config

 * accesses to the child may fail.

 */

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CAVIUM, 0xa100, quirk_no_bus_reset);



static void quirk_no_pm_reset(struct pci_dev *dev)

{

	/*