diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 18:43:24 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 18:43:24 +0300 |
commit | 22d106733a2579f68b19170f575f786bbfbf88f3 (patch) | |
tree | 2dfcc2d2227592e148555ff6dbf4d1da2dd7f7d2 /drivers/pci | |
parent | 7faf1dacfbc0edd6b0f25404e6c49af675c434af (diff) | |
parent | 0349a070881f7e3b4472d886989db092ed3ccac8 (diff) | |
download | linux-22d106733a2579f68b19170f575f786bbfbf88f3.tar.xz |
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
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/quirks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 6aa9df411604..af43b340853e 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -3917,6 +3917,7 @@ static const struct pci_dev_reset_methods pci_dev_reset_methods[] = { 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 } |