diff mbox

dma-mapping: limit dma_mask in arch_setup_dma_ops()

Message ID 1419458139-4034-1-git-send-email-m-karicheri2@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Murali Karicheri Dec. 24, 2014, 9:55 p.m. UTC 
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@ti.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/mm/dma-mapping.c |    1 +
 1 file changed, 1 insertion(+)

Comments

Murali Karicheri Jan. 13, 2015, 8:38 p.m. UTC | #1 
On 12/24/2014 04:55 PM, Murali Karicheri wrote:
> 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@ti.com>
> Reviewed-by: Arnd Bergmann<arnd@arndb.de>
> ---
>   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);
Please discard this as this is still a work in progress. Any change if 
required will be added to my series with subject "PCI: get DMA 
configuration from parent device"

Thanks.
diff mbox

Patch

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);