public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@intel.com>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-mmc <linux-mmc@vger.kernel.org>,
	Alex Lemberg <alex.lemberg@sandisk.com>,
	Mateusz Nowak <mateusz.nowak@intel.com>,
	Yuliy Izrailov <Yuliy.Izrailov@sandisk.com>,
	Jaehoon Chung <jh80.chung@samsung.com>,
	Dong Aisheng <dongas86@gmail.com>,
	Das Asutosh <asutoshd@codeaurora.org>,
	Zhangfei Gao <zhangfei.gao@gmail.com>,
	Dorfman Konstantin <kdorfman@codeaurora.org>,
	David Griego <david.griego@linaro.org>,
	Sahitya Tummala <stummala@codeaurora.org>,
	Harjani Ritesh <riteshh@codeaurora.org>,
	Venu Byravarasu <vbyravarasu@nvidia.com>,
	Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH V8 06/20] mmc: queue: Factor out mmc_queue_alloc_sgs()
Date: Tue, 29 Nov 2016 12:09:13 +0200	[thread overview]
Message-ID: <1480414167-15577-7-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1480414167-15577-1-git-send-email-adrian.hunter@intel.com>

In preparation for supporting a queue of requests, factor out
mmc_queue_alloc_sgs().

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Harjani Ritesh <riteshh@codeaurora.org>
---
 drivers/mmc/card/queue.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 3fd27c684292..0a8480f5ea4b 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -235,6 +235,21 @@ static int mmc_queue_alloc_bounce_sgs(struct mmc_queue *mq,
 	return ret;
 }
 
+static int mmc_queue_alloc_sgs(struct mmc_queue *mq, int max_segs)
+{
+	struct mmc_queue_req *mqrq_cur = mq->mqrq_cur;
+	struct mmc_queue_req *mqrq_prev = mq->mqrq_prev;
+	int ret;
+
+	mqrq_cur->sg = mmc_alloc_sg(max_segs, &ret);
+	if (ret)
+		return ret;
+
+	mqrq_prev->sg = mmc_alloc_sg(max_segs, &ret);
+
+	return ret;
+}
+
 /**
  * mmc_init_queue - initialise a queue structure.
  * @mq: mmc queue
@@ -307,12 +322,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
 		blk_queue_max_segments(mq->queue, host->max_segs);
 		blk_queue_max_segment_size(mq->queue, host->max_seg_size);
 
-		mqrq_cur->sg = mmc_alloc_sg(host->max_segs, &ret);
-		if (ret)
-			goto cleanup_queue;
-
-
-		mqrq_prev->sg = mmc_alloc_sg(host->max_segs, &ret);
+		ret = mmc_queue_alloc_sgs(mq, host->max_segs);
 		if (ret)
 			goto cleanup_queue;
 	}
-- 
1.9.1


  parent reply	other threads:[~2016-11-29 10:14 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-29 10:09 [PATCH V8 00/20] mmc: mmc: Add Software Command Queuing Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 01/20] mmc: block: Restore line inadvertently removed with packed commands Adrian Hunter
2016-11-30 21:25   ` Linus Walleij
2016-11-29 10:09 ` [PATCH V8 02/20] mmc: block: Fix 4K native sector check Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 03/20] mmc: queue: Fix queue thread wake-up Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 04/20] mmc: queue: Factor out mmc_queue_alloc_bounce_bufs() Adrian Hunter
2016-11-30  8:16   ` Ulf Hansson
2016-11-29 10:09 ` [PATCH V8 05/20] mmc: queue: Factor out mmc_queue_alloc_bounce_sgs() Adrian Hunter
2016-11-30  8:17   ` Ulf Hansson
2016-11-30  8:46     ` Adrian Hunter
2016-11-29 10:09 ` Adrian Hunter [this message]
2016-11-29 10:09 ` [PATCH V8 07/20] mmc: queue: Factor out mmc_queue_reqs_free_bufs() Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 08/20] mmc: queue: Introduce queue depth and use it to allocate and free Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 09/20] mmc: mmc: Add Command Queue definitions Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 10/20] mmc: mmc: Add functions to enable / disable the Command Queue Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 11/20] mmc: mmc_test: Disable Command Queue while mmc_test is used Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 12/20] mmc: block: Disable Command Queue while RPMB " Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 13/20] mmc: core: Do not prepare a new request twice Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 14/20] mmc: core: Export mmc_retune_hold() and mmc_retune_release() Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 15/20] mmc: block: Use local var for mqrq_cur Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 16/20] mmc: block: Introduce queue semantics Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 17/20] mmc: queue: Share mmc request array between partitions Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 18/20] mmc: queue: Add a function to control wake-up on new requests Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 19/20] mmc: block: Add Software Command Queuing Adrian Hunter
2016-11-29 10:09 ` [PATCH V8 20/20] mmc: mmc: Enable " Adrian Hunter
2016-11-29 11:41 ` [PATCH V8 00/20] mmc: mmc: Add " Ulf Hansson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1480414167-15577-7-git-send-email-adrian.hunter@intel.com \
    --to=adrian.hunter@intel.com \
    --cc=Yuliy.Izrailov@sandisk.com \
    --cc=alex.lemberg@sandisk.com \
    --cc=asutoshd@codeaurora.org \
    --cc=david.griego@linaro.org \
    --cc=dongas86@gmail.com \
    --cc=jh80.chung@samsung.com \
    --cc=kdorfman@codeaurora.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=mateusz.nowak@intel.com \
    --cc=riteshh@codeaurora.org \
    --cc=stummala@codeaurora.org \
    --cc=ulf.hansson@linaro.org \
    --cc=vbyravarasu@nvidia.com \
    --cc=zhangfei.gao@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox