4a2041744e
Testing that this part of the spec still works... Hopefully the next release is indeed 3.1.0...
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
From da7662784dcced04a5b7a3a5b2bbb8276d699522 Mon Sep 17 00:00:00 2001
|
|
From: Kyle McMartin <kyle@mcmartin.ca>
|
|
Date: Sun, 17 Oct 2010 15:55:32 -0400
|
|
Subject: [PATCH] dmar: disable if ricoh multifunction detected
|
|
|
|
---
|
|
drivers/pci/intel-iommu.c | 10 ++++++++++
|
|
1 files changed, 10 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
|
|
index 4789f8e..5923914 100644
|
|
--- a/drivers/iommu/intel-iommu.c
|
|
+++ b/drivers/iommu/intel-iommu.c
|
|
@@ -3784,6 +3784,16 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0044, quirk_calpella_no_shadow_g
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0062, quirk_calpella_no_shadow_gtt);
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x006a, quirk_calpella_no_shadow_gtt);
|
|
|
|
+/* https://bugzilla.redhat.com/show_bug.cgi?id=605888 */
|
|
+static void __devinit quirk_ricoh_multifunction(struct pci_dev *dev)
|
|
+{
|
|
+ dmar_disabled = 1;
|
|
+}
|
|
+DECLARE_PCI_FIXUP_HEADER(0x1180, 0xe822, quirk_ricoh_multifunction);
|
|
+DECLARE_PCI_FIXUP_HEADER(0x1180, 0xe230, quirk_ricoh_multifunction);
|
|
+DECLARE_PCI_FIXUP_HEADER(0x1180, 0xe832, quirk_ricoh_multifunction);
|
|
+DECLARE_PCI_FIXUP_HEADER(0x1180, 0xe476, quirk_ricoh_multifunction);
|
|
+
|
|
/* On Tylersburg chipsets, some BIOSes have been known to enable the
|
|
ISOCH DMAR unit for the Azalia sound device, but not give it any
|
|
TLB entries, which causes it to deadlock. Check for that. We do
|
|
--
|
|
1.7.3.1
|
|
|