From patchwork Wed Jun 29 13:25:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 9205203 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 04FBF6075F for ; Wed, 29 Jun 2016 13:32:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAFDF28655 for ; Wed, 29 Jun 2016 13:32:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DFD0228666; Wed, 29 Jun 2016 13:32:44 +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 7A3CE2866A for ; Wed, 29 Jun 2016 13:32:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752579AbcF2Ncm (ORCPT ); Wed, 29 Jun 2016 09:32:42 -0400 Received: from mga14.intel.com ([192.55.52.115]:36983 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752501AbcF2Nck (ORCPT ); Wed, 29 Jun 2016 09:32:40 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 29 Jun 2016 06:32:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,546,1459839600"; d="scan'208";a="726827227" Received: from ahunter-desktop.fi.intel.com ([10.237.72.168]) by FMSMGA003.fm.intel.com with ESMTP; 29 Jun 2016 06:32:36 -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 V2 50/54] mmc: queue: Add a function to control wake-up on new requests Date: Wed, 29 Jun 2016 16:25:03 +0300 Message-Id: <1467206707-30185-51-git-send-email-adrian.hunter@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467206707-30185-1-git-send-email-adrian.hunter@intel.com> References: <1467206707-30185-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 Add a function to control wake-up on new requests. This will enable Software Command Queuing to choose whether or not to queue new requests immediately or wait for the current task to complete. Signed-off-by: Adrian Hunter --- drivers/mmc/card/queue.c | 16 ++++++++++++++++ drivers/mmc/card/queue.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index 4e134884a183..0781578fc8b6 100644 --- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c @@ -94,6 +94,7 @@ static int mmc_queue_thread(void *d) cntx->is_waiting_last_req = false; cntx->is_new_req = false; if (!req) { + mq->is_new_req = false; /* * Dispatch queue is empty so set flags for * mmc_request_fn() to wake us up. @@ -144,6 +145,8 @@ static void mmc_request_fn(struct request_queue *q) return; } + mq->is_new_req = true; + cntx = &mq->card->host->context_info; if (cntx->is_waiting_last_req) { @@ -155,6 +158,19 @@ static void mmc_request_fn(struct request_queue *q) wake_up_process(mq->thread); } +void mmc_queue_set_wake(struct mmc_queue *mq, bool wake_me) +{ + struct mmc_context_info *cntx = &mq->card->host->context_info; + struct request_queue *q = mq->queue; + + if (cntx->is_waiting_last_req != wake_me) { + spin_lock_irq(q->queue_lock); + cntx->is_waiting_last_req = wake_me; + cntx->is_new_req = wake_me && mq->is_new_req; + spin_unlock_irq(q->queue_lock); + } +} + static struct scatterlist *mmc_alloc_sg(int sg_len, int *err) { struct scatterlist *sg; diff --git a/drivers/mmc/card/queue.h b/drivers/mmc/card/queue.h index 1afd5dafd46d..a6d5b0f94662 100644 --- a/drivers/mmc/card/queue.h +++ b/drivers/mmc/card/queue.h @@ -52,6 +52,7 @@ struct mmc_queue { unsigned int flags; #define MMC_QUEUE_SUSPENDED (1 << 0) bool asleep; + bool is_new_req; int (*issue_fn)(struct mmc_queue *, struct request *); void *data; @@ -81,5 +82,6 @@ extern int mmc_access_rpmb(struct mmc_queue *); extern struct mmc_queue_req *mmc_queue_req_find(struct mmc_queue *, struct request *); extern void mmc_queue_req_free(struct mmc_queue *, struct mmc_queue_req *); +extern void mmc_queue_set_wake(struct mmc_queue *, bool); #endif