mmc_start_req() assumes it is never called with the new request already prepared. That is true if the queue consists of only 2 requests, but is not true for a longer queue. e.g. mmc_start_req() has a current and previous request but still exits to queue a new request if the queue size is greater than 2. In that case, when mmc_start_req() is called again, the current request will have been prepared already. Fix by flagging if the request has been prepared. That also means ensuring that struct mmc_async_req is always initialized to zero, which wasn't the case in mmc_test. Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx> Reviewed-by: Harjani Ritesh <riteshh@xxxxxxxxxxxxxx> --- drivers/mmc/core/core.c | 12 +++++++++--- drivers/mmc/core/mmc_test.c | 8 ++++---- include/linux/mmc/host.h | 1 + 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 926e0fde07d7..d97b8f2cf3cb 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -686,8 +686,10 @@ struct mmc_async_req *mmc_start_areq(struct mmc_host *host, struct mmc_async_req *data = host->areq; /* Prepare a new request */ - if (areq) + if (areq && !areq->pre_req_done) { + areq->pre_req_done = true; mmc_pre_req(host, areq->mrq); + } /* Finalize previous request */ status = mmc_finalize_areq(host); @@ -704,12 +706,16 @@ struct mmc_async_req *mmc_start_areq(struct mmc_host *host, start_err = __mmc_start_data_req(host, areq->mrq); /* Postprocess the old request at this point */ - if (host->areq) + if (host->areq) { + host->areq->pre_req_done = false; mmc_post_req(host, host->areq->mrq, 0); + } /* Cancel a prepared request if it was not started. */ - if ((status != MMC_BLK_SUCCESS || start_err) && areq) + if ((status != MMC_BLK_SUCCESS || start_err) && areq) { + areq->pre_req_done = false; mmc_post_req(host, areq->mrq, -EINVAL); + } if (status != MMC_BLK_SUCCESS) host->areq = NULL; diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c index f99ac3123fd2..45e623cc1624 100644 --- a/drivers/mmc/core/mmc_test.c +++ b/drivers/mmc/core/mmc_test.c @@ -831,7 +831,10 @@ static int mmc_test_nonblock_transfer(struct mmc_test_card *test, struct mmc_command stop2; struct mmc_data data2; - struct mmc_test_async_req test_areq[2]; + struct mmc_test_async_req test_areq[2] = { + { .test = test }, + { .test = test }, + }; struct mmc_async_req *done_areq; struct mmc_async_req *cur_areq = &test_areq[0].areq; struct mmc_async_req *other_areq = &test_areq[1].areq; @@ -839,9 +842,6 @@ static int mmc_test_nonblock_transfer(struct mmc_test_card *test, int i; int ret = RESULT_OK; - test_areq[0].test = test; - test_areq[1].test = test; - mmc_test_nonblock_reset(&mrq1, &cmd1, &stop1, &data1); mmc_test_nonblock_reset(&mrq2, &cmd2, &stop2, &data2); diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 83f1c4a9f03b..f339cd64f0f6 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -168,6 +168,7 @@ struct mmc_async_req { * Returns 0 if success otherwise non zero. */ enum mmc_blk_status (*err_check)(struct mmc_card *, struct mmc_async_req *); + bool pre_req_done; }; /** -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html