Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932666AbZIPUkW (ORCPT ); Wed, 16 Sep 2009 16:40:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760002AbZIPUkU (ORCPT ); Wed, 16 Sep 2009 16:40:20 -0400 Received: from one.firstfloor.org ([213.235.205.2]:45574 "EHLO one.firstfloor.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760001AbZIPUkT (ORCPT ); Wed, 16 Sep 2009 16:40:19 -0400 Date: Wed, 16 Sep 2009 22:40:22 +0200 From: Andi Kleen To: jbarnes@virtuousgeek.org, linux-kernel@vger.kernel.org Subject: [PATCH] PCI: Disable AER with pci=nomsi Message-ID: <20090916204022.GA30729@basil.fritz.box> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 956 Lines: 32 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 --- drivers/pci/pcie/aer/aerdrv.c | 2 ++ 1 file changed, 2 insertions(+) Index: linux/drivers/pci/pcie/aer/aerdrv.c =================================================================== --- linux.orig/drivers/pci/pcie/aer/aerdrv.c +++ linux/drivers/pci/pcie/aer/aerdrv.c @@ -316,6 +316,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); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/