[PATCH] dma-mapping: limit dma_mask in arch_setup_dma_ops()

From: Murali Karicheri
Date: Wed Dec 24 2014 - 16:52:33 EST


dma_mask should be limited to minimum of the default dma mask
and dma-range size configured in DT for proper operation.

Signed-off-by: Murali Karicheri <m-karicheri2@xxxxxx>
Reviewed-by: Arnd Bergmann <arnd@xxxxxxxx>
---
arch/arm/mm/dma-mapping.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 7864797..5cea1fc 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -2053,6 +2053,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
{
struct dma_map_ops *dma_ops;

+ *dev->dma_mask = min((*dev->dma_mask), (dma_base + size - 1));
dev->archdata.dma_coherent = coherent;
if (arm_setup_iommu_dma_ops(dev, dma_base, size, iommu))
dma_ops = arm_get_iommu_dma_map_ops(coherent);
--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/