From: Robin Murphy Date: Tue, 19 Apr 2016 16:01:31 +0000 (+0100) Subject: arm64/dma-mapping: Extend DMA ops workaround to PCI devices X-Git-Tag: MMI-PSA29.97-13-9~7960^2~49 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=226d89cbb242f3fbd3e93367dfd5138f524aae5c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git arm64/dma-mapping: Extend DMA ops workaround to PCI devices 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 once IOMMUs get plugged into the PCI code. Acked-by: Catalin Marinas Signed-off-by: Robin Murphy Signed-off-by: Will Deacon --- diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index a6e757cbab77..607e70911173 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)