Merge tag 'pci-v5.0-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

torvalds · torvalds · commit 70be9ac2b64c · 2019-02-08T15:32:10.000-08:00
Pull PCI fix from Bjorn Helgaas:
 "Work around Synopsys duplicate Device ID (HAPS USB3, NXP i.MX) that
  breaks PCIe on I.MX SoCs (Thinh Nguyen)"

* tag 'pci-v5.0-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Work around Synopsys duplicate Device ID (HAPS USB3, NXP i.MX)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
@@ -639,8 +639,9 @@ static void quirk_synopsys_haps(struct pci_dev *pdev)
 		break;
 	}
 }
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID,
-			 quirk_synopsys_haps);
+DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID,
+			       PCI_CLASS_SERIAL_USB_XHCI, 0,
+			       quirk_synopsys_haps);
 
 /*
  * Let's make the southbridge information explicit instead of having to

Original file line number	Diff line number	Diff line change
`@@ -639,8 +639,9 @@ static void quirk_synopsys_haps(struct pci_dev *pdev)`
`639`	`639`	`break;`
`640`	`640`	`}`
`641`	`641`	`}`
`642`		`-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID,`
`643`		`- quirk_synopsys_haps);`
	`642`	`+DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID,`
	`643`	`+ PCI_CLASS_SERIAL_USB_XHCI, 0,`
	`644`	`+ quirk_synopsys_haps);`
`644`	`645`
`645`	`646`	`/*`
`646`	`647`	`* Let's make the southbridge information explicit instead of having to`