Skip to contentSkip to conversation

Patch "arm64: dma-mapping: fix handling of devices registered before arch_initcall" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Feb 24, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

arm64: dma-mapping: fix handling of devices registered before arch_initcall

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm64-dma-mapping-fix-handling-of-devices-registered-before-arch_initcall.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 722ec35f7faefcc34d12616eca7976a848870f9d Mon Sep 17 00:00:00 2001

From: Marek Szyprowski <[email protected]>
Date: Tue, 16 Feb 2016 15:14:44 +0100
Subject: arm64: dma-mapping: fix handling of devices registered before arch_initcall

From: Marek Szyprowski <[email protected]>

commit 722ec35f7faefcc34d12616eca7976a848870f9d upstream.

This patch ensures that devices, which got registered before arch_initcall will be handled correctly by IOMMU-based DMA-mapping code.

Fixes 13b8629f6511 ("arm64: Add IOMMU dma_ops")
---
 arch/arm64/mm/dma-mapping.c |    4 ++++
 1 file changed, 4 insertions(+)
arch/arm64/mm/dma-mapping.c +4 -0
@@ -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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/arm64-dma-mapping-fix-handling-of-devices-registered-before-arch_initcall.patch