Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758193AbZADWIi (ORCPT ); Sun, 4 Jan 2009 17:08:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751961AbZADWI3 (ORCPT ); Sun, 4 Jan 2009 17:08:29 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:49480 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750883AbZADWI2 (ORCPT ); Sun, 4 Jan 2009 17:08:28 -0500 From: "Rafael J. Wysocki" To: Ingo Molnar , Jesse Barnes Subject: [PATCH] x86 PCI: Do not use interrupt links for devices using MSI-X Date: Sun, 4 Jan 2009 23:08:42 +0100 User-Agent: KMail/1.10.3 (Linux/2.6.28-tst; KDE/4.1.3; x86_64; ; ) Cc: LKML , Linux PCI MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901042308.42625.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1240 Lines: 38 From: Rafael J. Wysocki pcibios_enable_device() and pcibios_disable_device() don't handle IRQs for devices that have MSI enabled and it should tread the devices with MSI-X enabled in the same way. Signed-off-by: Rafael J. Wysocki --- arch/x86/pci/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6/arch/x86/pci/common.c =================================================================== --- linux-2.6.orig/arch/x86/pci/common.c +++ linux-2.6/arch/x86/pci/common.c @@ -551,14 +551,14 @@ int pcibios_enable_device(struct pci_dev if ((err = pci_enable_resources(dev, mask)) < 0) return err; - if (!dev->msi_enabled) + if (!dev->msi_enabled && !dev->msix_enabled) return pcibios_enable_irq(dev); return 0; } void pcibios_disable_device (struct pci_dev *dev) { - if (!dev->msi_enabled && pcibios_disable_irq) + if (!dev->msi_enabled && !dev->msix_enabled && pcibios_disable_irq) pcibios_disable_irq(dev); } -- 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/