| Message ID | Pine.LNX.4.64.1401311248320.3234@axis700.grange (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On Fri, Jan 31, 2014 at 12:54:19PM +0100, Guennadi Liakhovetski wrote: > According to the DMA API data has to be synchronised before starting > a DMA transfer to device and after completing a DMA transfer from device. > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Simon Horman <horms+renesas@verge.net.au> > --- > drivers/mmc/host/tmio_mmc_dma.c | 21 ++++++++++++--------- > 1 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c > index 65edb4a..a997b94 100644 > --- a/drivers/mmc/host/tmio_mmc_dma.c > +++ b/drivers/mmc/host/tmio_mmc_dma.c > @@ -168,9 +168,12 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host) > } > > ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_TO_DEVICE); > - if (ret > 0) > + if (ret > 0) { > + dma_sync_sg_for_device(chan->device->dev, sg, host->sg_len, > + DMA_TO_DEVICE); > desc = dmaengine_prep_slave_sg(chan, sg, ret, > DMA_MEM_TO_DEV, DMA_CTRL_ACK); > + } > > if (desc) { > cookie = dmaengine_submit(desc); > @@ -247,14 +250,14 @@ static void tmio_mmc_tasklet_fn(unsigned long arg) > if (!host->data) > goto out; > > - if (host->data->flags & MMC_DATA_READ) > - dma_unmap_sg(host->chan_rx->device->dev, > - host->sg_ptr, host->sg_len, > - DMA_FROM_DEVICE); > - else > - dma_unmap_sg(host->chan_tx->device->dev, > - host->sg_ptr, host->sg_len, > - DMA_TO_DEVICE); > + if (host->data->flags & MMC_DATA_READ) { > + struct device *dev = host->chan_rx->device->dev; > + dma_unmap_sg(dev, host->sg_ptr, host->sg_len, DMA_FROM_DEVICE); > + dma_sync_sg_for_cpu(dev, host->sg_ptr, host->sg_len, DMA_FROM_DEVICE); > + } else { > + struct device *dev = host->chan_tx->device->dev; > + dma_unmap_sg(dev, host->sg_ptr, host->sg_len, DMA_TO_DEVICE); > + } > > tmio_mmc_do_data_irq(host); > out: > -- > 1.7.2.5 > > -- > 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 > -- 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
On 31/01/14 11:54, Guennadi Liakhovetski wrote: > According to the DMA API data has to be synchronised before starting > a DMA transfer to device and after completing a DMA transfer from device. > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> I've got 1/3 and 2/3, but not 3/3 ?
Hi Ben On Thu, 6 Feb 2014, Ben Dooks wrote: > On 31/01/14 11:54, Guennadi Liakhovetski wrote: > > According to the DMA API data has to be synchronised before starting > > a DMA transfer to device and after completing a DMA transfer from device. > > > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > I've got 1/3 and 2/3, but not 3/3 ? Unfortunately that thread didn't make it to the ALKML - all patches bounced, so, they only arrived to sh and mmc. (A day before and a couple of hours later posting to ALKML worked just fine, just that one time...). You can view the whole thread here http://thread.gmane.org/gmane.linux.kernel.mmc/24969/focus=24972 Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- 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/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c index 65edb4a..a997b94 100644 --- a/drivers/mmc/host/tmio_mmc_dma.c +++ b/drivers/mmc/host/tmio_mmc_dma.c @@ -168,9 +168,12 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host) } ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_TO_DEVICE); - if (ret > 0) + if (ret > 0) { + dma_sync_sg_for_device(chan->device->dev, sg, host->sg_len, + DMA_TO_DEVICE); desc = dmaengine_prep_slave_sg(chan, sg, ret, DMA_MEM_TO_DEV, DMA_CTRL_ACK); + } if (desc) { cookie = dmaengine_submit(desc); @@ -247,14 +250,14 @@ static void tmio_mmc_tasklet_fn(unsigned long arg) if (!host->data) goto out; - if (host->data->flags & MMC_DATA_READ) - dma_unmap_sg(host->chan_rx->device->dev, - host->sg_ptr, host->sg_len, - DMA_FROM_DEVICE); - else - dma_unmap_sg(host->chan_tx->device->dev, - host->sg_ptr, host->sg_len, - DMA_TO_DEVICE); + if (host->data->flags & MMC_DATA_READ) { + struct device *dev = host->chan_rx->device->dev; + dma_unmap_sg(dev, host->sg_ptr, host->sg_len, DMA_FROM_DEVICE); + dma_sync_sg_for_cpu(dev, host->sg_ptr, host->sg_len, DMA_FROM_DEVICE); + } else { + struct device *dev = host->chan_tx->device->dev; + dma_unmap_sg(dev, host->sg_ptr, host->sg_len, DMA_TO_DEVICE); + } tmio_mmc_do_data_irq(host); out:
According to the DMA API data has to be synchronised before starting a DMA transfer to device and after completing a DMA transfer from device. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- drivers/mmc/host/tmio_mmc_dma.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-)