Merge branch 'pci/virtualization'

- Increase delay after FLR to work around Intel DC P4510 NVMe erratum
  (Raphael Norwitz)

* pci/virtualization:
  PCI: Delay after FLR of Intel DC P4510 NVMe

diff --combined drivers/pci/quirks.c
index 6aa9df4116046ed5fe0784a8c380d430c52e7775,5a8c059b848d9e355274ff2b0a9ade2f434cd824..af43b340853eefd4464735b367aaaf580c493455
--- 1/drivers/pci/quirks.c
--- 2/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@@ -206,11 -206,16 +206,11 @@@ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_I
                                PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on);
  
  /*
 - * The Mellanox Tavor device gives false positive parity errors.  Mark this
 - * device with a broken_parity_status to allow PCI scanning code to "skip"
 - * this now blacklisted device.
 + * The Mellanox Tavor device gives false positive parity errors.  Disable
 + * parity error reporting.
   */
 -static void quirk_mellanox_tavor(struct pci_dev *dev)
 -{
 -      dev->broken_parity_status = 1;  /* This device gives false positives */
 -}
 -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_TAVOR, quirk_mellanox_tavor);
 -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE, quirk_mellanox_tavor);
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_TAVOR, pci_disable_parity);
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE, pci_disable_parity);
  
  /*
   * Deal with broken BIOSes that neglect to enable passive release,
@@@ -3917,6 -3922,7 +3917,7 @@@ static const struct pci_dev_reset_metho
                reset_ivb_igd },
        { PCI_VENDOR_ID_SAMSUNG, 0xa804, nvme_disable_and_flr },
        { PCI_VENDOR_ID_INTEL, 0x0953, delay_250ms_after_flr },
+       { PCI_VENDOR_ID_INTEL, 0x0a54, delay_250ms_after_flr },
        { PCI_VENDOR_ID_CHELSIO, PCI_ANY_ID,
                reset_chelsio_generic_dev },
        { 0 }