of/device: Really only set bus DMA mask when appropriate
authorRobin Murphy <robin.murphy@arm.com>
Wed, 7 Nov 2018 16:30:32 +0000 (16:30 +0000)
committerRob Herring <robh@kernel.org>
Thu, 8 Nov 2018 18:44:34 +0000 (12:44 -0600)
commit6778be4e520959659b27a441c06a84c9cb009085
tree4332387a5d761de4616ab6d3bf8f057776251ea7
parentc961cb3be9064d1097ccc019390f8b5739daafc6
of/device: Really only set bus DMA mask when appropriate

of_dma_configure() was *supposed* to be following the same logic as
acpi_dma_configure() and only setting bus_dma_mask if some range was
specified by the firmware. However, it seems that subtlety got lost in
the process of fitting it into the differently-shaped control flow, and
as a result the force_dma==true case ends up always setting the bus mask
to the 32-bit default, which is not what anyone wants.

Make sure we only touch it if the DT actually said so.

Fixes: 6c2fb2ea7636 ("of/device: Set bus DMA mask as appropriate")
Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reported-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Tested-by: John Stultz <john.stultz@linaro.org>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Robert Richter <robert.richter@cavium.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
drivers/of/device.c