From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Hunter Subject: [PATCH V5 21/25] mmc: queue: Add a function to control wake-up on new requests Date: Mon, 24 Oct 2016 11:37:36 +0300 Message-ID: <1477298260-5064-22-git-send-email-adrian.hunter@intel.com> References: <1477298260-5064-1-git-send-email-adrian.hunter@intel.com> Return-path: Received: from mga09.intel.com ([134.134.136.24]:24668 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935187AbcJXIoA (ORCPT ); Mon, 24 Oct 2016 04:44:00 -0400 In-Reply-To: <1477298260-5064-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 , Dorfman Konstantin , David Griego , Sahitya Tummala , Harjani Ritesh , Venu Byravarasu 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 c00c44542e14..db58689e18f6 100644 --- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c @@ -97,6 +97,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. @@ -147,6 +148,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) { @@ -158,6 +161,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 450b91f1d597..6045e701110d 100644 --- a/drivers/mmc/card/queue.h +++ b/drivers/mmc/card/queue.h @@ -50,6 +50,7 @@ struct mmc_queue { unsigned int flags; #define MMC_QUEUE_SUSPENDED (1 << 0) bool asleep; + bool is_new_req; void *data; struct request_queue *queue; struct mmc_queue_req *mqrq; @@ -77,5 +78,6 @@ extern unsigned int mmc_queue_map_sg(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 -- 1.9.1