]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: 8288/1: dma-mapping: don't detach devices without an IOMMU during teardown
authorWill Deacon <will.deacon@arm.com>
Fri, 16 Jan 2015 17:01:43 +0000 (18:01 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 29 Jan 2015 15:22:44 +0000 (15:22 +0000)
commit79cd0bd70bebb9789ac801ed67174c3ab0ff7162
tree06e8f8799ff8123485ba7f98e71acb027476959f
parent4accf20c284bd98e428e65c0d0a9cba0c15517cd
ARM: 8288/1: dma-mapping: don't detach devices without an IOMMU during teardown

When tearing down the DMA ops for a device via of_dma_deconfigure, we
unconditionally detach the device from its IOMMU domain. For devices
that aren't actually behind an IOMMU, this produces a "Not attached"
warning message on the console.

This patch changes the teardown code so that we don't detach from the
IOMMU domain when there isn't an IOMMU dma mapping to start with.

Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mm/dma-mapping.c