[kernel/f13/master] dmar: print a useful message when quirking iommu off

Kyle McMartin kyle at fedoraproject.org
Tue Oct 19 02:44:38 UTC 2010


commit 4663ea7ac2745d1cc48a9b16790f9e942ed98923
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Mon Oct 18 22:44:09 2010 -0400

    dmar: print a useful message when quirking iommu off

 dmar-disable-when-ricoh-multifunction.patch |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/dmar-disable-when-ricoh-multifunction.patch b/dmar-disable-when-ricoh-multifunction.patch
index eb2b7ce..e0bbf30 100644
--- a/dmar-disable-when-ricoh-multifunction.patch
+++ b/dmar-disable-when-ricoh-multifunction.patch
@@ -11,13 +11,15 @@ diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
 index 8e499e8..076c5de 100644
 --- a/drivers/pci/intel-iommu.c
 +++ b/drivers/pci/intel-iommu.c
-@@ -3755,6 +3755,16 @@ static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
+@@ -3755,6 +3755,18 @@ static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
  
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);
  
 +/* https://bugzilla.redhat.com/show_bug.cgi?id=605888 */
 +static void __devinit quirk_ricoh_multifunction(struct pci_dev *dev)
 +{
++	printk(KERN_INFO "intel_iommu: broken Ricoh device %04X detected, disabling...\n",
++		dev->device);
 +	dmar_disabled = 1;
 +}
 +DECLARE_PCI_FIXUP_HEADER(0x1180, 0xe822, quirk_ricoh_multifunction);


More information about the scm-commits mailing list