On 03/07/2013 09:35 PM, Andrew Cooks wrote:
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
+/* Table of multiple (ghost) source functions. This is similar to the
+ * translated sources above, but with the following differences:
+ * 1. the device may use multiple functions as DMA sources,
+ * 2. these functions cannot be assumed to be actual devices, they're simply
+ * incorrect DMA tags.
+ * 3. the specific ghost function for a request can not always be predicted.
+ * For example, the actual device could be xx:yy.1 and it could use
+ * both 0 and 1 for different requests, with no obvious way to tell when
+ * DMA will be tagged as comming from xx.yy.0 and and when it will be tagged
+ * as comming from xx.yy.1.
+ * The bitmap contains all of the functions used in DMA tags, including the
+ * actual device.
+ * See https://bugzilla.redhat.com/show_bug.cgi?id=757166,
+ * https://bugzilla.kernel.org/show_bug.cgi?id=42679
+ * https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1089768
+ */
+static const struct pci_dev_dma_multi_func_sources {
+ u16 vendor;
+ u16 device;
+ u8 func_map; /* bit map. lsb is fn 0. */
+} pci_dev_dma_multi_func_sources[] = {
+ { PCI_VENDOR_ID_MARVELL_2, 0x9123, (1<<0)|(1<<1)},
+ { PCI_VENDOR_ID_MARVELL_2, 0x9125, (1<<0)|(1<<1)},
+ { PCI_VENDOR_ID_MARVELL_2, 0x9128, (1<<0)|(1<<1)},
+ { PCI_VENDOR_ID_MARVELL_2, 0x9130, (1<<0)|(1<<1)},
+ { PCI_VENDOR_ID_MARVELL_2, 0x9143, (1<<0)|(1<<1)},
+ { PCI_VENDOR_ID_MARVELL_2, 0x9172, (1<<0)|(1<<1)},
+ { 0 }
+};
Adding another buggy device. I have a Ricoh multifunction device:
17:00.0 SD Host controller: Ricoh Co Ltd MMC/SD Host Controller (rev 01)
17:00.3 FireWire (IEEE 1394): Ricoh Co Ltd R5C832 PCIe IEEE 1394
Controller (rev 01)
17:00.0 0805: 1180:e822 (rev 01)
17:00.3 0c00: 1180:e832 (rev 01)
that adding entries for also fixed booting. I don't have any SD cards
or firewire devices handy to test that they work, but the system now
boots, which was not the case without your patch and IOMMU/DMAR enabled.
Here's a previous patch used for similar hardware that may also be
fixed by this:
http://lists.fedoraproject.org/pipermail/scm-commits/2010-October/510785.html
and another thread/bug report this may solve:
https://bugzilla.redhat.com/show_bug.cgi?id=605888
Feel free to include me in any future iterations of this patch you'd
like tested.
Tested-By: Pat Erley <[email protected]>
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
