Skip to content

Commit ec637fb

Browse files
awilliambjorn-helgaas
authored andcommitted
PCI: Add function 0 DMA alias quirk for Ricoh devices
The existing quirk for these devices (pci_get_dma_source()) doesn't really solve the problem; re-implement it using the DMA alias iterator. We'll come back later and remove the existing quirk and dma_source interface. Note that device ID 0xe822 is typically function 0 and 0xe230 has been tested to not need the quirk and are therefore removed versus the equivalent dma_source quirk. If there exist in other configurations we can re-add them. Link: https://bugzilla.redhat.com/show_bug.cgi?id=605888 Tested-by: Pat Erley <[email protected]> Signed-off-by: Alex Williamson <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent 31c2b81 commit ec637fb

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

drivers/pci/quirks.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3333,6 +3333,22 @@ int pci_dev_specific_reset(struct pci_dev *dev, int probe)
33333333
return -ENOTTY;
33343334
}
33353335

3336+
static void quirk_dma_func0_alias(struct pci_dev *dev)
3337+
{
3338+
if (PCI_FUNC(dev->devfn) != 0) {
3339+
dev->dma_alias_devfn = PCI_DEVFN(PCI_SLOT(dev->devfn), 0);
3340+
dev->dev_flags |= PCI_DEV_FLAGS_DMA_ALIAS_DEVFN;
3341+
}
3342+
}
3343+
3344+
/*
3345+
* https://bugzilla.redhat.com/show_bug.cgi?id=605888
3346+
*
3347+
* Some Ricoh devices use function 0 as the PCIe requester ID for DMA.
3348+
*/
3349+
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_RICOH, 0xe832, quirk_dma_func0_alias);
3350+
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_RICOH, 0xe476, quirk_dma_func0_alias);
3351+
33363352
static struct pci_dev *pci_func_0_dma_source(struct pci_dev *dev)
33373353
{
33383354
if (!PCI_FUNC(dev->devfn))

0 commit comments

Comments
 (0)