Merge branch 'remotes/lorenzo/pci/loongson'

bjorn-helgaas · bjorn-helgaas · commit 64d293d8ac87 · 2020-08-05T18:24:19.000-05:00
- Fix loongson class code quirk so it happens early enough (Tiezhu Yang)

* remotes/lorenzo/pci/loongson:
  PCI: loongson: Use DECLARE_PCI_FIXUP_EARLY for bridge_class_quirk()
diff --git a/drivers/pci/controller/pci-loongson.c b/drivers/pci/controller/pci-loongson.c
@@ -37,11 +37,11 @@ static void bridge_class_quirk(struct pci_dev *dev)
 {
 	dev->class = PCI_CLASS_BRIDGE_PCI << 8;
 }
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_LOONGSON,
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,
 			DEV_PCIE_PORT_0, bridge_class_quirk);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_LOONGSON,
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,
 			DEV_PCIE_PORT_1, bridge_class_quirk);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_LOONGSON,
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,
 			DEV_PCIE_PORT_2, bridge_class_quirk);
 
 static void system_bus_quirk(struct pci_dev *pdev)

Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,11 @@ static void bridge_class_quirk(struct pci_dev *dev)`
`37`	`37`	`{`
`38`	`38`	`dev->class = PCI_CLASS_BRIDGE_PCI << 8;`
`39`	`39`	`}`
`40`		`-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_LOONGSON,`
	`40`	`+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,`
`41`	`41`	`DEV_PCIE_PORT_0, bridge_class_quirk);`
`42`		`-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_LOONGSON,`
	`42`	`+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,`
`43`	`43`	`DEV_PCIE_PORT_1, bridge_class_quirk);`
`44`		`-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_LOONGSON,`
	`44`	`+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,`
`45`	`45`	`DEV_PCIE_PORT_2, bridge_class_quirk);`
`46`	`46`
`47`	`47`	`static void system_bus_quirk(struct pci_dev *pdev)`