From: Ken Sumrall <[email protected]> Add some logging to make it clear just how the emmc timeout was handled.
Cc: Ulf Hansson <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Shawn Lin <[email protected]> Cc: Jon Hunter <[email protected]> Cc: Grant Grundler <[email protected]> Cc: Luca Porzio <[email protected]> Cc: Android Kernel Team <[email protected]> Cc: Sumit Semwal <[email protected]> Cc: John Stultz <[email protected]> Signed-off-by: Ken Sumrall <[email protected]> [AmitP: cherry-picked this Android patch from aosp common kernel android-4.4] Signed-off-by: Amit Pundir <[email protected]> --- drivers/mmc/card/block.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 9c69e21..e737c81 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -948,18 +948,25 @@ static int mmc_blk_cmd_error(struct request *req, const char *name, int error, req->rq_disk->disk_name, "timed out", name, status); /* If the status cmd initially failed, retry the r/w cmd */ - if (!status_valid) + if (!status_valid) { + pr_err("%s: status not valid, retrying timeout\n", + req->rq_disk->disk_name); return ERR_RETRY; + } /* * If it was a r/w cmd crc error, or illegal command * (eg, issued in wrong state) then retry - we should * have corrected the state problem above. */ - if (status & (R1_COM_CRC_ERROR | R1_ILLEGAL_COMMAND)) + if (status & (R1_COM_CRC_ERROR | R1_ILLEGAL_COMMAND)) { + pr_err("%s: command error, retrying timeout\n", + req->rq_disk->disk_name); return ERR_RETRY; + } /* Otherwise abort the command */ + pr_err("%s: not retrying timeout\n", req->rq_disk->disk_name); return ERR_ABORT; default: -- 2.7.4
