From: nicolas.ferre@atmel.com (Nicolas Ferre) Date: Tue, 10 Sep 2013 09:54:39 +0200 Subject: [PATCH] mmc: atmel-mci: abort transfer on timeout error In-Reply-To: <1378740596-25026-1-git-send-email-ludovic.desroches@atmel.com> References: <1378740596-25026-1-git-send-email-ludovic.desroches@atmel.com> Message-ID: <522ED03F.5070404@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 09/09/2013 17:29, ludovic.desroches at atmel.com : > From: Ludovic Desroches > > 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: #3.9+ > Signed-off-by: Ludovic Desroches Acked-by: Nicolas Ferre Thanks. > Reported-by: Alexander Morozov > --- > 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; > -- Nicolas Ferre