ARM/dma-mappіng: don't override ->dma_coherent when set from a bus notifier
authorChristoph Hellwig <hch@lst.de>
Tue, 4 Oct 2022 07:10:19 +0000 (09:10 +0200)
committerChristoph Hellwig <hch@lst.de>
Thu, 6 Oct 2022 12:30:51 +0000 (14:30 +0200)
commit49bc8bebae79c8516cb12f91818f3a7907e3ebce
treed574a81615e2932c54ff2287b7a459c583d7f4c1
parentf7f04d198334d6f69c76c8f8675194551a3da574
ARM/dma-mappіng: don't override ->dma_coherent when set from a bus notifier

Commit ae626eb97376 ("ARM/dma-mapping: use dma-direct unconditionally")
caused a regression on the mvebu platform, wherein devices that are
dma-coherent are marked as dma-noncoherent, because although
mvebu_hwcc_notifier() after that commit still marks then as coherent,
the arm_coherent_dma_ops() function, which is called later, overwrites
this setting, since it is being called from drivers/of/device.c with
coherency parameter determined by of_dma_is_coherent(), and the
device-trees do not declare the 'dma-coherent' property.

Fix this by defaulting never clearing the dma_coherent flag in
arm_coherent_dma_ops().

Fixes: ae626eb97376 ("ARM/dma-mapping: use dma-direct unconditionally")
Reported-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tested-by: Marek Behún <kabel@kernel.org>
arch/arm/mm/dma-mapping.c