* [PATCH] mmc: block: improve logging of handling emmc timeouts
@ 2016-05-04 9:13 Amit Pundir
2016-05-10 6:58 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Amit Pundir @ 2016-05-04 9:13 UTC (permalink / raw)
To: linux-kernel, linux-mmc
Cc: Ken Sumrall, Ulf Hansson, Adrian Hunter, Shawn Lin, Jon Hunter,
Grant Grundler, Luca Porzio, Android Kernel Team, Sumit Semwal,
John Stultz
From: Ken Sumrall <ksumrall@android.com>
Add some logging to make it clear just how the emmc timeout
was handled.
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Shawn Lin <shawn.lin@rock-chips.com>
Cc: Jon Hunter <jonathanh@nvidia.com>
Cc: Grant Grundler <grundler@chromium.org>
Cc: Luca Porzio <lporzio@micron.com>
Cc: Android Kernel Team <kernel-team@android.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: Ken Sumrall <ksumrall@android.com>
[AmitP: cherry-picked this Android patch from aosp common kernel android-4.4]
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mmc: block: improve logging of handling emmc timeouts
2016-05-04 9:13 [PATCH] mmc: block: improve logging of handling emmc timeouts Amit Pundir
@ 2016-05-10 6:58 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2016-05-10 6:58 UTC (permalink / raw)
To: Amit Pundir
Cc: linux-kernel, linux-mmc, Ken Sumrall, Adrian Hunter, Shawn Lin,
Jon Hunter, Grant Grundler, Luca Porzio, Android Kernel Team,
Sumit Semwal, John Stultz
On 4 May 2016 at 11:13, Amit Pundir <amit.pundir@linaro.org> wrote:
> From: Ken Sumrall <ksumrall@android.com>
>
> Add some logging to make it clear just how the emmc timeout
> was handled.
>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: Shawn Lin <shawn.lin@rock-chips.com>
> Cc: Jon Hunter <jonathanh@nvidia.com>
> Cc: Grant Grundler <grundler@chromium.org>
> Cc: Luca Porzio <lporzio@micron.com>
> Cc: Android Kernel Team <kernel-team@android.com>
> Cc: Sumit Semwal <sumit.semwal@linaro.org>
> Cc: John Stultz <john.stultz@linaro.org>
I would prefer if you could remove the above cc:s, as I don't think
it's of relevance to have all these people here.
> Signed-off-by: Ken Sumrall <ksumrall@android.com>
> [AmitP: cherry-picked this Android patch from aosp common kernel android-4.4]
> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
> ---
> 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);
There's already a print done a couple of lines above. Even if it's not
telling about the "re-try" it becomes implicit, as nothing else gets
printed in this path.
Would you mind removing this?
> return ERR_ABORT;
>
> default:
> --
> 2.7.4
>
Kind regards
Uffe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-05-10 6:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-04 9:13 [PATCH] mmc: block: improve logging of handling emmc timeouts Amit Pundir
2016-05-10 6:58 ` Ulf Hansson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.