mmc: atmel-mci: abort transfer on timeout error
authorLudovic Desroches <ludovic.desroches@atmel.com>
Mon, 9 Sep 2013 15:29:56 +0000 (17:29 +0200)
committerChris Ball <cjb@laptop.org>
Thu, 26 Sep 2013 01:45:36 +0000 (21:45 -0400)
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>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/atmel-mci.c

index 69e438ee043e6f8a9c151d3447f6a9e418544231..b8dfe0d8adbb80e46b215e3d1dc7b49dc4561c45 100644 (file)
@@ -589,6 +589,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;