Commit 0ac448e0 authored by Mike Pastore's avatar Mike Pastore Committed by Bjorn Helgaas
Browse files

PCI: Delay after FLR of Solidigm P44 Pro NVMe 

Prevent KVM hang when a Solidgm P44 Pro NVMe is passed through to a guest
via IOMMU and the guest is subsequently rebooted.

A similar issue was identified and patched by 51ba0945 ("PCI: Delay
after FLR of Intel DC P3700 NVMe") and the same fix can be applied for this
case. (Intel spun off their NAND and SSD business as Solidigm and sold it
to SK Hynix in late 2021.)

Link: https://lore.kernel.org/r/20230507073519.9737-1-mike@oobak.org


Signed-off-by: default avatarMike Pastore <mike@oobak.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent ac9a7868

drivers/pci/quirks.c

+6 −4
Original line number Diff line number Diff line
@@ -3993,10 +3993,11 @@ static int nvme_disable_and_flr(struct pci_dev *dev, bool probe) 
}



/*

 * Intel DC P3700 NVMe controller will timeout waiting for ready status

 * to change after NVMe enable if the driver starts interacting with the

 * device too soon after FLR.  A 250ms delay after FLR has heuristically

 * proven to produce reliably working results for device assignment cases.

 * Some NVMe controllers such as Intel DC P3700 and Solidigm P44 Pro will

 * timeout waiting for ready status to change after NVMe enable if the driver

 * starts interacting with the device too soon after FLR.  A 250ms delay after

 * FLR has heuristically proven to produce reliably working results for device

 * assignment cases.

 */

static int delay_250ms_after_flr(struct pci_dev *dev, bool probe)

{
@@ -4083,6 +4084,7 @@ static const struct pci_dev_reset_methods pci_dev_reset_methods[] = { 
	{ 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_SOLIDIGM, 0xf1ac, delay_250ms_after_flr },

	{ PCI_VENDOR_ID_CHELSIO, PCI_ANY_ID,

		reset_chelsio_generic_dev },

	{ PCI_VENDOR_ID_HUAWEI, PCI_DEVICE_ID_HINIC_VF,

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ 


#define PCI_VENDOR_ID_LOONGSON		0x0014



#define PCI_VENDOR_ID_SOLIDIGM		0x025e



#define PCI_VENDOR_ID_TTTECH		0x0357

#define PCI_DEVICE_ID_TTTECH_MC322	0x000a