leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Adrian Hunter 2015-05-07 13:10:24 +03:00 committed by Ulf Hansson
parent 6f398ad207
commit b8360a4945
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/mmc/card/block.c
View File

@ -1207,6 +1207,7 @@ static int mmc_blk_err_check(struct mmc_card *card,
mmc_active); mmc_active);
struct mmc_blk_request *brq = &mq_mrq->brq; struct mmc_blk_request *brq = &mq_mrq->brq;
struct request *req = mq_mrq->req; struct request *req = mq_mrq->req;
int need_retune = card->host->need_retune;
int ecc_err = 0, gen_err = 0; 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 (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", 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, req->rq_disk->disk_name, brq->data.error,
(unsigned)blk_rq_pos(req), (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_blk_data *md = mq->data;
struct mmc_card *card = md->queue.card; struct mmc_card *card = md->queue.card;
struct mmc_blk_request *brq = &mq->mqrq_cur->brq; 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; enum mmc_blk_status status;
struct mmc_queue_req *mq_rq; struct mmc_queue_req *mq_rq;
struct request *req = rqc; struct request *req = rqc;
@ -1917,6 +1924,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc)
break; break;
goto cmd_abort; goto cmd_abort;
case MMC_BLK_RETRY: case MMC_BLK_RETRY:
retune_retry_done = brq->retune_retry_done;
if (retry++ < 5) if (retry++ < 5)
break; break;
/* Fall through */ /* 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, mmc_start_req(card->host,
&mq_rq->mmc_active, NULL); &mq_rq->mmc_active, NULL);
} }
mq_rq->brq.retune_retry_done = retune_retry_done;
} }
} while (ret); } while (ret);

1
drivers/mmc/card/queue.h
View File

@ -12,6 +12,7 @@ struct mmc_blk_request {
struct mmc_command cmd; struct mmc_command cmd;
struct mmc_command stop; struct mmc_command stop;
struct mmc_data data; struct mmc_data data;
int retune_retry_done;
}; };
enum mmc_packed_type { enum mmc_packed_type {