From: Greg Kroah-Hartman Date: Tue, 26 Feb 2013 18:24:24 +0000 (-0800) Subject: 3.4-stable patches X-Git-Tag: v3.7.10~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b7294f9a54a8ca4e203b248d922d3a444132099;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: intel-iommu-force-writebuffer-flush-quirk-on-gen-4-chipsets.patch --- diff --git a/queue-3.4/intel-iommu-force-writebuffer-flush-quirk-on-gen-4-chipsets.patch b/queue-3.4/intel-iommu-force-writebuffer-flush-quirk-on-gen-4-chipsets.patch new file mode 100644 index 00000000000..6160164c85d --- /dev/null +++ b/queue-3.4/intel-iommu-force-writebuffer-flush-quirk-on-gen-4-chipsets.patch @@ -0,0 +1,47 @@ +From 210561ffd72d00eccf12c0131b8024d5436bae95 Mon Sep 17 00:00:00 2001 +From: Daniel Vetter +Date: Mon, 21 Jan 2013 19:48:59 +0100 +Subject: intel/iommu: force writebuffer-flush quirk on Gen 4 Chipsets + +From: Daniel Vetter + +commit 210561ffd72d00eccf12c0131b8024d5436bae95 upstream. + +We already have the quirk entry for the mobile platform, but also +reports on some desktop versions. So be paranoid and set it +everywhere. + +References: http://www.mail-archive.com/dri-devel@lists.freedesktop.org/msg33138.html +Reported-and-tested-by: Mihai Moldovan +Cc: David Woodhouse +Cc: "Sankaran, Rajesh" +Signed-off-by: Daniel Vetter +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/iommu/intel-iommu.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +--- a/drivers/iommu/intel-iommu.c ++++ b/drivers/iommu/intel-iommu.c +@@ -4212,13 +4212,19 @@ static void __devinit quirk_iommu_rwbf(s + { + /* + * Mobile 4 Series Chipset neglects to set RWBF capability, +- * but needs it: ++ * but needs it. Same seems to hold for the desktop versions. + */ + printk(KERN_INFO "DMAR: Forcing write-buffer flush capability\n"); + rwbf_quirk = 1; + } + + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf); ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_rwbf); ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e10, quirk_iommu_rwbf); ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e20, quirk_iommu_rwbf); ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e30, quirk_iommu_rwbf); ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e40, quirk_iommu_rwbf); ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e90, quirk_iommu_rwbf); + + #define GGC 0x52 + #define GGC_MEMORY_SIZE_MASK (0xf << 8) diff --git a/queue-3.4/series b/queue-3.4/series index 913aa6c531f..8051b0605b1 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -49,3 +49,4 @@ drm-fill-depth-bits_per_pixel-for-c8-format.patch drm-use-c8-instead-of-rgb332-when-determining-the-format-from-depth-bpp.patch drm-usb-bind-driver-to-correct-device.patch target-fix-divide-by-zero-bug-in-fabric_max_sectors-for-unconfigured-devices.patch +intel-iommu-force-writebuffer-flush-quirk-on-gen-4-chipsets.patch