[PATCH 04/12] arm64/dma-mapping: Extend DMA ops workaround to PCI devices
From: robin.murphy@arm.com (Robin Murphy)
Date: 2016-02-29 13:46:13
Also in:
linux-devicetree, linux-iommu
Subsystem:
arm64 port (aarch64 architecture), the rest · Maintainers:
Catalin Marinas, Will Deacon, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-02-29 · Re: [PATCH 04/12] arm64/dma-mapping: Extend DMA ops workaround to PCI devices · Catalin Marinas <hidden>
PCI devices now suffer the same hiccup as platform devices, in that they get their DMA ops configured before they have been added to their bus, and thus before we know whether they have successfully registered with an IOMMU or not. Until the necessary driver core changes to reorder calls during device creation have been worked out, extend our delayed notifier trick onto the PCI bus so as to avoid broken DMA ops for IOMMUs there. CC: Catalin Marinas <catalin.marinas@arm.com> CC: Will Deacon <redacted> Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- arch/arm64/mm/dma-mapping.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index a6e757c..607e709 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c@@ -933,6 +933,10 @@ static int __init __iommu_dma_init(void) ret = register_iommu_dma_ops_notifier(&platform_bus_type); if (!ret) ret = register_iommu_dma_ops_notifier(&amba_bustype); +#ifdef CONFIG_PCI + if (!ret) + ret = register_iommu_dma_ops_notifier(&pci_bus_type); +#endif /* handle devices queued before this arch_initcall */ if (!ret)
--
2.7.2.333.g70bd996.dirty