The patch titled
mmc: omap: recover from transfer failures
has been added to the -mm tree. Its filename is
omap-mmc-recover-from-transfer-failures-resend.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mmc: omap: recover from transfer failures
From: Jean Pihet <jpihet@xxxxxxxxxx>
Timeouts during a command that has a data phase can result in the next
command issued after the command that failed not being processed, i.e. no
interrupt ever occurs to indicate the command has completed. This failure
can result in a deadlock.
This patch resets the data state machine to clear the error in case of a
command timeout.
Tested on OMAP3430 chip and intensive MMC/SD device removal while
transferring data.
Signed-off-by: Andy Lowe <alowe@xxxxxxxxxx>
Signed-off-by: Jean Pihet <jpihet@xxxxxxxxxx>
Signed-off-by: Adrian Hunter <ext-adrian.hunter@xxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Cc: Jarkko Lavinen <jarkko.lavinen@xxxxxxxxx>
Cc: Pierre Ossman <drzeus-mmc@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/mmc/host/omap_hsmmc.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff -puN drivers/mmc/host/omap_hsmmc.c~omap-mmc-recover-from-transfer-failures-resend drivers/mmc/host/omap_hsmmc.c
--- a/drivers/mmc/host/omap_hsmmc.c~omap-mmc-recover-from-transfer-failures-resend
+++ a/drivers/mmc/host/omap_hsmmc.c
@@ -416,8 +416,15 @@ static irqreturn_t mmc_omap_irq(int irq,
}
end_cmd = 1;
}
- if (host->data)
+ if (host->data) {
mmc_dma_cleanup(host);
+ OMAP_HSMMC_WRITE(host->base, SYSCTL,
+ OMAP_HSMMC_READ(host->base,
+ SYSCTL) | SRD);
+ while (OMAP_HSMMC_READ(host->base,
+ SYSCTL) & SRD)
+ ;
+ }
}
if ((status & DATA_TIMEOUT) ||
(status & DATA_CRC)) {
_
Patches currently in -mm which might be from jpihet@xxxxxxxxxx are
omap-mmc-recover-from-transfer-failures-resend.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
