On 4 May 2016 at 11:13, Amit Pundir <amit.pun...@linaro.org> wrote:
> From: Ken Sumrall <ksumr...@android.com>
>
> Add some logging to make it clear just how the emmc timeout
> was handled.
>
> Cc: Ulf Hansson <ulf.hans...@linaro.org>
> Cc: Adrian Hunter <adrian.hun...@intel.com>
> Cc: Shawn Lin <shawn....@rock-chips.com>
> Cc: Jon Hunter <jonath...@nvidia.com>
> Cc: Grant Grundler <grund...@chromium.org>
> Cc: Luca Porzio <lpor...@micron.com>
> Cc: Android Kernel Team <kernel-t...@android.com>
> Cc: Sumit Semwal <sumit.sem...@linaro.org>
> Cc: John Stultz <john.stu...@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 <ksumr...@android.com>
> [AmitP: cherry-picked this Android patch from aosp common kernel android-4.4]
> Signed-off-by: Amit Pundir <amit.pun...@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
