Commit 22d10673 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 7faf1dac 0349a070

drivers/pci/quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -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 }