[RFC PATCH v2 2/2] mmc: core: for data errors, take response of stop cmd into account

[Wolfram Sang]

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: Wolfram Sang <wsa+rene...@sang-engineering.com>
---
 drivers/mmc/core/block.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index bacaa255c4b16a..ea3dc8a22ad2cb 100644
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1374,7 +1374,8 @@ static enum mmc_blk_status mmc_blk_err_check(struct 
mmc_card *card,
                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) {
                        pr_debug("%s: retrying because a re-tune was needed\n",
                                 req->rq_disk->disk_name);
@@ -1382,7 +1383,7 @@ static enum mmc_blk_status mmc_blk_err_check(struct 
mmc_card *card,
                        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,
+                      req->rq_disk->disk_name, brq->data.error ?: 
brq->stop.error,
                       (unsigned)blk_rq_pos(req),
                       (unsigned)blk_rq_sectors(req),
                       brq->cmd.resp[0], brq->stop.resp[0]);
-- 
2.11.0