From: Robin Murphy <robin.murphy@arm.com>
Date: Mon, 23 Jul 2018 22:16:09 +0000 (+0100)
Subject: of/device: Set bus DMA mask as appropriate
X-Git-Tag: for-linus-20180825~118^2~8
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6c2fb2ea76361da9b420a8e23a2a19e7842cbdda;p=linux-block.git

of/device: Set bus DMA mask as appropriate

When an explicit DMA limit is described by firmware, we need to remember
it regardless of how drivers might subsequently update their devices'
masks. The new bus_dma_mask field does that.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/drivers/of/device.c b/drivers/of/device.c
index 33d85511d790..0d39633e8545 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -149,6 +149,7 @@ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma)
 	 * set by the driver.
 	 */
 	mask = DMA_BIT_MASK(ilog2(dma_addr + size - 1) + 1);
+	dev->bus_dma_mask = mask;
 	dev->coherent_dma_mask &= mask;
 	*dev->dma_mask &= mask;