From: Andi Kleen <andi@firstfloor.org>
Date: Wed, 16 Sep 2009 20:40:22 +0000 (+0200)
Subject: PCI: Disable AER with pci=nomsi
X-Git-Tag: v2.6.32-rc1~53^2~19
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=3e77a3f7895e9c20756dc250282afa12f6d259a3;p=net-next-2.6.git

PCI: Disable AER with pci=nomsi

When booting with pci=nomsi aer causes lost interrupts and
lockdep inversions.

So check if MSIs are not disabled before initializing the aer
driver.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---

diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c
index 10c0e62bd5a..2ce8f9ccc66 100644
--- a/drivers/pci/pcie/aer/aerdrv.c
+++ b/drivers/pci/pcie/aer/aerdrv.c
@@ -318,6 +318,8 @@ static int __init aer_service_init(void)
 {
 	if (pcie_aer_disable)
 		return -ENXIO;
+	if (!pci_msi_enabled())
+		return -ENXIO;
 	return pcie_port_service_register(&aerdriver);
 }