Merge branch 'pci/virtualization'

  - probe for device reset support during enumeration instead of runtime
    (Bjorn Helgaas)

  - add ACS quirk for Ampere (née APM) root ports (Feng Kan)

  - add function 1 DMA alias quirk for Marvell 88SE9220 (Thomas
    Vincent-Cross)

  - protect device restore with device lock (Sinan Kaya)

  - handle failure of FLR gracefully (Sinan Kaya)

  - handle CRS (config retry status) after device resets (Sinan Kaya)

  - skip various config reads for SR-IOV VFs as an optimization (KarimAllah
    Ahmed)

* pci/virtualization:
  PCI/IOV: Add missing prototypes for powerpc pcibios interfaces
  PCI/IOV: Use VF0 cached config registers for other VFs
  PCI/IOV: Skip BAR sizing for VFs
  PCI/IOV: Skip INTx config reads for VFs
  PCI: Wait for device to become ready after secondary bus reset
  PCI: Add a return type for pci_reset_bridge_secondary_bus()
  PCI: Wait for device to become ready after a power management reset
  PCI: Rename pci_flr_wait() to pci_dev_wait() and make it generic
  PCI: Handle FLR failure and allow other reset types
  PCI: Protect restore with device lock to be consistent
  PCI: Add function 1 DMA alias quirk for Marvell 88SE9220
  PCI: Add ACS quirk for Ampere root ports
  PCI: Remove redundant probes for device reset support
  PCI: Probe for device reset support during enumeration

Conflicts:
	include/linux/pci.h

diff --cc drivers/pci/iov.c
Simple merge

diff --cc drivers/pci/pci-sysfs.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/pci.h
Simple merge

diff --cc drivers/pci/probe.c
Simple merge

diff --cc drivers/pci/quirks.c
Simple merge

diff --cc include/linux/pci.h
index ee0bfc1a0274265fdcfaa4b99680158848438829,df17288fc1f6b3c8b0f395ba6579c2b7bd2ae442..283953c90b5277e48d5212b657743c0e081f0e2b
--- 1/include/linux/pci.h
--- 2/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -1081,11 -1082,7 +1081,11 @@@ int pcie_get_mps(struct pci_dev *dev)
  int pcie_set_mps(struct pci_dev *dev, int mps);
  int pcie_get_minimum_link(struct pci_dev *dev, enum pci_bus_speed *speed,
                          enum pcie_link_width *width);
- void pcie_flr(struct pci_dev *dev);
 +u32 pcie_bandwidth_available(struct pci_dev *dev, struct pci_dev **limiting_dev,
 +                           enum pci_bus_speed *speed,
 +                           enum pcie_link_width *width);
 +void pcie_print_link_status(struct pci_dev *dev);
+ int pcie_flr(struct pci_dev *dev);
  int __pci_reset_function_locked(struct pci_dev *dev);
  int pci_reset_function(struct pci_dev *dev);
  int pci_reset_function_locked(struct pci_dev *dev);

diff --cc include/linux/pci_ids.h
Simple merge