Skip to contentSkip to conversation

dw_dmac: apply default dma_mask if needed

PATCH Superseded Andy Shevchenko 5 participants 6 messages Jan 29, 2013 – Feb 12, 2013 dmaengine

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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.

---
 drivers/dma/dw_dmac.c |    6 ++++++
 1 file changed, 6 insertions(+)
drivers/dma/dw_dmac.c +6 -0
index e8d0679..a572a1e 100644
@@ -1673,6 +1673,12 @@ static int dw_probe(struct platform_device *pdev)
 	if (IS_ERR(regs))
 		return PTR_ERR(regs);
 
+	/* 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
#1 lore raw

Adding Arnd in cc.

Quoted 13 lines · Andy Shevchenko

In some cases we got the device without dma_mask configured. We have to apply the default value to avoid crashes during memory mapping.

---
 drivers/dma/dw_dmac.c |    6 ++++++
 1 file changed, 6 insertions(+)
drivers/dma/dw_dmac.c +0 -0
index e8d0679..a572a1e 100644

drivers/dma/dw_dmac.c static int dw_probe(struct platform_device *pdev) · line 1681

Quoted 9 lines
drivers/dma/dw_dmac.c +6 -0
@@ -1673,6 +1673,12 @@ static int dw_probe(struct platform_device *pdev)
        if (IS_ERR(regs))
                return PTR_ERR(regs);
 
+       /* 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);
+       }
+

Hmm... Why is it required for a DMA controller? What kind of crash do you get?

@Arnd: Is this change recommended?

#2 lore raw
Quoted 20 lines · Viresh Kumar

Adding Arnd in cc.

Quoted 16 lines · Andy Shevchenko

In some cases we got the device without dma_mask configured. We have to apply the default value to avoid crashes during memory mapping.

---
 drivers/dma/dw_dmac.c |    6 ++++++
 1 file changed, 6 insertions(+)
drivers/dma/dw_dmac.c +0 -0
index e8d0679..a572a1e 100644
@@ -1673,6 +1673,12 @@ static int dw_probe(struct platform_device *pdev)
        if (IS_ERR(regs))
                return PTR_ERR(regs);
 
Quoted 9 lines

drivers/dma/dw_dmac.c static int dw_probe(struct platform_device *pdev) · line 1681

Quoted 6 lines
drivers/dma/dw_dmac.c +6 -0
+       /* 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);
+       }
+

Hmm... Why is it required for a DMA controller? What kind of crash do you get?

A valid dma mask is required for any device that is passed into dma_map_* and other dma-mapping.h interfaces. The question is more about is responsible for setting up the mask. Traditionally we'd do that from the platform definition in the place where the platform_device is created, but this now comes from the device tree, which is a bit inconsistent with the DMA masks at the moment.

We do set the dev.coherent_dma_mask to DMA_BIT_MASK(32) for all platform devices instatiated from DT, but I cannot find the code that sets the dma_mask for a platform_device. For an amba_device, we set both to the same value. Maybe Grant can remember if the difference here is intentional, or if the dma_mask is set up elsewhere for a platform_device coming from DT.

Quoted 1 line

@Arnd: Is this change recommended?

For all I can tell, it cannot hurt to do it this way.

Arnd

Acked-by on v1 1/1
#3 lore raw
In reply to Andy Shevchenko
Quoted 14 lines · Andy Shevchenko

In some cases we got the device without dma_mask configured. We have to apply the default value to avoid crashes during memory mapping.

---
 drivers/dma/dw_dmac.c |    6 ++++++
 1 file changed, 6 insertions(+)
drivers/dma/dw_dmac.c +0 -0
index e8d0679..a572a1e 100644
@@ -1673,6 +1673,12 @@ static int dw_probe(struct platform_device *pdev)
        if (IS_ERR(regs))

drivers/dma/dw_dmac.c static int dw_probe(struct platform_device *pdev) · line 1683

Quoted 10 lines
drivers/dma/dw_dmac.c +6 -0
                return PTR_ERR(regs);
 
+       /* 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;
#4 lore raw
In reply to Andy Shevchenko
Quoted 3 lines · Andy Shevchenko

In some cases we got the device without dma_mask configured. We have to apply the default value to avoid crashes during memory mapping.

what was this generated against, it fails to apply for me.

Quoted 25 lines
---
 drivers/dma/dw_dmac.c |    6 ++++++
 1 file changed, 6 insertions(+)
drivers/dma/dw_dmac.c +6 -0
index e8d0679..a572a1e 100644
@@ -1673,6 +1673,12 @@ static int dw_probe(struct platform_device *pdev)
 	if (IS_ERR(regs))
 		return PTR_ERR(regs);
 
+	/* 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
#5 lore raw
Quoted 5 lines · Vinod Koul
Quoted 3 lines · Andy Shevchenko

In some cases we got the device without dma_mask configured. We have to apply the default value to avoid crashes during memory mapping.

what was this generated against, it fails to apply for me.

I've tested this against linux-next. The problem apparently in the patch which Greg submits earlier:
7331205a "dma: Convert to devm_ioremap_resource()". If you want I could rebase it against your next branch. I thought you'd seen that patch already.

Quoted 31 lines
Quoted 24 lines
---
 drivers/dma/dw_dmac.c |    6 ++++++
 1 file changed, 6 insertions(+)
drivers/dma/dw_dmac.c +6 -1
index e8d0679..a572a1e 100644
@@ -1673,6 +1673,12 @@ static int dw_probe(struct platform_device *pdev)
      if (IS_ERR(regs))
              return PTR_ERR(regs);
 
+     /* 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;
 
--
Quoted 2 lines

1.7.10.4

--
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/

Signature · 2 lines
With Best Regards,
Andy Shevchenko