Commit 9820a5b1 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson

mmc: core: for data errors, take response of stop cmd into account

Some errors are flagged only with the next command after a multiblock
transfer, e.g. ECC error. So, when checking for data transfer errors,
we check the result from the stop command as well.
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent a04e6bae
...@@ -1446,7 +1446,8 @@ static enum mmc_blk_status mmc_blk_err_check(struct mmc_card *card, ...@@ -1446,7 +1446,8 @@ static enum mmc_blk_status mmc_blk_err_check(struct mmc_card *card,
return MMC_BLK_RETRY; return MMC_BLK_RETRY;
} }
if (brq->data.error) { /* Some errors (ECC) are flagged on the next commmand, so check stop, too */
if (brq->data.error || brq->stop.error) {
if (need_retune && !brq->retune_retry_done) { if (need_retune && !brq->retune_retry_done) {
pr_debug("%s: retrying because a re-tune was needed\n", pr_debug("%s: retrying because a re-tune was needed\n",
req->rq_disk->disk_name); req->rq_disk->disk_name);
...@@ -1454,7 +1455,7 @@ static enum mmc_blk_status mmc_blk_err_check(struct mmc_card *card, ...@@ -1454,7 +1455,7 @@ static enum mmc_blk_status mmc_blk_err_check(struct mmc_card *card,
return MMC_BLK_RETRY; 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 ?: brq->stop.error,
(unsigned)blk_rq_pos(req), (unsigned)blk_rq_pos(req),
(unsigned)blk_rq_sectors(req), (unsigned)blk_rq_sectors(req),
brq->cmd.resp[0], brq->stop.resp[0]); brq->cmd.resp[0], brq->stop.resp[0]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment