Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8360a49 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: block: Retry errored data requests when re-tuning is needed 



Retry errored data requests when re-tuning is needed and
add a flag to struct mmc_blk_request so that the retry
is only done once.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 6f398ad2

drivers/mmc/card/block.c

+10 −1
Original line number Diff line number Diff line
@@ -1207,6 +1207,7 @@ static int mmc_blk_err_check(struct mmc_card *card, 
						    mmc_active);

	struct mmc_blk_request *brq = &mq_mrq->brq;

	struct request *req = mq_mrq->req;

	int need_retune = card->host->need_retune;

	int ecc_err = 0, gen_err = 0;



	/*
@@ -1274,6 +1275,12 @@ static int mmc_blk_err_check(struct mmc_card *card, 
	}



	if (brq->data.error) {

		if (need_retune && !brq->retune_retry_done) {

			pr_info("%s: retrying because a re-tune was needed\n",

				req->rq_disk->disk_name);

			brq->retune_retry_done = 1;

			return MMC_BLK_RETRY;

		}

		pr_err("%s: error %d transferring data, sector %u, nr %u, cmd response %#x, card status %#x\n",

		       req->rq_disk->disk_name, brq->data.error,

		       (unsigned)blk_rq_pos(req),
@@ -1833,7 +1840,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) 
	struct mmc_blk_data *md = mq->data;

	struct mmc_card *card = md->queue.card;

	struct mmc_blk_request *brq = &mq->mqrq_cur->brq;

	int ret = 1, disable_multi = 0, retry = 0, type;

	int ret = 1, disable_multi = 0, retry = 0, type, retune_retry_done = 0;

	enum mmc_blk_status status;

	struct mmc_queue_req *mq_rq;

	struct request *req = rqc;
@@ -1917,6 +1924,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) 
				break;

			goto cmd_abort;

		case MMC_BLK_RETRY:

			retune_retry_done = brq->retune_retry_done;

			if (retry++ < 5)

				break;

			/* Fall through */
@@ -1979,6 +1987,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) 
				mmc_start_req(card->host,

						&mq_rq->mmc_active, NULL);

			}

			mq_rq->brq.retune_retry_done = retune_retry_done;

		}

	} while (ret);

drivers/mmc/card/queue.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ struct mmc_blk_request { 
	struct mmc_command	cmd;

	struct mmc_command	stop;

	struct mmc_data		data;

	int			retune_retry_done;

};



enum mmc_packed_type {