From: Marek Szyprowski Date: Tue, 16 Feb 2016 14:14:44 +0000 (+0100) Subject: arm64: dma-mapping: fix handling of devices registered before arch_initcall X-Git-Tag: MMI-PSA29.97-13-9~8491^2~2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=722ec35f7faefcc34d12616eca7976a848870f9d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git arm64: dma-mapping: fix handling of devices registered before arch_initcall This patch ensures that devices, which got registered before arch_initcall will be handled correctly by IOMMU-based DMA-mapping code. Cc: Fixes: 13b8629f6511 ("arm64: Add IOMMU dma_ops") Acked-by: Robin Murphy Signed-off-by: Marek Szyprowski Signed-off-by: Will Deacon --- diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 331c4ca6205c..a6e757cbab77 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); + + /* handle devices queued before this arch_initcall */ + if (!ret) + __iommu_attach_notifier(NULL, BUS_NOTIFY_ADD_DEVICE, NULL); return ret; } arch_initcall(__iommu_dma_init);