On Wed, Nov 07, 2018 at 04:30:32PM +0000, Robin Murphy wrote: > 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@xxxxxx> > Reported-by: Jean-Philippe Brucker <jean-philippe.brucker@xxxxxxx> > Tested-by: Aaro Koskinen <aaro.koskinen@xxxxxx> > Tested-by: John Stultz <john.stultz@xxxxxxxxxx> > Tested-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> > Tested-by: Robert Richter <robert.richter@xxxxxxxxxx> > Signed-off-by: Robin Murphy <robin.murphy@xxxxxxx> > --- > > v2: Add comment, collect tested-by tags > > drivers/of/device.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Applied, thanks. Rob