Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 722ec35f authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Will Deacon
Browse files

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: <stable@vger.kernel.org>
Fixes: 13b8629f ("arm64: Add IOMMU dma_ops")
Acked-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 7f4e3462

arch/arm64/mm/dma-mapping.c

+4 −0
Original line number Diff line number Diff line
@@ -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);