From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Hunter Subject: [PATCH V5 06/25] mmc: queue: Introduce queue depth Date: Mon, 24 Oct 2016 11:37:21 +0300 Message-ID: <1477298260-5064-7-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]:33721 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935974AbcJXIm6 (ORCPT ); Mon, 24 Oct 2016 04:42:58 -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 mmc_queue member to record the size of the queue, which currently supports 2 requests on-the-go at a time. Signed-off-by: Adrian Hunter --- drivers/mmc/card/queue.c | 4 ++++ drivers/mmc/card/queue.h | 1 + 2 files changed, 5 insertions(+) diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index 11909728ab32..544b38f3fd9f 100644 --- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c @@ -296,6 +296,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, if (!mq->queue) return -ENOMEM; + mq->qdepth = 2; mq->mqrq_cur = &mq->mqrq[0]; mq->mqrq_prev = &mq->mqrq[1]; mq->queue->queuedata = mq; @@ -393,6 +394,9 @@ int mmc_packed_init(struct mmc_queue *mq, struct mmc_card *card) struct mmc_queue_req *mqrq_prev = &mq->mqrq[1]; int ret = 0; + /* Queue depth is only ever 2 with packed commands */ + if (mq->qdepth != 2) + return -EINVAL; mqrq_cur->packed = kzalloc(sizeof(struct mmc_packed), GFP_KERNEL); if (!mqrq_cur->packed) { diff --git a/drivers/mmc/card/queue.h b/drivers/mmc/card/queue.h index 73d70c5cee40..e99eecc1032b 100644 --- a/drivers/mmc/card/queue.h +++ b/drivers/mmc/card/queue.h @@ -63,6 +63,7 @@ struct mmc_queue { struct mmc_queue_req mqrq[2]; struct mmc_queue_req *mqrq_cur; struct mmc_queue_req *mqrq_prev; + int qdepth; }; extern int mmc_init_queue(struct mmc_queue *, struct mmc_card *, spinlock_t *, -- 1.9.1