Skip to content

Commit 29535f7

Browse files
Ding Wangstorulf
authored andcommitted
mmc: card: Fixup request missing in mmc_blk_issue_rw_rq
The current handler of MMC_BLK_CMD_ERR in mmc_blk_issue_rw_rq function may cause new coming request permanent missing when the ongoing request (previoulsy started) complete end. The problem scenario is as follows: (1) Request A is ongoing; (2) Request B arrived, and finally mmc_blk_issue_rw_rq() is called; (3) Request A encounters the MMC_BLK_CMD_ERR error; (4) In the error handling of MMC_BLK_CMD_ERR, suppose mmc_blk_cmd_err() end request A completed and return zero. Continue the error handling, suppose mmc_blk_reset() reset device success; (5) Continue the execution, while loop completed because variable ret is zero now; (6) Finally, mmc_blk_issue_rw_rq() return without processing request B. The process related to the missing request may wait that IO request complete forever, possibly crashing the application or hanging the system. Fix this issue by starting new request when reset success. Signed-off-by: Ding Wang <justin.wang@spreadtrum.com> Fixes: 6771632 ("mmc: block: add eMMC hardware reset support") Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 62a7f36 commit 29535f7

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/mmc/card/block.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1920,9 +1920,11 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc)
19201920
break;
19211921
case MMC_BLK_CMD_ERR:
19221922
ret = mmc_blk_cmd_err(md, card, brq, req, ret);
1923-
if (!mmc_blk_reset(md, card->host, type))
1924-
break;
1925-
goto cmd_abort;
1923+
if (mmc_blk_reset(md, card->host, type))
1924+
goto cmd_abort;
1925+
if (!ret)
1926+
goto start_new_req;
1927+
break;
19261928
case MMC_BLK_RETRY:
19271929
retune_retry_done = brq->retune_retry_done;
19281930
if (retry++ < 5)

0 commit comments

Comments
 (0)