diff options
| author | Jon Medhurst <jon.medhurst@linaro.org> | 2011-12-20 15:03:38 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2012-07-16 14:21:42 +0100 |
| commit | 11b92e44ba40b738a2cc31e467b5430a3a999b8e (patch) | |
| tree | 9fe2796f39d8d52282783b75f1e655a177ea5993 | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
mmc: block: Make multi-block write errors retry as single block writestracking-tracking-armlt-mmc-ll-20120723.0tracking-tracking-armlt-mmc-ll-20120716.1tracking-tracking-armlt-mmc-ll-20120716.0
The current mmc block code retries i/o errors on multi-block reads by
using single block reads. For platforms with unreliable multi-block
operations, like the ARM Versatile Express board, this is a valuable
error recovery path.
This patch extends the single block retry to also include write
operations.
Signed-off-by: Jon Medhurst <jon.medhurst@linaro.org>
| -rw-r--r-- | drivers/mmc/card/block.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 276d21ce6bc..e6bb68059b8 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1068,6 +1068,10 @@ static int mmc_blk_err_check(struct mmc_card *card, return MMC_BLK_ECC_ERR; return MMC_BLK_DATA_ERR; } else { + if (brq->data.blocks > 1) { + /* Hack to redo transfer one sector at a time */ + return MMC_BLK_DATA_ERR; + } return MMC_BLK_CMD_ERR; } } @@ -1354,7 +1358,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) case MMC_BLK_ECC_ERR: if (brq->data.blocks > 1) { /* Redo read one sector at a time */ - pr_warning("%s: retrying using single block read\n", + pr_warning("%s: retrying using single block transfer\n", req->rq_disk->disk_name); disable_multi = 1; break; |