[x86] PCI/forcedeth: Disable MSI for MCP55 on P5N32-E SLI (Closes: #552299)

svn path=/dists/sid/linux-2.6/; revision=15495
This commit is contained in:
Ben Hutchings 2010-04-07 02:44:13 +00:00
parent ff7f52344b
commit b2af51002b
3 changed files with 45 additions and 0 deletions

2
debian/changelog vendored
View File

@ -2,6 +2,8 @@ linux-2.6 (2.6.32-12) UNRELEASED; urgency=low
[ Ben Hutchings ]
* Prepare debconf templates for translation. (closes: #576758)
* [x86] PCI/forcedeth: Disable MSI for MCP55 on P5N32-E SLI
(Closes: #552299)
[ maximilian attems]
* Ignore ABI breakage due to libata switch.

View File

@ -0,0 +1,42 @@
From c0613ff21bef2595aebd8f33f36e52a7528e8cb0 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 7 Apr 2010 03:22:51 +0100
Subject: [PATCH] PCI: Disable MSI for MCP55 on P5N32-E SLI
As reported in <http://bugs.debian.org/552299>, MSI appears to be
broken for this on-board device. We already have a quirk for the
P5N32-SLI Premium; extend it to cover both variants of the board.
Reported-by: Romain DEGEZ <romain.degez@smartjog.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
drivers/pci/quirks.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
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;
}
}
--
1.7.0.3

1
debian/patches/series/12 vendored Normal file
View File

@ -0,0 +1 @@
+ bugfix/x86/PCI-Disable-MSI-for-MCP55-on-P5N32-E-SLI.patch