Attachment 301718 Details for Bug 439109 – rhel4-post.patch

[patch] rhel4-post.patch

rhel4-post.patch (text/plain), 3.13 KB, created by Andy Gospodarek on 2008-04-08 21:47:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Gospodarek

Created: 2008-04-08 21:47:16 UTC

Size: 3.13 KB

patch

obsolete

>
>This patch combines the following 3 upstream commits:
>
>commit 6bae1d96c6d7dde078994f6cb98235fd46f8736b
>Author: Sebastien Dugue <sebastien.dugue@bull.net>
>Date:   Thu Dec 13 16:09:25 2007 -0800
>
>    PCI: quirk: enable MSI Mapping on HT1000
>
>    Add a quirk to enable the MSI mapping capability on HyperTransport bridges.
>
>commit 1d84b5424efbcce69a1c955ba181147d23d43a14
>Author: David Miller <davem@davemloft.net>
>Date:   Thu Oct 25 01:15:53 2007 -0700
>
>    PCI: Add MSI quirk for ServerWorks HT1000 PCIX bridge.
>
>
>commit 2cc31879f8cfa0efc74fe7e58ab4e01ef5908730
>Author: David Miller <davem@davemloft.net>
>Date:   Thu Oct 25 01:15:24 2007 -0700
>
>    PCI: Revert "PCI: disable MSI by default on systems with Serverworks HT1000 chips"
>
>
>It will resolve BZ 439109.
>
>---
>
> drivers/pci/quirks.c    |   27 ++++++++++++++++++++++++++-
> include/linux/pci_ids.h |    2 +-
> 2 files changed, 27 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
>index a246438..68eaeb6 100644
>--- a/drivers/pci/quirks.c
>+++ b/drivers/pci/quirks.c
>@@ -1592,7 +1592,6 @@ static void __init quirk_svw_msi(struct pci_dev *dev)
> 	printk(KERN_WARNING "PCI: MSI quirk detected. pci_msi_quirk set.\n");
> }
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCNB_LE, quirk_svw_msi);
>-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000_PCIX, quirk_svw_msi);
> 
> /*
>  * Some settings of MMRBC can lead to data corruption so block changes.
>@@ -1658,6 +1657,32 @@ static void __devinit quirk_msi_ht_cap(struct pci_dev *dev)
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE,
> 			quirk_msi_ht_cap);
> 
>+/*
>+ * Force enable MSI mapping capability on HT bridges
>+ */
>+static void __devinit quirk_msi_ht_cap_enable(struct pci_dev *dev)
>+{
>+	u8 pos;
>+	int ttl;
>+	for (pos = pci_find_capability(dev, PCI_CAP_ID_HT), ttl = 48;
>+	     pos && ttl;
>+	     pos = pci_find_next_capability(dev, pos, PCI_CAP_ID_HT), ttl--) {
>+		u32 cap_hdr;
>+		/* MSI mapping section according to Hypertransport spec */
>+		if (pci_read_config_dword(dev, pos, &cap_hdr) == 0
>+		    && (cap_hdr & 0xf8000000) == 0xa8000000 /* MSI mapping */) {
>+			printk(KERN_INFO "PCI: Enabling HT MSI Mapping on %s\n",
>+			       pci_name(dev));
>+
>+			pci_write_config_dword(dev, pos, cap_hdr | 0x10000);
>+
>+		}
>+	}
>+}
>+
>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000_PXB,
>+			quirk_msi_ht_cap_enable);
>+
> /* The nVidia CK804 chipset may have 2 HT MSI mappings.
>  * MSI are supported if the MSI capability set in any of these mappings.
>  */
>diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>index 62b4423..f1a537d 100644
>--- a/include/linux/pci_ids.h
>+++ b/include/linux/pci_ids.h
>@@ -1490,7 +1490,7 @@
> #define PCI_DEVICE_ID_SERVERWORKS_CMIC_HE 0x0011
> #define PCI_DEVICE_ID_SERVERWORKS_GCNB_LE 0x0017
> #define PCI_DEVICE_ID_SERVERWORKS_EPB     0x0103
>-#define PCI_DEVICE_ID_SERVERWORKS_HT1000_PCIX	0x0104
>+#define PCI_DEVICE_ID_SERVERWORKS_HT1000_PXB	0x0036
> #define PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE	0x0132
> #define PCI_DEVICE_ID_SERVERWORKS_OSB4	  0x0200
> #define PCI_DEVICE_ID_SERVERWORKS_CSB5	  0x0201

Actions: View | Diff

Attachments on bug 439109: 301718