| Message ID | 87zj9eb5ya.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Morimoto-san, Thank you for the patch. On Tuesday 20 January 2015 01:22:48 Kuninori Morimoto wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > ecc19d17868be9c9f8f00ed928791533c420f3e0 > (dmaengine: Add a warning for drivers not using the generic slave > caps retrieval) added WARN() for DMA_SLAVE. > Kernel will shows WARNING without this patch. > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- > v2 -> v3 > > - dma -> dmaengine in Subject > > drivers/dma/sh/rcar-hpbdma.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/dma/sh/rcar-hpbdma.c b/drivers/dma/sh/rcar-hpbdma.c > index 20a6f6f..6fef1b9 100644 > --- a/drivers/dma/sh/rcar-hpbdma.c > +++ b/drivers/dma/sh/rcar-hpbdma.c > @@ -534,6 +534,8 @@ static int hpb_dmae_chan_probe(struct hpb_dmae_device > *hpbdev, int id) > > static int hpb_dmae_probe(struct platform_device *pdev) > { > + const enum dma_slave_buswidth widths = DMA_SLAVE_BUSWIDTH_1_BYTE | > + DMA_SLAVE_BUSWIDTH_2_BYTES | DMA_SLAVE_BUSWIDTH_4_BYTES; > struct hpb_dmae_pdata *pdata = pdev->dev.platform_data; > struct hpb_dmae_device *hpbdev; > struct dma_device *dma_dev; > @@ -595,6 +597,10 @@ static int hpb_dmae_probe(struct platform_device *pdev) > > dma_cap_set(DMA_MEMCPY, dma_dev->cap_mask); > dma_cap_set(DMA_SLAVE, dma_dev->cap_mask); > + dma_dev->src_addr_widths = widths; > + dma_dev->dst_addr_widths = widths; > + dma_dev->directions = BIT(DMA_MEM_TO_DEV) | BIT(DMA_DEV_TO_MEM); > + dma_dev->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; The driver doesn't seem to support residue reporting at all, shouldn't residue_granularity be set to DMA_RESIDUE_GRANULARITY_DESCRIPTOR then ? > hpbdev->shdma_dev.ops = &hpb_dmae_ops; > hpbdev->shdma_dev.desc_size = sizeof(struct hpb_desc);
Hi Laurent > > @@ -595,6 +597,10 @@ static int hpb_dmae_probe(struct platform_device *pdev) > > > > dma_cap_set(DMA_MEMCPY, dma_dev->cap_mask); > > dma_cap_set(DMA_SLAVE, dma_dev->cap_mask); > > + dma_dev->src_addr_widths = widths; > > + dma_dev->dst_addr_widths = widths; > > + dma_dev->directions = BIT(DMA_MEM_TO_DEV) | BIT(DMA_DEV_TO_MEM); > > + dma_dev->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; > > The driver doesn't seem to support residue reporting at all, shouldn't > residue_granularity be set to DMA_RESIDUE_GRANULARITY_DESCRIPTOR then ? Thank you for pointing it. will fix in v4 patch Best regards --- Kuninori Morimoto -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/dma/sh/rcar-hpbdma.c b/drivers/dma/sh/rcar-hpbdma.c index 20a6f6f..6fef1b9 100644 --- a/drivers/dma/sh/rcar-hpbdma.c +++ b/drivers/dma/sh/rcar-hpbdma.c @@ -534,6 +534,8 @@ static int hpb_dmae_chan_probe(struct hpb_dmae_device *hpbdev, int id) static int hpb_dmae_probe(struct platform_device *pdev) { + const enum dma_slave_buswidth widths = DMA_SLAVE_BUSWIDTH_1_BYTE | + DMA_SLAVE_BUSWIDTH_2_BYTES | DMA_SLAVE_BUSWIDTH_4_BYTES; struct hpb_dmae_pdata *pdata = pdev->dev.platform_data; struct hpb_dmae_device *hpbdev; struct dma_device *dma_dev; @@ -595,6 +597,10 @@ static int hpb_dmae_probe(struct platform_device *pdev) dma_cap_set(DMA_MEMCPY, dma_dev->cap_mask); dma_cap_set(DMA_SLAVE, dma_dev->cap_mask); + dma_dev->src_addr_widths = widths; + dma_dev->dst_addr_widths = widths; + dma_dev->directions = BIT(DMA_MEM_TO_DEV) | BIT(DMA_DEV_TO_MEM); + dma_dev->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; hpbdev->shdma_dev.ops = &hpb_dmae_ops; hpbdev->shdma_dev.desc_size = sizeof(struct hpb_desc);