mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Asutosh Das <quic_asutoshd@quicinc.com>
To: <quic_cang@quicinc.com>, <martin.petersen@oracle.com>,
	<linux-scsi@vger.kernel.org>
Cc: <quic_nguyenb@quicinc.com>, <quic_xiaosenh@quicinc.com>,
	<stanley.chu@mediatek.com>, <eddie.huang@mediatek.com>,
	<daejun7.park@samsung.com>, <bvanassche@acm.org>,
	<avri.altman@wdc.com>, <mani@kernel.org>, <beanhuo@micron.com>,
	Asutosh Das <quic_asutoshd@quicinc.com>,
	<linux-arm-msm@vger.kernel.org>,
	Alim Akhtar <alim.akhtar@samsung.com>,
	"James E.J. Bottomley" <jejb@linux.ibm.com>,
	Jinyoung Choi <j-young.choi@samsung.com>,
	Arthur Simchaev <Arthur.Simchaev@wdc.com>,
	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
	open list <linux-kernel@vger.kernel.org>
Subject: [PATCH v8 12/16] ufs: core: mcq: Find hardware queue to queue request
Date: Wed, 30 Nov 2022 12:27:53 -0800	[thread overview]
Message-ID: <a541f653e898145758541c69a55da4a5fc6a40cc.1669839847.git.quic_asutoshd@quicinc.com> (raw)
In-Reply-To: <cover.1669839847.git.quic_asutoshd@quicinc.com>

Adds support to find the hardware queue on which the request
would be queued.
Since the very first queue is to serve device commands, an offset
of 1 is added to the index of the hardware queue.

Co-developed-by: Can Guo <quic_cang@quicinc.com>
Signed-off-by: Can Guo <quic_cang@quicinc.com>
Signed-off-by: Asutosh Das <quic_asutoshd@quicinc.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
---
 drivers/ufs/core/ufs-mcq.c     | 19 +++++++++++++++++++
 drivers/ufs/core/ufshcd-priv.h |  3 +++
 drivers/ufs/core/ufshcd.c      |  3 +++
 3 files changed, 25 insertions(+)

diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
index 0c40fe2..151caf3 100644
--- a/drivers/ufs/core/ufs-mcq.c
+++ b/drivers/ufs/core/ufs-mcq.c
@@ -93,6 +93,25 @@ void ufshcd_mcq_config_mac(struct ufs_hba *hba, u32 max_active_cmds)
 }
 
 /**
+ * ufshcd_mcq_req_to_hwq - find the hardware queue on which the
+ * request would be issued.
+ * @hba - per adapter instance
+ * @req - pointer to the request to be issued
+ *
+ * Returns the hardware queue instance on which the request would
+ * be queued.
+ */
+struct ufs_hw_queue *ufshcd_mcq_req_to_hwq(struct ufs_hba *hba,
+					 struct request *req)
+{
+	u32 utag = blk_mq_unique_tag(req);
+	u32 hwq = blk_mq_unique_tag_to_hwq(utag);
+
+	/* uhq[0] is used to serve device commands */
+	return &hba->uhq[hwq + UFSHCD_MCQ_IO_QUEUE_OFFSET];
+}
+
+/**
  * ufshcd_mcq_decide_queue_depth - decide the queue depth
  * @hba - per adapter instance
  *
diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h
index d295be4..a07f85e 100644
--- a/drivers/ufs/core/ufshcd-priv.h
+++ b/drivers/ufs/core/ufshcd-priv.h
@@ -67,7 +67,10 @@ int ufshcd_mcq_memory_alloc(struct ufs_hba *hba);
 void ufshcd_mcq_make_queues_operational(struct ufs_hba *hba);
 void ufshcd_mcq_config_mac(struct ufs_hba *hba, u32 max_active_cmds);
 void ufshcd_mcq_select_mcq_mode(struct ufs_hba *hba);
+struct ufs_hw_queue *ufshcd_mcq_req_to_hwq(struct ufs_hba *hba,
+					   struct request *req);
 
+#define UFSHCD_MCQ_IO_QUEUE_OFFSET	1
 #define SD_ASCII_STD true
 #define SD_RAW false
 int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 1639a97..b0b0f2c 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -2921,6 +2921,9 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
 		goto out;
 	}
 
+	if (is_mcq_enabled(hba))
+		hwq = ufshcd_mcq_req_to_hwq(hba, scsi_cmd_to_rq(cmd));
+
 	ufshcd_send_command(hba, tag, hwq);
 
 out:
-- 
2.7.4


  parent reply	other threads:[~2022-11-30 20:31 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1669839847.git.quic_asutoshd@quicinc.com>
2022-11-30 20:27 ` [PATCH v8 01/16] ufs: core: Optimize duplicate code to read extended feature Asutosh Das
2022-11-30 20:27 ` [PATCH v8 02/16] ufs: core: Probe for ext_iid support Asutosh Das
2022-11-30 20:27 ` [PATCH v8 03/16] ufs: core: Introduce Multi-circular queue capability Asutosh Das
2022-11-30 20:27 ` [PATCH v8 04/16] ufs: core: Defer adding host to scsi if mcq is supported Asutosh Das
2022-11-30 20:27 ` [PATCH v8 05/16] ufs: core: mcq: Add support to allocate multiple queues Asutosh Das
2022-11-30 20:27 ` [PATCH v8 06/16] ufs: core: mcq: Configure resource regions Asutosh Das
2022-11-30 20:27 ` [PATCH v8 07/16] ufs: core: mcq: Calculate queue depth Asutosh Das
2022-11-30 20:27 ` [PATCH v8 08/16] ufs: core: mcq: Allocate memory for mcq mode Asutosh Das
2022-11-30 20:27 ` [PATCH v8 09/16] ufs: core: mcq: Configure operation and runtime interface Asutosh Das
2022-11-30 20:27 ` [PATCH v8 10/16] ufs: core: mcq: Use shared tags for MCQ mode Asutosh Das
2022-11-30 20:27 ` [PATCH v8 11/16] ufs: core: Prepare ufshcd_send_command for mcq Asutosh Das
2022-11-30 20:27 ` Asutosh Das [this message]
2022-11-30 20:27 ` [PATCH v8 13/16] ufs: core: Prepare for completion in mcq Asutosh Das
2022-11-30 20:27 ` [PATCH v8 14/16] ufs: mcq: Add completion support of a cqe Asutosh Das
2022-11-30 20:27 ` [PATCH v8 15/16] ufs: core: mcq: Add completion support in poll Asutosh Das
2022-11-30 20:27 ` [PATCH v8 16/16] ufs: core: mcq: Enable Multi Circular Queue Asutosh Das

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=a541f653e898145758541c69a55da4a5fc6a40cc.1669839847.git.quic_asutoshd@quicinc.com \
    --to=quic_asutoshd@quicinc.com \
    --cc=Arthur.Simchaev@wdc.com \
    --cc=alim.akhtar@samsung.com \
    --cc=avri.altman@wdc.com \
    --cc=beanhuo@micron.com \
    --cc=bvanassche@acm.org \
    --cc=daejun7.park@samsung.com \
    --cc=eddie.huang@mediatek.com \
    --cc=j-young.choi@samsung.com \
    --cc=jejb@linux.ibm.com \
    --cc=krzysztof.kozlowski@linaro.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=mani@kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=quic_cang@quicinc.com \
    --cc=quic_nguyenb@quicinc.com \
    --cc=quic_xiaosenh@quicinc.com \
    --cc=stanley.chu@mediatek.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

all inboxes | Powered by JetHome®