Merge branch 'pci/virtualization'

bjorn-helgaas · bjorn-helgaas · commit 9ad56b7c89d2 · 2023-08-29T11:03:50.000-05:00
- Avoid bus resets on NVIDIA T4 GPUs because they don't seem to recover (Wu
  Zongyong)

* pci/virtualization:
  PCI: Mark NVIDIA T4 GPUs to avoid bus reset
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
@@ -3726,7 +3726,7 @@ static void quirk_no_bus_reset(struct pci_dev *dev)
  */
 static void quirk_nvidia_no_bus_reset(struct pci_dev *dev)
 {
-	if ((dev->device & 0xffc0) == 0x2340)
+	if ((dev->device & 0xffc0) == 0x2340 || dev->device == 0x1eb8)
 		quirk_no_bus_reset(dev);
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,

Original file line number	Diff line number	Diff line change
`@@ -3726,7 +3726,7 @@ static void quirk_no_bus_reset(struct pci_dev *dev)`
`3726`	`3726`	`*/`
`3727`	`3727`	`static void quirk_nvidia_no_bus_reset(struct pci_dev *dev)`
`3728`	`3728`	`{`
`3729`		`- if ((dev->device & 0xffc0) == 0x2340)`
	`3729`	`+ if ((dev->device & 0xffc0) == 0x2340 \|\| dev->device == 0x1eb8)`
`3730`	`3730`	`quirk_no_bus_reset(dev);`
`3731`	`3731`	`}`
`3732`	`3732`	`DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,`