Hi Guennadi,
On Fri, Apr 29 2011, Guennadi Liakhovetski wrote:
> DMA mode has to be re-enabled during a resume.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
> ---
> drivers/mmc/host/tmio_mmc_dma.c | 21 ++++++++++++---------
> drivers/mmc/host/tmio_mmc_pio.c | 1 +
> 2 files changed, 13 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c
> index d3de74a..25f1ad6 100644
> --- a/drivers/mmc/host/tmio_mmc_dma.c
> +++ b/drivers/mmc/host/tmio_mmc_dma.c
> @@ -256,7 +256,10 @@ static bool tmio_mmc_filter(struct dma_chan *chan, void *arg)
> void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdata)
> {
> /* We can only either use DMA for both Tx and Rx or not use it at all */
> - if (pdata->dma) {
> + if (!pdata->dma)
> + return;
> +
> + if (!host->chan_tx && !host->chan_rx) {
> dma_cap_mask_t mask;
>
> dma_cap_zero(mask);
> @@ -284,18 +287,18 @@ void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdat
>
> tasklet_init(&host->dma_complete, tmio_mmc_tasklet_fn, (unsigned long)host);
> tasklet_init(&host->dma_issue, tmio_mmc_issue_tasklet_fn, (unsigned long)host);
> + }
>
> - tmio_mmc_enable_dma(host, true);
> + tmio_mmc_enable_dma(host, true);
> +
> + return;
>
> - return;
> ebouncebuf:
> - dma_release_channel(host->chan_rx);
> - host->chan_rx = NULL;
> + dma_release_channel(host->chan_rx);
> + host->chan_rx = NULL;
> ereqrx:
> - dma_release_channel(host->chan_tx);
> - host->chan_tx = NULL;
> - return;
> - }
> + dma_release_channel(host->chan_tx);
> + host->chan_tx = NULL;
> }
>
> void tmio_mmc_release_dma(struct tmio_mmc_host *host)
> diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
> index 26598f1..27fc11c 100644
> --- a/drivers/mmc/host/tmio_mmc_pio.c
> +++ b/drivers/mmc/host/tmio_mmc_pio.c
> @@ -995,6 +995,7 @@ int tmio_mmc_host_resume(struct device *dev)
> pm_runtime_get_sync(dev);
>
> tmio_mmc_reset(mmc_priv(mmc));
> + tmio_mmc_request_dma(host, host->pdata);
>
> return mmc_resume_host(mmc);
> }
This patch doesn't apply against current mmc-next.
Please could you send a full patchset against mmc-next for tmio for .40?
Thanks!
- Chris.
--
Chris Ball <cjb@xxxxxxxxxx> <http://printf.net/>
One Laptop Per Child
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
