Re: [PATCH v2] mmc: block: improve logging of handling emmc timeouts

[Ulf Hansson]

On 10 May 2016 at 11:23, Amit Pundir <amit.pundir@xxxxxxxxxx> wrote:
> From: Ken Sumrall <ksumrall@xxxxxxxxxxx>
>
> Add some logging to make it clear just how the emmc timeout
> was handled.
>
> Signed-off-by: Ken Sumrall <ksumrall@xxxxxxxxxxx>
> [AmitP: cherry-picked this Android patch from aosp
>         common kernel android-4.4]
> Signed-off-by: Amit Pundir <amit.pundir@xxxxxxxxxx>

Thanks, applied for next!

Kind regards
Uffe

> ---
> v1...v2:
>   Removed CC list from the commit log and skipped one print statement.
>
>  drivers/mmc/card/block.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
> index 9c69e21..ddc9620 100644
> --- a/drivers/mmc/card/block.c
> +++ b/drivers/mmc/card/block.c
> @@ -948,16 +948,22 @@ 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 */
>                 return ERR_ABORT;
> --
> 2.7.4
>