[+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 <[email protected]> > Cc: Grant Likely <[email protected]> > Cc: Rob Herring <[email protected]> > Cc: Bjorn Helgaas <[email protected]> > Cc: Will Deacon <[email protected]> > Cc: Russell King <[email protected]> > Cc: Arnd Bergmann <[email protected]> > Cc: Suravee Suthikulpanit <[email protected]> > > Signed-off-by: Murali Karicheri <[email protected]>
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 <[email protected]> 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 <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Catalin Marinas <[email protected]> CC: Joerg Roedel <[email protected]> CC: Grant Likely <[email protected]> CC: Rob Herring <[email protected]> CC: Will Deacon <[email protected]> CC: Russell King <[email protected]> CC: Arnd Bergmann <[email protected]> CC: Suravee Suthikulpanit <[email protected]> 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 "); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
