Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/pci/msi.c    |   15 ++++++++++-----
 drivers/pci/quirks.c |   10 ++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff -puN drivers/pci/msi.c~gregkh-pci-msi-03-use_root_chipset_dev_no_msi_instead_of_pci_bus_flags drivers/pci/msi.c
--- a/drivers/pci/msi.c~gregkh-pci-msi-03-use_root_chipset_dev_no_msi_instead_of_pci_bus_flags
+++ a/drivers/pci/msi.c
@@ -905,19 +905,24 @@ static int msix_capability_init(struct p
  * @dev: pointer to the pci_dev data structure of MSI device function
  *
  * MSI must be globally enabled and supported by the device and
- * its parent busses.
+ * its root chipset.
  **/
 static
 int pci_msi_supported(struct pci_dev * dev)
 {
-	struct pci_bus *bus;
+	struct pci_dev *pdev;
 
 	if (!pci_msi_enable || !dev || dev->no_msi)
 		return -1;
 
-	for (bus = dev->bus; bus; bus = bus->parent)
-		if (bus->bus_flags & PCI_BUS_FLAGS_NO_MSI)
-			return -1;
+	/* find root complex for our device */
+	pdev = dev;
+	while (pdev->bus && pdev->bus->self)
+		pdev = pdev->bus->self;
+
+	/* check whether it supports MSI */
+	if (pdev->no_msi)
+		return -1;
 
 	return 0;
 }
diff -puN drivers/pci/quirks.c~gregkh-pci-msi-03-use_root_chipset_dev_no_msi_instead_of_pci_bus_flags drivers/pci/quirks.c
--- a/drivers/pci/quirks.c~gregkh-pci-msi-03-use_root_chipset_dev_no_msi_instead_of_pci_bus_flags
+++ a/drivers/pci/quirks.c
@@ -1680,12 +1680,10 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NV
 /* Disable MSI on chipsets that are known to not support it */
 static void __devinit quirk_disable_msi(struct pci_dev *dev)
 {
-	if (dev->subordinate) {
-		printk(KERN_WARNING "PCI: MSI quirk detected. "
-		       "PCI_BUS_FLAGS_NO_MSI set for %s subordinate bus.\n",
-		       pci_name(dev));
-		dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
-	}
+	printk(KERN_WARNING "PCI: MSI quirk detected. "
+	       "MSI disabled on chipset %s.\n",
+	       pci_name(dev));
+	dev->no_msi = 1;
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_msi);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCNB_LE,
_