dw_dmac: apply default dma_mask if needed
PATCH v2 1/1 dw_dmac: apply default dma_mask if needed
In some cases we got the device without dma_mask configured. We have to apply the default value to avoid crashes during memory mapping.
Signed-off-by Andy Shevchenko <[email protected]>
Acked-by Viresh Kumar <[email protected]>
---
Since v1:
- rebased on top of recent next branch from Vinod
drivers/dma/dw_dmac.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/dma/dw_dmac.c +6 -0
@@ -1661,6 +1661,12 @@ static int dw_probe(struct platform_device *pdev)if (!regs)return -EBUSY ; +/* Apply default dma_mask if needed */ +if (!pdev->dev.dma_mask) { + pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; + pdev->dev.coherent_dma_mask =DMA_BIT_MASK (32 ); + } + dw_params =dma_read_byaddr (regs,DW_PARAMS ); autocfg = dw_params >>DW_PARAMS_EN &0x1 ;
Signature · 1 line
1.7.10.4
Vinod Koul
AppliedQuoted 5 lines · Andy Shevchenko
In some cases we got the device without
dma_maskconfigured. We have to apply the default value to avoid crashes during memory mapping.Signed-off-by Andy Shevchenko <[email protected]>Acked-by Viresh Kumar <[email protected]>
Applied, thanks
Quoted 26 lines
---
Since v1:
- rebased on top of recent next branch from Vinoddrivers/dma/dw_dmac.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/dma/dw_dmac.c +6
-0@@ -1661,6 +1661,12 @@ static int dw_probe(struct platform_device *pdev)if (!regs)return -EBUSY ; +/* Apply default dma_mask if needed */ +if (!pdev->dev.dma_mask) { + pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; + pdev->dev.coherent_dma_mask =DMA_BIT_MASK (32 ); + } + dw_params =dma_read_byaddr (regs,DW_PARAMS ); autocfg = dw_params >>DW_PARAMS_EN &0x1 ;Signature · 1 line
1.7.10.4