mmc: block: fix read single on recovery logic
Subsystems (2)
PATCH 1/1 mmc: block: fix read single on recovery logic
On reads with MMC_READ_MULTIPLE_BLOCK that fail,
the recovery handler will use MMC_READ_SINGLE_BLOCK for each of the blocks, up to MMC_READ_SINGLE_RETRIES times each. The logic for this is fixed to never report unsuccessful reads as success to the block layer.
On command error with retries remaining, blk_update_request was called with whatever value error was set last to.
In case it was last set to BLK_STS_OK (default), the read will be reported as success, even though there was no data read from the device. This could happen on a CRC mismatch for the response,
a card rejecting the command (e.g. again due to a CRC mismatch). In case it was last set to BLK_STS_IOERR, the error is reported correctly, but no retries will be attempted.
The patch now will count both command and data errors as retries and send BLK_STS_IOERR if there are no retries remaining,
or BLK_STS_OK if the single read was successful in the meantime.
--- drivers/mmc/core/block.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/mmc/core/block.c +14 -14
@@ -1682,31 +1682,31 @@ static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req)struct mmc_card *card = mq->card;struct mmc_host *host = card->host;blk_status_t error =BLK_STS_OK ; -int retries =0 ; do { u32 status; int err; + int retries = 0; - mmc_blk_rw_rq_prep(mqrq, card, 1, mq); + while (retries++ < MMC_READ_SINGLE_RETRIES) { + mmc_blk_rw_rq_prep(mqrq, card, 1, mq); - mmc_wait_for_req(host, mrq); + mmc_wait_for_req(host, mrq); - err = mmc_send_status(card, &status); - if (err) - goto error_exit; - - if (!mmc_host_is_spi(host) && - !mmc_ready_for_data(status)) { - err = mmc_blk_fix_state(card, req); + err = mmc_send_status(card, &status); if (err) goto error_exit; - } - if (mrq->cmd->error && retries++ < MMC_READ_SINGLE_RETRIES) - continue; + if (!mmc_host_is_spi(host) && + !mmc_ready_for_data(status)) { + err = mmc_blk_fix_state(card, req); + if (err) + goto error_exit; + } - retries = 0; + if (!mrq->cmd->error && !mrq->data->error) + break; + } if (mrq->cmd->error || mrq->data->error ||
Signature · 4 lines
2.34.1 Hyperstone GmbH | Reichenaustr. 39a | 78467 Konstanz Managing Director: Dr. Jan Peter Berns. Commercial register of local courts: Freiburg HRB381782
So could anyone take a long at this so far?
From: Christian Löhle
Sent: Wednesday, January 5, 2022 5:43 PM
To: [email protected]; Christian Löhle; [email protected]; [email protected]
Cc: Avri Altman
Subject: [PATCH] mmc: block: fix read single on recovery logic
On reads with MMC_READ_MULTIPLE_BLOCK that fail,
the recovery handler will use MMC_READ_SINGLE_BLOCK for
each of the blocks, up to MMC_READ_SINGLE_RETRIES times each.
The logic for this is fixed to never report unsuccessful reads
as success to the block layer.
On command error with retries remaining, blk_update_request was called with whatever value error was set last to.
In case it was last set to BLK_STS_OK (default), the read will be reported as success, even though there was no data read from the device. This could happen on a CRC mismatch for the response,
a card rejecting the command (e.g. again due to a CRC mismatch). In case it was last set to BLK_STS_IOERR, the error is reported correctly, but no retries will be attempted.
The patch now will count both command and data errors as retries and send BLK_STS_IOERR if there are no retries remaining,
or BLK_STS_OK if the single read was successful in the meantime.
---
drivers/mmc/core/block.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
drivers/mmc/core/block.c +0 -0
@@ -1682,31 +1682,31 @@ static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req)
struct mmc_card *card = mq->card;
struct mmc_host *host = card->host;
blk_status_t error = BLK_STS_OK;
- int retries = 0;
do {
u32 status;
int err;
+ int retries = 0;
- mmc_blk_rw_rq_prep(mqrq, card, 1, mq);
+ while (retries++ < MMC_READ_SINGLE_RETRIES) {
+ mmc_blk_rw_rq_prep(mqrq, card, 1, mq);
- mmc_wait_for_req(host, mrq);
+ mmc_wait_for_req(host, mrq);
- err = mmc_send_status(card, &status);
- if (err)
- goto error_exit;
-
- if (!mmc_host_is_spi(host) &&
- !mmc_ready_for_data(status)) {
- err = mmc_blk_fix_state(card, req);
+ err = mmc_send_status(card, &status); if (err)
goto error_exit;
- }
- if (mrq->cmd->error && retries++ < MMC_READ_SINGLE_RETRIES) - continue;
+ if (!mmc_host_is_spi(host) &&
+ !mmc_ready_for_data(status)) {
+ err = mmc_blk_fix_state(card, req); + if (err)
+ goto error_exit;
+ }
- retries = 0;
+ if (!mrq->cmd->error && !mrq->data->error) + break;
+ }
if (mrq->cmd->error ||
mrq->data->error ||
Signature · 5 lines
2.34.1
=
Hyperstone GmbH | Reichenaustr. 39a | 78467 Konstanz
Managing Director: Dr. Jan Peter Berns.
Commercial register of local courts: Freiburg HRB381782+ Adrian
Quoted 3 lines · Christian Löhle
So could anyone take a long at this so far?
Thanks for pinging. Apologize for the delay, it's on top of my "to-review" list.
I have added Adrian too, who knows this code very well too.
Kind regards
Uffe
Quoted 89 lines
From: Christian Löhle
Sent: Wednesday, January 5, 2022 5:43 PM
To: [email protected]; Christian Löhle; [email protected]; [email protected]
Cc: Avri Altman
Subject: [PATCH] mmc: block: fix read single on recovery logicOn reads with
MMC_READ_MULTIPLE_BLOCKthat fail,
the recovery handler will useMMC_READ_SINGLE_BLOCKfor each of the blocks, up toMMC_READ_SINGLE_RETRIEStimes each. The logic for this is fixed to never report unsuccessful reads as success to the block layer.On command error with retries remaining,
blk_update_requestwas called with whatever value error was set last to.
In case it was last set toBLK_STS_OK(default), the read will be reported as success, even though there was no data read from the device. This could happen on a CRC mismatch for the response,
a card rejecting the command (e.g. again due to a CRC mismatch). In case it was last set toBLK_STS_IOERR, the error is reported correctly, but no retries will be attempted.The patch now will count both command and data errors as retries and send
BLK_STS_IOERRif there are no retries remaining,
orBLK_STS_OKif the single read was successful in the meantime.Signed-off-by Christian Loehle <[email protected]>--- drivers/mmc/core/block.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)drivers/mmc/core/block.c +14
-15@@ -1682,31 +1682,31 @@ static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req)struct mmc_card *card = mq->card;struct mmc_host *host = card->host;blk_status_t error =BLK_STS_OK ; -int retries =0 ; do { u32 status; int err; + int retries = 0; - mmc_blk_rw_rq_prep(mqrq, card, 1, mq); + while (retries++ < MMC_READ_SINGLE_RETRIES) { + mmc_blk_rw_rq_prep(mqrq, card, 1, mq); - mmc_wait_for_req(host, mrq); + mmc_wait_for_req(host, mrq); - err = mmc_send_status(card, &status); - if (err) - goto error_exit; - - if (!mmc_host_is_spi(host) && - !mmc_ready_for_data(status)) { - err = mmc_blk_fix_state(card, req); + err = mmc_send_status(card, &status); if (err) goto error_exit; - } - if (mrq->cmd->error && retries++ < MMC_READ_SINGLE_RETRIES) - continue; + if (!mmc_host_is_spi(host) && + !mmc_ready_for_data(status)) { + err = mmc_blk_fix_state(card, req); + if (err) + goto error_exit; + } - retries = 0; + if (!mrq->cmd->error && !mrq->data->error) + break; + } if (mrq->cmd->error || mrq->data->error || --2.34.1
=Hyperstone GmbH | Reichenaustr. 39a | 78467 Konstanz Managing Director: Dr. Jan Peter Berns. Commercial register of local courts: Freiburg HRB381782
Quoted 7 lines · Ulf Hansson
+ Adrian
Quoted 3 lines · Christian Löhle
So could anyone take a long at this so far?
Quoted 35 lines
Thanks for pinging. Apologize for the delay, it's on top of my "to-review" list.
I have added Adrian too, who knows this code very well too.
Kind regards
UffeQuoted 28 lines
From: Christian Löhle
Sent: Wednesday, January 5, 2022 5:43 PM
To: [email protected]; Christian Löhle; [email protected]; [email protected]
Cc: Avri Altman
Subject: [PATCH] mmc: block: fix read single on recovery logicOn reads with
MMC_READ_MULTIPLE_BLOCKthat fail,
the recovery handler will useMMC_READ_SINGLE_BLOCKfor each of the blocks, up toMMC_READ_SINGLE_RETRIEStimes each. The logic for this is fixed to never report unsuccessful reads as success to the block layer.On command error with retries remaining,
blk_update_requestwas called with whatever value error was set last to.
In case it was last set toBLK_STS_OK(default), the read will be reported as success, even though there was no data read from the device. This could happen on a CRC mismatch for the response,
a card rejecting the command (e.g. again due to a CRC mismatch). In case it was last set toBLK_STS_IOERR, the error is reported correctly, but no retries will be attempted.The patch now will count both command and data errors as retries and send
BLK_STS_IOERRif there are no retries remaining,
orBLK_STS_OKif the single read was successful in the meantime.Signed-off-by Christian Loehle <[email protected]>
Thanks for the patch.
Looks OK, although a couple of comments below, plus it needs a Fixes tag, and Cc for stable.
Quoted 14 lines
Quoted 14 lines
--- drivers/mmc/core/block.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)drivers/mmc/core/block.c +0
-1@@ -1682,31 +1682,31 @@ static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req)struct mmc_card *card = mq->card;struct mmc_host *host = card->host;blk_status_t error =BLK_STS_OK ; -int retries =0 ;
Quoted 7 lines
drivers/mmc/core/block.c static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req) · line 1691
Quoted 7 lines
drivers/mmc/core/block.c +2
-1do { u32 status; int err; + int retries = 0; - mmc_blk_rw_rq_prep(mqrq, card, 1, mq); + while (retries++ < MMC_READ_SINGLE_RETRIES) {
Because this is now checked at the top of the loop, wouldn't that result in one fewer retries than before? So, maybe:
while (retries++ <= MMC_READ_SINGLE_RETRIES) {Quoted 26 lines
Quoted 26 lines
drivers/mmc/core/block.c +9
-11+mmc_blk_rw_rq_prep (mqrq, card,1 , mq); -mmc_wait_for_req (host, mrq); +mmc_wait_for_req (host, mrq); - err =mmc_send_status (card, &status); -if (err) - goto error_exit; - -if (!mmc_host_is_spi (host) && - !mmc_ready_for_data (status)) { - err =mmc_blk_fix_state (card, req); + err =mmc_send_status (card, &status);if (err) goto error_exit; - } -if (mrq->cmd->error && retries++ <MMC_READ_SINGLE_RETRIES ) -continue ; +if (!mmc_host_is_spi (host) && + !mmc_ready_for_data (status)) { + err =mmc_blk_fix_state (card, req); +if (err) + goto error_exit; + }
Quoted 2 lines
drivers/mmc/core/block.c static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req) · line 1707
Quoted 2 lines
drivers/mmc/core/block.c +1
-1- retries =0 ; +if (!mrq->cmd->error && !mrq->data->error)
We weren't retrying for data errors before, and I don't think we want to because single block read can be very slow. i.e. just
if (!mrq->cmd->error)
Quoted 12 lines
Quoted 12 lines
drivers/mmc/core/block.c +2
-1+break ; + } if (mrq->cmd->error || mrq->data->error || --2.34.1
=Hyperstone GmbH | Reichenaustr. 39a | 78467 Konstanz Managing Director: Dr. Jan Peter Berns. Commercial register of local courts: Freiburg HRB381782
Thanks for the comments Adrian!
Quoted 6 lines
Quoted 1 line
+ while (retries++ <
MMC_READ_SINGLE_RETRIES) {Because this is now checked at the top of the loop, wouldn't that result in one fewer retries than before? So, maybe:
while (retries++ <= MMC_READ_SINGLE_RETRIES) {
Yes, you are correct. Will be fixed in v2.
Quoted 6 lines
Quoted 1 line
+ if (!mrq->cmd->error && !mrq->data->error)
We weren't retrying for data errors before, and I don't think we want to because single block read can be very slow. i.e. just
if (!mrq->cmd->error)
That was intentional by me, it was very unintuitive to my you would not retry for data errors. (Considering a data error is likely how you got into the whole recovery in the first place.) But yes I see your point, a very large request might block this for quite a while. Will change in v2, too.
From: Adrian Hunter <[email protected]>
Sent: Friday, February 4, 2022 12:26 PM
To: Ulf Hansson; Christian Löhle
Cc: [email protected]; [email protected]; Avri Altman
Subject: Re: [PATCH] mmc: block: fix read single on recovery logic
Quoted 7 lines · Ulf Hansson
+ Adrian
Quoted 3 lines · Christian Löhle
So could anyone take a long at this so far?
Quoted 35 lines
Thanks for pinging. Apologize for the delay, it's on top of my "to-review" list.
I have added Adrian too, who knows this code very well too.
Kind regards
UffeQuoted 28 lines
From: Christian Löhle
Sent: Wednesday, January 5, 2022 5:43 PM
To: [email protected]; Christian Löhle; [email protected]; [email protected]
Cc: Avri Altman
Subject: [PATCH] mmc: block: fix read single on recovery logicOn reads with
MMC_READ_MULTIPLE_BLOCKthat fail,
the recovery handler will useMMC_READ_SINGLE_BLOCKfor each of the blocks, up toMMC_READ_SINGLE_RETRIEStimes each. The logic for this is fixed to never report unsuccessful reads as success to the block layer.On command error with retries remaining,
blk_update_requestwas called with whatever value error was set last to.
In case it was last set toBLK_STS_OK(default), the read will be reported as success, even though there was no data read from the device. This could happen on a CRC mismatch for the response,
a card rejecting the command (e.g. again due to a CRC mismatch). In case it was last set toBLK_STS_IOERR, the error is reported correctly, but no retries will be attempted.The patch now will count both command and data errors as retries and send
BLK_STS_IOERRif there are no retries remaining,
orBLK_STS_OKif the single read was successful in the meantime.Signed-off-by Christian Loehle <[email protected]>
Thanks for the patch.
Looks OK, although a couple of comments below, plus it needs a Fixes tag, and Cc for stable.
Quoted 14 lines
Quoted 14 lines
---
drivers/mmc/core/block.c| 28 ++++++++++++++--------------1 file changed, 14 insertions(+), 14 deletions(-)drivers/mmc/core/block.c +0
-1@@ -1682,31 +1682,31 @@ static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req) struct mmc_card *card = mq->card; struct mmc_host *host = card->host; blk_status_t error = BLK_STS_OK; - int retries = 0;
Quoted 7 lines
drivers/mmc/core/block.c static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req) · line 1691
Quoted 7 lines
drivers/mmc/core/block.c +2
-1do { u32 status; int err; + int retries = 0; - mmc_blk_rw_rq_prep(mqrq, card, 1, mq); + while (retries++ < MMC_READ_SINGLE_RETRIES) {
Because this is now checked at the top of the loop, wouldn't that result in one fewer retries than before? So, maybe:
while (retries++ <= MMC_READ_SINGLE_RETRIES) {
Quoted 26 lines
Quoted 26 lines
drivers/mmc/core/block.c +9
-11+ mmc_blk_rw_rq_prep(mqrq, card, 1, mq); - mmc_wait_for_req(host, mrq); + mmc_wait_for_req(host, mrq); - err = mmc_send_status(card, &status); - if (err) - goto error_exit; - - if (!mmc_host_is_spi(host) && - !mmc_ready_for_data(status)) { - err = mmc_blk_fix_state(card, req); + err = mmc_send_status(card, &status); if (err) goto error_exit; - } - if (mrq->cmd->error && retries++ < MMC_READ_SINGLE_RETRIES) - continue; + if (!mmc_host_is_spi(host) && + !mmc_ready_for_data(status)) { + err = mmc_blk_fix_state(card, req); + if (err) + goto error_exit; + }
Quoted 2 lines
drivers/mmc/core/block.c static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req) · line 1707
Quoted 2 lines
drivers/mmc/core/block.c +1
-1- retries = 0; + if (!mrq->cmd->error && !mrq->data->error)
We weren't retrying for data errors before, and I don't think we want to because single block read can be very slow. i.e. just
if (!mrq->cmd->error)
Quoted 12 lines
Quoted 12 lines
drivers/mmc/core/block.c +2
-0+ break; + }if (
mrq->cmd->error||mrq->data->error||
--
2.34.1
=
Hyperstone GmbH | Reichenaustr. 39a | 78467 Konstanz Managing Director: Dr. Jan Peter Berns. Commercial register of local courts: Freiburg HRB381782
=
Hyperstone GmbH | Reichenaustr. 39a | 78467 Konstanz Managing Director: Dr. Jan Peter Berns. Commercial register of local courts: Freiburg HRB381782
PATCH v2 1/1 mmc: block: fix read single on recovery logic
On reads with MMC_READ_MULTIPLE_BLOCK that fail,
the recovery handler will use MMC_READ_SINGLE_BLOCK for each of the blocks, up to MMC_READ_SINGLE_RETRIES times each. The logic for this is fixed to never report unsuccessful reads as success to the block layer.
On command error with retries remaining, blk_update_request was called with whatever value error was set last to.
In case it was last set to BLK_STS_OK (default), the read will be reported as success, even though there was no data read from the device. This could happen on a CRC mismatch for the response,
a card rejecting the command (e.g. again due to a CRC mismatch). In case it was last set to BLK_STS_IOERR, the error is reported correctly, but no retries will be attempted.
---
v2:
- Do not allow data error retries
- Actually retry MMC_READ_SINGLE_RETRIES times instead of MMC_READ_SINGLE_RETRIES-1
drivers/mmc/core/block.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/mmc/core/block.c +14 -14
@@ -1682,31 +1682,31 @@ static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req)struct mmc_card *card = mq->card;struct mmc_host *host = card->host;blk_status_t error =BLK_STS_OK ; -int retries =0 ; do { u32 status; int err; + int retries = 0; - mmc_blk_rw_rq_prep(mqrq, card, 1, mq); + while (retries++ <= MMC_READ_SINGLE_RETRIES) { + mmc_blk_rw_rq_prep(mqrq, card, 1, mq); - mmc_wait_for_req(host, mrq); + mmc_wait_for_req(host, mrq); - err = mmc_send_status(card, &status); - if (err) - goto error_exit; - - if (!mmc_host_is_spi(host) && - !mmc_ready_for_data(status)) { - err = mmc_blk_fix_state(card, req); + err = mmc_send_status(card, &status); if (err) goto error_exit; - } - if (mrq->cmd->error && retries++ < MMC_READ_SINGLE_RETRIES) - continue; + if (!mmc_host_is_spi(host) && + !mmc_ready_for_data(status)) { + err = mmc_blk_fix_state(card, req); + if (err) + goto error_exit; + } - retries = 0; + if (!mrq->cmd->error) + break; + } if (mrq->cmd->error || mrq->data->error ||
Signature · 4 lines
2.34.1 Hyperstone GmbH | Reichenaustr. 39a | 78467 Konstanz Managing Director: Dr. Jan Peter Berns. Commercial register of local courts: Freiburg HRB381782
Quoted 15 lines · Christian Löhle
On reads with
MMC_READ_MULTIPLE_BLOCKthat fail,
the recovery handler will useMMC_READ_SINGLE_BLOCKfor each of the blocks, up toMMC_READ_SINGLE_RETRIEStimes each. The logic for this is fixed to never report unsuccessful reads as success to the block layer.On command error with retries remaining,
blk_update_requestwas called with whatever value error was set last to.
In case it was last set toBLK_STS_OK(default), the read will be reported as success, even though there was no data read from the device. This could happen on a CRC mismatch for the response,
a card rejecting the command (e.g. again due to a CRC mismatch). In case it was last set toBLK_STS_IOERR, the error is reported correctly, but no retries will be attempted.
Quoted 3 lines
Fixes 81196976ed946c ("mmc: block: Add blk-mq support")Signed-off-by Christian Loehle <[email protected]>
Quoted 61 lines
---
v2:
- Do not allow data error retries
- Actually retryMMC_READ_SINGLE_RETRIEStimes instead of MMC_READ_SINGLE_RETRIES-1drivers/mmc/core/block.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)drivers/mmc/core/block.c +14
-14@@ -1682,31 +1682,31 @@ static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req)struct mmc_card *card = mq->card;struct mmc_host *host = card->host;blk_status_t error =BLK_STS_OK ; -int retries =0 ; do { u32 status; int err; + int retries = 0; - mmc_blk_rw_rq_prep(mqrq, card, 1, mq); + while (retries++ <= MMC_READ_SINGLE_RETRIES) { + mmc_blk_rw_rq_prep(mqrq, card, 1, mq); - mmc_wait_for_req(host, mrq); + mmc_wait_for_req(host, mrq); - err = mmc_send_status(card, &status); - if (err) - goto error_exit; - - if (!mmc_host_is_spi(host) && - !mmc_ready_for_data(status)) { - err = mmc_blk_fix_state(card, req); + err = mmc_send_status(card, &status); if (err) goto error_exit; - } - if (mrq->cmd->error && retries++ < MMC_READ_SINGLE_RETRIES) - continue; + if (!mmc_host_is_spi(host) && + !mmc_ready_for_data(status)) { + err = mmc_blk_fix_state(card, req); + if (err) + goto error_exit; + } - retries = 0; + if (!mrq->cmd->error) + break; + } if (mrq->cmd->error || mrq->data->error ||
Quoted 17 lines · Adrian Hunter
Quoted 15 lines · Christian Löhle
On reads with
MMC_READ_MULTIPLE_BLOCKthat fail,
the recovery handler will useMMC_READ_SINGLE_BLOCKfor each of the blocks, up toMMC_READ_SINGLE_RETRIEStimes each. The logic for this is fixed to never report unsuccessful reads as success to the block layer.On command error with retries remaining,
blk_update_requestwas called with whatever value error was set last to.
In case it was last set toBLK_STS_OK(default), the read will be reported as success, even though there was no data read from the device. This could happen on a CRC mismatch for the response,
a card rejecting the command (e.g. again due to a CRC mismatch). In case it was last set toBLK_STS_IOERR, the error is reported correctly, but no retries will be attempted.
Quoted 5 lines
Quoted 3 lines
Fixes 81196976ed946c ("mmc: block: Add blk-mq support")Signed-off-by Christian Loehle <[email protected]>Reviewed-by Adrian Hunter <[email protected]>
Applied for fixes, thanks to both of you!
Kind regards
Uffe
Quoted 63 lines
Quoted 62 lines
---
v2:
- Do not allow data error retries
- Actually retryMMC_READ_SINGLE_RETRIEStimes instead of MMC_READ_SINGLE_RETRIES-1drivers/mmc/core/block.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)drivers/mmc/core/block.c +14
-14@@ -1682,31 +1682,31 @@ static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req)struct mmc_card *card = mq->card;struct mmc_host *host = card->host;blk_status_t error =BLK_STS_OK ; -int retries =0 ; do { u32 status; int err; + int retries = 0; - mmc_blk_rw_rq_prep(mqrq, card, 1, mq); + while (retries++ <= MMC_READ_SINGLE_RETRIES) { + mmc_blk_rw_rq_prep(mqrq, card, 1, mq); - mmc_wait_for_req(host, mrq); + mmc_wait_for_req(host, mrq); - err = mmc_send_status(card, &status); - if (err) - goto error_exit; - - if (!mmc_host_is_spi(host) && - !mmc_ready_for_data(status)) { - err = mmc_blk_fix_state(card, req); + err = mmc_send_status(card, &status); if (err) goto error_exit; - } - if (mrq->cmd->error && retries++ < MMC_READ_SINGLE_RETRIES) - continue; + if (!mmc_host_is_spi(host) && + !mmc_ready_for_data(status)) { + err = mmc_blk_fix_state(card, req); + if (err) + goto error_exit; + } - retries = 0; + if (!mrq->cmd->error) + break; + } if (mrq->cmd->error || mrq->data->error ||