[PATCH] mmc: core: fix dead loop of mmc_retune

[Ulf Hansson]

On 30 September 2015 at 11:37, Chaotian Jing <chaotian.jing at mediatek.com> wrote:
> When get a CRC error, start the mmc_retune, it will issue CMD19/CMD21
> to do tune, assume there were 10 clock phase need to try, phase 0 to
> phase 6 is ok, phase 7 to phase 9 is NG, we try it from 0 to 9, so
> the last CMD19/CMD21 will get CRC error, host->need_retune was set and
> cause mmc_retune was called, then dead loop of mmc_retune
>
> Signed-off-by: Chaotian Jing <chaotian.jing at mediatek.com>

Thanks Chaotian!

I have applied this for fixes and added the following tag:

Fixes: bd11e8bd03ca ("mmc: core: Flag re-tuning is needed on CRC errors")

Kind regards
Uffe

> ---
>  drivers/mmc/core/core.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
> index 0520064..a3eb20b 100644
> --- a/drivers/mmc/core/core.c
> +++ b/drivers/mmc/core/core.c
> @@ -134,9 +134,11 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq)
>         int err = cmd->error;
>
>         /* Flag re-tuning needed on CRC errors */
> -       if (err == -EILSEQ || (mrq->sbc && mrq->sbc->error == -EILSEQ) ||
> +       if ((cmd->opcode != MMC_SEND_TUNING_BLOCK &&
> +           cmd->opcode != MMC_SEND_TUNING_BLOCK_HS200) &&
> +           (err == -EILSEQ || (mrq->sbc && mrq->sbc->error == -EILSEQ) ||
>             (mrq->data && mrq->data->error == -EILSEQ) ||
> -           (mrq->stop && mrq->stop->error == -EILSEQ))
> +           (mrq->stop && mrq->stop->error == -EILSEQ)))
>                 mmc_retune_needed(host);
>
>         if (err && cmd->retries && mmc_host_is_spi(host)) {
> --
> 1.8.1.1.dirty
>