[PATCH v1] of: calculate masks of the device based on dma-range size

[Bjorn Helgaas]

[+cc Catalin]

On Wed, Feb 11, 2015 at 12:53:35PM -0500, Murali Karicheri wrote:
> This patch update of_dma_configure() API to calculate the
> masks (dma_mask and coherent_dma_mask) based on the dma-range
> values set in DT for the device. Also limit the mask to lower
> of the default mask and mask calculated.
> 
> Cc: Joerg Roedel <joro at 8bytes.org>
> Cc: Grant Likely <grant.likely at linaro.org>
> Cc: Rob Herring <robh+dt at kernel.org>
> Cc: Bjorn Helgaas <bhelgaas at google.com>
> Cc: Will Deacon <will.deacon at arm.com>
> Cc: Russell King <linux at arm.linux.org.uk>
> Cc: Arnd Bergmann <arnd at arndb.de>
> Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit at amd.com>
> 
> Signed-off-by: Murali Karicheri <m-karicheri2 at ti.com>

Applied with Catalin's reviewed-by to pci/iommu for v4.1, thanks!

I agree with Catalin's comment about the "size = 1ULL << 32" line.
I don't see how that will make a difference, so I dropped it.  The
patch I merged is below.  Let me know if you think we do need that
line or any other tweaks.

Bjorn

commit a5a1dd69080dfcf53bfd6e179f3db68e824aeaae
Author: Murali Karicheri <m-karicheri2 at ti.com>
Date:   Wed Feb 25 17:21:04 2015 -0600

    of: Calculate device DMA masks based on DT dma-range size
    
    Calculate the dma_mask and coherent_dma_mask based on the dma-range values
    set in DT for the device.
    
    Limit the mask to lower of the default mask and mask calculated.
    
    Signed-off-by: Murali Karicheri <m-karicheri2 at ti.com>
    Signed-off-by: Bjorn Helgaas <bhelgaas at google.com>
    Reviewed-by: Catalin Marinas <catalin.marinas at arm.com>
    CC: Joerg Roedel <joro at 8bytes.org>
    CC: Grant Likely <grant.likely at linaro.org>
    CC: Rob Herring <robh+dt at kernel.org>
    CC: Will Deacon <will.deacon at arm.com>
    CC: Russell King <linux at arm.linux.org.uk>
    CC: Arnd Bergmann <arnd at arndb.de>
    CC: Suravee Suthikulpanit <Suravee.Suthikulpanit at amd.com>

diff --git a/drivers/of/device.c b/drivers/of/device.c
index 28e743888402..20c1332a0018 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -90,10 +90,11 @@ void of_dma_configure(struct device *dev, struct device_node *np)
 	struct iommu_ops *iommu;
 
 	/*
-	 * Set default dma-mask to 32 bit.  Drivers are expected to setup
-	 * the correct supported dma_mask.
+	 * Set default coherent_dma_mask to 32 bit.  Drivers are expected to
+	 * setup the correct supported mask.
 	 */
-	dev->coherent_dma_mask = DMA_BIT_MASK(32);
+	if (!dev->coherent_dma_mask)
+		dev->coherent_dma_mask = DMA_BIT_MASK(32);
 
 	/*
 	 * Set it to coherent_dma_mask by default if the architecture
@@ -128,6 +129,15 @@ void of_dma_configure(struct device *dev, struct device_node *np)
 
 	dev->dma_pfn_offset = offset;
 
+	/*
+	 * Limit coherent and dma mask based on size and default mask
+	 * set by the driver.
+	 */
+	dev->coherent_dma_mask = min(dev->coherent_dma_mask,
+				     DMA_BIT_MASK(ilog2(dma_addr + size)));
+	*dev->dma_mask = min((*dev->dma_mask),
+			     DMA_BIT_MASK(ilog2(dma_addr + size)));
+
 	coherent = of_dma_is_coherent(np);
 	dev_dbg(dev, "device is%sdma coherent\n",
 		coherent ? " " : " not ");