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