From patchwork Sun May 16 01:28:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 99928 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4G1SuGc009587 for ; Sun, 16 May 2010 01:28:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753544Ab0EPB2y (ORCPT ); Sat, 15 May 2010 21:28:54 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:60974 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753370Ab0EPB2x convert rfc822-to-8bit (ORCPT ); Sat, 15 May 2010 21:28:53 -0400 Received: from [192.168.4.185] (helo=localhost) by shadbolt.decadent.org.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1ODSew-0002VR-UP; Sun, 16 May 2010 02:28:51 +0100 Received: from ben by localhost with local (Exim 4.71) (envelope-from ) id 1ODSev-0008Hq-KD; Sun, 16 May 2010 02:28:49 +0100 From: Ben Hutchings To: Jesse Barnes Cc: linux-pci , netdev Date: Sun, 16 May 2010 02:28:49 +0100 Message-ID: <1273973329.2564.70.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-SA-Exim-Connect-IP: 192.168.4.185 X-SA-Exim-Mail-From: ben@decadent.org.uk X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on shadbolt.decadent.org.uk X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED autolearn=disabled version=3.2.5 Subject: [PATCH REPOST] PCI: Disable MSI for MCP55 on P5N32-E SLI X-SA-Exim-Version: 4.2.1 (built Wed, 25 Jun 2008 17:14:11 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 16 May 2010 01:28:57 +0000 (UTC) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 27c0e6e..4807825 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2218,15 +2218,16 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SERVERWORKS, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8132_BRIDGE, ht_enable_msi_mapping); -/* The P5N32-SLI Premium motherboard from Asus has a problem with msi +/* The P5N32-SLI motherboards from Asus have a problem with msi * for the MCP55 NIC. It is not yet determined whether the msi problem * also affects other devices. As for now, turn off msi for this device. */ static void __devinit nvenet_msi_disable(struct pci_dev *dev) { - if (dmi_name_in_vendors("P5N32-SLI PREMIUM")) { + if (dmi_name_in_vendors("P5N32-SLI PREMIUM") || + dmi_name_in_vendors("P5N32-E SLI")) { dev_info(&dev->dev, - "Disabling msi for MCP55 NIC on P5N32-SLI Premium\n"); + "Disabling msi for MCP55 NIC on P5N32-SLI\n"); dev->no_msi = 1; } }