From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Hunter Subject: [PATCH RFC 35/46] mmc: core: Do not prepare a new request twice Date: Thu, 9 Jun 2016 14:52:35 +0300 Message-ID: <1465473166-22532-36-git-send-email-adrian.hunter@intel.com> References: <1465473166-22532-1-git-send-email-adrian.hunter@intel.com> Return-path: Received: from mga01.intel.com ([192.55.52.88]:48207 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750917AbcFIL7G (ORCPT ); Thu, 9 Jun 2016 07:59:06 -0400 In-Reply-To: <1465473166-22532-1-git-send-email-adrian.hunter@intel.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Ulf Hansson Cc: linux-mmc , Alex Lemberg , Mateusz Nowak , Yuliy Izrailov , Jaehoon Chung , Dong Aisheng , Das Asutosh , Zhangfei Gao , Sujit Reddy Thumma , Dorfman Konstantin , David Griego , Sahitya Tummala , Harjani Ritesh 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. Signed-off-by: Adrian Hunter --- drivers/mmc/core/core.c | 12 +++++++++--- include/linux/mmc/host.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 2c50883f3845..df98d1e05932 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -657,8 +657,10 @@ struct mmc_async_req *mmc_start_req(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, !host->areq); + } if (host->areq) { err = mmc_wait_for_data_req_done(host, host->areq->mrq, areq); @@ -694,12 +696,16 @@ struct mmc_async_req *mmc_start_req(struct mmc_host *host, if (!err && areq) start_err = __mmc_start_data_req(host, areq->mrq); - 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 ((err || start_err) && areq) + if ((err || start_err) && areq) { + areq->pre_req_done = false; mmc_post_req(host, areq->mrq, -EINVAL); + } if (err) host->areq = NULL; diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 567c6c14c9f3..c9ce8b0ae321 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -174,6 +174,7 @@ struct mmc_async_req { * Returns 0 if success otherwise non zero. */ int (*err_check) (struct mmc_card *, struct mmc_async_req *); + bool pre_req_done; }; /** -- 1.9.1