Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a6d7298 authored by Murali Karicheri's avatar Murali Karicheri Committed by Bjorn Helgaas
Browse files

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: default avatarMurali Karicheri <m-karicheri2@ti.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
CC: Joerg Roedel <joro@8bytes.org>
CC: Grant Likely <grant.likely@linaro.org>
CC: Rob Herring <robh+dt@kernel.org>
CC: Will Deacon <will.deacon@arm.com>
CC: Russell King <linux@arm.linux.org.uk>
CC: Arnd Bergmann <arnd@arndb.de>
CC: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
parent 22b3c181

drivers/of/device.c

+13 −3
Original line number Diff line number Diff line
@@ -90,9 +90,10 @@ 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.

	 */

	if (!dev->coherent_dma_mask)

		dev->coherent_dma_mask = DMA_BIT_MASK(32);



	/*
@@ -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 ");