From patchwork Tue Aug 16 10:44:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 9283369 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3F87760574 for ; Tue, 16 Aug 2016 10:50:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30B1928482 for ; Tue, 16 Aug 2016 10:50:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25787284A6; Tue, 16 Aug 2016 10:50:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C42A328482 for ; Tue, 16 Aug 2016 10:50:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753204AbcHPKua (ORCPT ); Tue, 16 Aug 2016 06:50:30 -0400 Received: from mga01.intel.com ([192.55.52.88]:14127 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753357AbcHPKuZ (ORCPT ); Tue, 16 Aug 2016 06:50:25 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 16 Aug 2016 03:50:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,529,1464678000"; d="scan'208";a="749359918" Received: from ahunter-desktop.fi.intel.com ([10.237.72.168]) by FMSMGA003.fm.intel.com with ESMTP; 16 Aug 2016 03:50:16 -0700 From: Adrian Hunter To: Ulf Hansson Cc: linux-mmc , Alex Lemberg , Mateusz Nowak , Yuliy Izrailov , Jaehoon Chung , Dong Aisheng , Das Asutosh , Zhangfei Gao , Dorfman Konstantin , David Griego , Sahitya Tummala , Harjani Ritesh , Venu Byravarasu Subject: [PATCH V4 18/30] mmc: core: Do not prepare a new request twice Date: Tue, 16 Aug 2016 13:44:28 +0300 Message-Id: <1471344280-16663-19-git-send-email-adrian.hunter@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471344280-16663-1-git-send-email-adrian.hunter@intel.com> References: <1471344280-16663-1-git-send-email-adrian.hunter@intel.com> Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 e9813f2eaca0..e3a0185ebb67 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 3386e10480f7..9fb00b7c54a1 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; }; /**