OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7557b5d
)
PCI: Disable AER with pci=nomsi
author
Andi Kleen
<andi@firstfloor.org>
Wed, 16 Sep 2009 20:40:22 +0000
(22:40 +0200)
committer
Jesse Barnes
<jbarnes@virtuousgeek.org>
Thu, 17 Sep 2009 17:05:27 +0000
(10:05 -0700)
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>
drivers/pci/pcie/aer/aerdrv.c
patch
|
blob
|
history
diff --git
a/drivers/pci/pcie/aer/aerdrv.c
b/drivers/pci/pcie/aer/aerdrv.c
index
10c0e62
..
2ce8f9c
100644
(file)
--- 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);
}