From: Greg Kroah-Hartman Date: Wed, 31 Mar 2010 20:41:11 +0000 (-0700) Subject: remove pci-quirk-rs780-rs880-work-around-missing-msi-initialization.patch X-Git-Tag: v2.6.27.46~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd56dc900925d1e233719edce9790448e475e3a3;p=thirdparty%2Fkernel%2Fstable-queue.git remove pci-quirk-rs780-rs880-work-around-missing-msi-initialization.patch from both .32 and .33 queues --- diff --git a/queue-2.6.32/series b/queue-2.6.32/series index 40d66d70666..ab795c92730 100644 --- a/queue-2.6.32/series +++ b/queue-2.6.32/series @@ -84,7 +84,6 @@ fs-partition-msdos-fix-unusable-extended-partition-for-512b-sector.patch pci-fix-return-value-from-pcix_get_max_mmrbc.patch pci-fix-access-of-pci_x_cmd-by-pcix-get-and-set-mmrbc-functions.patch pci-cleanup-error-return-for-pcix-get-and-set-mmrbc-functions.patch -pci-quirk-rs780-rs880-work-around-missing-msi-initialization.patch rt2860sta-fix-argument-to-linux_pci_unmap_single.patch ath9k-fix-bug_on-triggered-by-pae-frames.patch cpuset-fix-the-problem-that-cpuset_mem_spread_node-returns-an-offline-node.patch diff --git a/queue-2.6.33/pci-quirk-rs780-rs880-work-around-missing-msi-initialization.patch b/queue-2.6.33/pci-quirk-rs780-rs880-work-around-missing-msi-initialization.patch deleted file mode 100644 index b8eb4a5d02a..00000000000 --- a/queue-2.6.33/pci-quirk-rs780-rs880-work-around-missing-msi-initialization.patch +++ /dev/null @@ -1,98 +0,0 @@ -From a5ee4eb75413c145334c30e43f1af9875dad6fd7 Mon Sep 17 00:00:00 2001 -From: Clemens Ladisch -Date: Mon, 22 Mar 2010 09:52:16 +0100 -Subject: PCI quirk: RS780/RS880: work around missing MSI initialization - -From: Clemens Ladisch - -commit a5ee4eb75413c145334c30e43f1af9875dad6fd7 upstream. - -AMD says in section 2.5.4 (GFX MSI Enable) of #43291 (AMD 780G Family -Register Programming Requirements): - - The SBIOS must enable internal graphics MSI capability in GCCFG by - setting the following: NBCFG.NB_CNTL.STRAP_MSI_ENABLE='1' - -Quite a few BIOS writers misinterpret this sentence and think that -enabling MSI is an optional feature. However, clearing that bit just -prevents delivery of MSI messages but does not remove the MSI PCI -capabilities registers, and so leaves these devices unusable for any -driver that attempts to use MSI. - -Setting that bit is not possible after the BIOS has locked down the -configuration registers, so we have to manually disable MSI for the -affected devices. - -This fixes the codec communication errors in the HDA driver when -accessing the HDMI audio device, and allows us to get rid of the -overcautious quirk in radeon_irq_kms.c. - -Signed-off-by: Clemens Ladisch -Tested-by: Alex Deucher -Signed-off-by: Jesse Barnes -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/radeon/radeon_irq_kms.c | 8 ------- - drivers/pci/quirks.c | 33 ++++++++++++++++++++++++++++++++ - 2 files changed, 34 insertions(+), 7 deletions(-) - ---- a/drivers/gpu/drm/radeon/radeon_irq_kms.c -+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c -@@ -116,13 +116,7 @@ int radeon_irq_kms_init(struct radeon_de - } - /* enable msi */ - rdev->msi_enabled = 0; -- /* MSIs don't seem to work on my rs780; -- * not sure about rs880 or other rs780s. -- * Needs more investigation. -- */ -- if ((rdev->family >= CHIP_RV380) && -- (rdev->family != CHIP_RS780) && -- (rdev->family != CHIP_RS880)) { -+ if (rdev->family >= CHIP_RV380) { - int ret = pci_enable_msi(rdev->pdev); - if (!ret) { - rdev->msi_enabled = 1; ---- a/drivers/pci/quirks.c -+++ b/drivers/pci/quirks.c -@@ -2484,6 +2484,39 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT - DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4375, - quirk_msi_intx_disable_bug); - -+/* -+ * MSI does not work with the AMD RS780/RS880 internal graphics and HDMI audio -+ * devices unless the BIOS has initialized the nb_cntl.strap_msi_enable bit. -+ */ -+static void __init rs780_int_gfx_disable_msi(struct pci_dev *int_gfx_bridge) -+{ -+ u32 nb_cntl; -+ -+ if (!int_gfx_bridge->subordinate) -+ return; -+ -+ pci_bus_write_config_dword(int_gfx_bridge->bus, PCI_DEVFN(0, 0), -+ 0x60, 0); -+ pci_bus_read_config_dword(int_gfx_bridge->bus, PCI_DEVFN(0, 0), -+ 0x64, &nb_cntl); -+ -+ if (!(nb_cntl & BIT(10))) { -+ dev_warn(&int_gfx_bridge->dev, -+ FW_WARN "RS780: MSI for internal graphics disabled\n"); -+ int_gfx_bridge->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI; -+ } -+} -+ -+#define PCI_DEVICE_ID_AMD_RS780_P2P_INT_GFX 0x9602 -+ -+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, -+ PCI_DEVICE_ID_AMD_RS780_P2P_INT_GFX, -+ rs780_int_gfx_disable_msi); -+/* wrong vendor ID on M4A785TD motherboard: */ -+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASUSTEK, -+ PCI_DEVICE_ID_AMD_RS780_P2P_INT_GFX, -+ rs780_int_gfx_disable_msi); -+ - #endif /* CONFIG_PCI_MSI */ - - #ifdef CONFIG_PCI_IOV diff --git a/queue-2.6.33/series b/queue-2.6.33/series index d16fd1af0dd..e1630ddf157 100644 --- a/queue-2.6.33/series +++ b/queue-2.6.33/series @@ -88,7 +88,6 @@ fs-partition-msdos-fix-unusable-extended-partition-for-512b-sector.patch pci-fix-return-value-from-pcix_get_max_mmrbc.patch pci-fix-access-of-pci_x_cmd-by-pcix-get-and-set-mmrbc-functions.patch pci-cleanup-error-return-for-pcix-get-and-set-mmrbc-functions.patch -pci-quirk-rs780-rs880-work-around-missing-msi-initialization.patch ath9k-fix-bug_on-triggered-by-pae-frames.patch cpuset-fix-the-problem-that-cpuset_mem_spread_node-returns-an-offline-node.patch nilfs2-fix-hang-up-of-cleaner-after-log-writer-returned-with-error.patch diff --git a/queue-2.6.32/pci-quirk-rs780-rs880-work-around-missing-msi-initialization.patch b/rejects/pci-quirk-rs780-rs880-work-around-missing-msi-initialization.patch similarity index 100% rename from queue-2.6.32/pci-quirk-rs780-rs880-work-around-missing-msi-initialization.patch rename to rejects/pci-quirk-rs780-rs880-work-around-missing-msi-initialization.patch