| Message ID | 1378740596-25026-1-git-send-email-ludovic.desroches@atmel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 09/09/2013 17:29, ludovic.desroches@atmel.com : > From: Ludovic Desroches <ludovic.desroches@atmel.com> > > When a software timeout occurs, the transfer is not stopped. In DMA case, it > causes DMA channel to be stuck because the transfer is still active causing > following transfers to be queued but not computed. > > Cc: <stable@vger.kernel.org> #3.9+ > Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Thanks. > Reported-by: Alexander Morozov <etesial@gmail.com> > --- > drivers/mmc/host/atmel-mci.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > index bdb84da..e9ea2fc 100644 > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -582,6 +582,13 @@ static void atmci_timeout_timer(unsigned long data) > if (host->mrq->cmd->data) { > host->mrq->cmd->data->error = -ETIMEDOUT; > host->data = NULL; > + /* > + * With some SDIO modules, sometimes DMA transfer hangs. If > + * stop_transfer() is not called then the DMA request is not > + * removed, following ones are queued and never computed. > + */ > + if (host->state == STATE_DATA_XFER) > + host->stop_transfer(host); > } else { > host->mrq->cmd->error = -ETIMEDOUT; > host->cmd = NULL; >
Hi, On Tue, Sep 10 2013, Nicolas Ferre wrote: > On 09/09/2013 17:29, ludovic.desroches@atmel.com : >> From: Ludovic Desroches <ludovic.desroches@atmel.com> >> >> When a software timeout occurs, the transfer is not stopped. In DMA case, it >> causes DMA channel to be stuck because the transfer is still active causing >> following transfers to be queued but not computed. >> >> Cc: <stable@vger.kernel.org> #3.9+ >> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> >> Reported-by: Alexander Morozov <etesial@gmail.com> > > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Thanks, pushed to mmc-next for 3.12. - Chris.
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index bdb84da..e9ea2fc 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -582,6 +582,13 @@ static void atmci_timeout_timer(unsigned long data) if (host->mrq->cmd->data) { host->mrq->cmd->data->error = -ETIMEDOUT; host->data = NULL; + /* + * With some SDIO modules, sometimes DMA transfer hangs. If + * stop_transfer() is not called then the DMA request is not + * removed, following ones are queued and never computed. + */ + if (host->state == STATE_DATA_XFER) + host->stop_transfer(host); } else { host->mrq->cmd->error = -ETIMEDOUT; host->cmd = NULL;