| Message ID | 1497607134-10241-3-git-send-email-horms+renesas@verge.net.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jun 16, 2017 at 11:58:52AM +0200, Simon Horman wrote: > Add complete to DMA ops to allow DMAC implementation dependent > handling of DMA completion. > > Also implement the operation for SDHI. > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Codewise, I am all fine with this patch. There is one naming, however: > + void (*complete)(struct tmio_mmc_host *host); I'd rather call it 'dataend'. For internal DMAC, it is the same. But for SYS-DMAC there is difference between DATAEND and DMA_COMPLETE. This is exactly the reason we have commit 52ad9a8e854ca1 ("mmc: tmio: ensure end of DMA and SD access are in sync"). Basically, something like %s/complete/dataend/g would do it for me...
On Sat, Jun 17, 2017 at 05:01:05PM +0200, Wolfram Sang wrote: > On Fri, Jun 16, 2017 at 11:58:52AM +0200, Simon Horman wrote: > > Add complete to DMA ops to allow DMAC implementation dependent > > handling of DMA completion. > > > > Also implement the operation for SDHI. > > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > Codewise, I am all fine with this patch. There is one naming, however: > > > + void (*complete)(struct tmio_mmc_host *host); > > I'd rather call it 'dataend'. For internal DMAC, it is the same. But for > SYS-DMAC there is difference between DATAEND and DMA_COMPLETE. This is > exactly the reason we have commit 52ad9a8e854ca1 ("mmc: tmio: ensure end > of DMA and SD access are in sync"). > > Basically, something like %s/complete/dataend/g would do it for me... Sure, I will change this. 'compete' seemed like a nice name but I accept your reasoning above. -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" 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/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c index 202cf4346fdf..7a85610525b0 100644 --- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c @@ -127,6 +127,11 @@ static void renesas_sdhi_sys_dmac_abort_dma(struct tmio_mmc_host *host) renesas_sdhi_sys_dmac_enable_dma(host, true); } +static void renesas_sdhi_sys_dmac_complete_dma(struct tmio_mmc_host *host) +{ + complete(&host->dma_dataend); +} + static void renesas_sdhi_sys_dmac_dma_callback(void *arg) { struct tmio_mmc_host *host = arg; @@ -448,6 +453,7 @@ static const struct tmio_mmc_dma_ops renesas_sdhi_sys_dmac_dma_ops = { .request = renesas_sdhi_sys_dmac_request_dma, .release = renesas_sdhi_sys_dmac_release_dma, .abort = renesas_sdhi_sys_dmac_abort_dma, + .complete = renesas_sdhi_sys_dmac_complete_dma, }; static int renesas_sdhi_sys_dmac_probe(struct platform_device *pdev) diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 768c8abaedda..89f0e264f02f 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -122,6 +122,7 @@ struct tmio_mmc_dma_ops { struct tmio_mmc_data *pdata); void (*release)(struct tmio_mmc_host *host); void (*abort)(struct tmio_mmc_host *host); + void (*complete)(struct tmio_mmc_host *host); }; struct tmio_mmc_host { diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 7cb8d3510396..b65111cc8a17 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -87,6 +87,12 @@ static inline void tmio_mmc_abort_dma(struct tmio_mmc_host *host) host->dma_ops->abort(host); } +static inline void tmio_mmc_complete_dma(struct tmio_mmc_host *host) +{ + if (host->dma_ops) + host->dma_ops->complete(host); +} + void tmio_mmc_enable_mmc_irqs(struct tmio_mmc_host *host, u32 i) { host->sdcard_irq_mask &= ~(i & TMIO_MASK_IRQ); @@ -605,11 +611,11 @@ static void tmio_mmc_data_irq(struct tmio_mmc_host *host, unsigned int stat) if (done) { tmio_mmc_disable_mmc_irqs(host, TMIO_STAT_DATAEND); - complete(&host->dma_dataend); + tmio_mmc_complete_dma(host); } } else if (host->chan_rx && (data->flags & MMC_DATA_READ) && !host->force_pio) { tmio_mmc_disable_mmc_irqs(host, TMIO_STAT_DATAEND); - complete(&host->dma_dataend); + tmio_mmc_complete_dma(host); } else { tmio_mmc_do_data_irq(host); tmio_mmc_disable_mmc_irqs(host, TMIO_MASK_READOP | TMIO_MASK_WRITEOP);
Add complete to DMA ops to allow DMAC implementation dependent handling of DMA completion. Also implement the operation for SDHI. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- v2 * Implement operation for SDHI to avoid regression --- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 6 ++++++ drivers/mmc/host/tmio_mmc.h | 1 + drivers/mmc/host/tmio_mmc_core.c | 10 ++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-)