[PATCH] PCI quirk: AMD 780: work around wrong vendor ID on APC bridge

[PATCH] PCI quirk: AMD 780: work around wrong vendor ID on APC bridge

[Clemens Ladisch]

In all AMD 780 family northbridges, the vendor ID of the internal
graphics PCI/PCI bridge reads not as AMD but as that of the mainboard
vendor, because the hardware actually returns the value of the subsystem
vendor ID (erratum 18).

We currently have additional quirk entries for Asus and Acer, but it is
likely that we will encounter more systems with other vendor IDs.

Since we do not know in advance all possible vendor IDs, a better way to
find the device is to declare the quirk on the host bridge, whose ID is
always correct, and use that device as a stepping stone to find the PCI/
PCI bridge, if present.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2123,12 +2123,29 @@ static void __devinit quirk_disable_msi(
 	}
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_msi);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x9602, quirk_disable_msi);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASUSTEK, 0x9602, quirk_disable_msi);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AI, 0x9602, quirk_disable_msi);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, 0xa238, quirk_disable_msi);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x5a3f, quirk_disable_msi);
 
+/*
+ * The APC bridge device in AMD 780 family northbridges has some random
+ * OEM subsystem ID in its vendor ID register (erratum 18), so instead
+ * we use the possible vendor/device IDs of the host bridge for the
+ * declared quirk, and search for the APC bridge by slot number.
+ */
+static void __devinit quirk_amd_780_apc_msi(struct pci_dev *host_bridge)
+{
+	struct pci_dev *apc_bridge;
+
+	apc_bridge = pci_get_slot(host_bridge->bus, PCI_DEVFN(1, 0));
+	if (apc_bridge) {
+		if (apc_bridge->device == 0x9602)
+			quirk_disable_msi(apc_bridge);
+		pci_dev_put(apc_bridge);
+	}
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x9600, quirk_amd_780_apc_msi);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x9601, quirk_amd_780_apc_msi);
+
 /* Go through the list of Hypertransport capabilities and
  * return 1 if a HT MSI capability is found and enabled */
 static int __devinit msi_ht_cap_enabled(struct pci_dev *dev)

Re: [PATCH] PCI quirk: AMD 780: work around wrong vendor ID on APC bridge

[Matthew Wilcox]

On Wed, May 26, 2010 at 12:21:10PM +0200, Clemens Ladisch wrote:
> Since we do not know in advance all possible vendor IDs, a better way to
> find the device is to declare the quirk on the host bridge, whose ID is
> always correct, and use that device as a stepping stone to find the PCI/
> PCI bridge, if present.
> 
> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

Good idea.

Reviewed-by: Matthew Wilcox <willy@linux.intel.com>

-- 
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."

Re: [PATCH] PCI quirk: AMD 780: work around wrong vendor ID on APC bridge

[Jesse Barnes]

On Wed, 26 May 2010 12:21:10 +0200
Clemens Ladisch <clemens@ladisch.de> wrote:

> In all AMD 780 family northbridges, the vendor ID of the internal
> graphics PCI/PCI bridge reads not as AMD but as that of the mainboard
> vendor, because the hardware actually returns the value of the subsystem
> vendor ID (erratum 18).
> 
> We currently have additional quirk entries for Asus and Acer, but it is
> likely that we will encounter more systems with other vendor IDs.
> 
> Since we do not know in advance all possible vendor IDs, a better way to
> find the device is to declare the quirk on the host bridge, whose ID is
> always correct, and use that device as a stepping stone to find the PCI/
> PCI bridge, if present.
> 
> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

Applied to my for-linus branch, thanks.

-- 
Jesse Barnes, Intel Open Source Technology Center