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>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH v5 13/16] ufs: core: Prepare for completion in mcq
Date: Tue, 22 Nov 2022 20:10:26 -0800 [thread overview]
Message-ID: <d076c0b5bfa9c34eed9038d36677853ea042bb78.1669176158.git.quic_asutoshd@quicinc.com> (raw)
In-Reply-To: <cover.1669176158.git.quic_asutoshd@quicinc.com>
Modify completion path APIs and add completion queue
entry.
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>
---
drivers/ufs/core/ufshcd-priv.h | 2 ++
drivers/ufs/core/ufshcd.c | 80 ++++++++++++++++++++++++++----------------
2 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h
index 14df7ce..6453449 100644
--- a/drivers/ufs/core/ufshcd-priv.h
+++ b/drivers/ufs/core/ufshcd-priv.h
@@ -61,6 +61,8 @@ int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode,
int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,
enum flag_idn idn, u8 index, bool *flag_res);
void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit);
+void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag,
+ struct cq_entry *cqe);
int ufshcd_mcq_init(struct ufs_hba *hba);
int ufshcd_mcq_decide_queue_depth(struct ufs_hba *hba);
int ufshcd_mcq_memory_alloc(struct ufs_hba *hba);
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 52c0386..f16d02c 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -784,12 +784,17 @@ static inline bool ufshcd_is_device_present(struct ufs_hba *hba)
/**
* ufshcd_get_tr_ocs - Get the UTRD Overall Command Status
* @lrbp: pointer to local command reference block
+ * @cqe: pointer to the completion queue entry
*
* This function is used to get the OCS field from UTRD
* Returns the OCS field in the UTRD
*/
-static enum utp_ocs ufshcd_get_tr_ocs(struct ufshcd_lrb *lrbp)
+static enum utp_ocs ufshcd_get_tr_ocs(struct ufshcd_lrb *lrbp,
+ struct cq_entry *cqe)
{
+ if (cqe)
+ return le32_to_cpu(cqe->status) & MASK_OCS;
+
return le32_to_cpu(lrbp->utr_descriptor_ptr->header.dword_2) & MASK_OCS;
}
@@ -3048,7 +3053,7 @@ static int ufshcd_wait_for_dev_cmd(struct ufs_hba *hba,
* not trigger any race conditions.
*/
hba->dev_cmd.complete = NULL;
- err = ufshcd_get_tr_ocs(lrbp);
+ err = ufshcd_get_tr_ocs(lrbp, hba->dev_cmd.cqe);
if (!err)
err = ufshcd_dev_cmd_completion(hba, lrbp);
} else {
@@ -5214,18 +5219,20 @@ ufshcd_scsi_cmd_status(struct ufshcd_lrb *lrbp, int scsi_status)
* ufshcd_transfer_rsp_status - Get overall status of the response
* @hba: per adapter instance
* @lrbp: pointer to local reference block of completed command
+ * @cqe: pointer to the completion queue entry
*
* Returns result of the command to notify SCSI midlayer
*/
static inline int
-ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
+ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp,
+ struct cq_entry *cqe)
{
int result = 0;
int scsi_status;
enum utp_ocs ocs;
/* overall command status of utrd */
- ocs = ufshcd_get_tr_ocs(lrbp);
+ ocs = ufshcd_get_tr_ocs(lrbp, cqe);
if (hba->quirks & UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR) {
if (be32_to_cpu(lrbp->ucd_rsp_ptr->header.dword_1) &
@@ -5390,42 +5397,53 @@ static void ufshcd_release_scsi_cmd(struct ufs_hba *hba,
}
/**
- * __ufshcd_transfer_req_compl - handle SCSI and query command completion
+ * ufshcd_compl_one_cqe - handle a completion queue entry
* @hba: per adapter instance
- * @completed_reqs: bitmask that indicates which requests to complete
+ * @task_tag: the task tag of the request to be completed
+ * @cqe: pointer to the completion queue entry
*/
-static void __ufshcd_transfer_req_compl(struct ufs_hba *hba,
- unsigned long completed_reqs)
+void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag,
+ struct cq_entry *cqe)
{
struct ufshcd_lrb *lrbp;
struct scsi_cmnd *cmd;
- int index;
-
- for_each_set_bit(index, &completed_reqs, hba->nutrs) {
- lrbp = &hba->lrb[index];
- lrbp->compl_time_stamp = ktime_get();
- lrbp->compl_time_stamp_local_clock = local_clock();
- cmd = lrbp->cmd;
- if (cmd) {
- if (unlikely(ufshcd_should_inform_monitor(hba, lrbp)))
- ufshcd_update_monitor(hba, lrbp);
- ufshcd_add_command_trace(hba, index, UFS_CMD_COMP);
- cmd->result = ufshcd_transfer_rsp_status(hba, lrbp);
- ufshcd_release_scsi_cmd(hba, lrbp);
- /* Do not touch lrbp after scsi done */
- scsi_done(cmd);
- } else if (lrbp->command_type == UTP_CMD_TYPE_DEV_MANAGE ||
- lrbp->command_type == UTP_CMD_TYPE_UFS_STORAGE) {
- if (hba->dev_cmd.complete) {
- ufshcd_add_command_trace(hba, index,
- UFS_DEV_COMP);
- complete(hba->dev_cmd.complete);
- ufshcd_clk_scaling_update_busy(hba);
- }
+
+ lrbp = &hba->lrb[task_tag];
+ lrbp->compl_time_stamp = ktime_get();
+ cmd = lrbp->cmd;
+ if (cmd) {
+ if (unlikely(ufshcd_should_inform_monitor(hba, lrbp)))
+ ufshcd_update_monitor(hba, lrbp);
+ ufshcd_add_command_trace(hba, task_tag, UFS_CMD_COMP);
+ cmd->result = ufshcd_transfer_rsp_status(hba, lrbp, cqe);
+ ufshcd_release_scsi_cmd(hba, lrbp);
+ /* Do not touch lrbp after scsi done */
+ scsi_done(cmd);
+ } else if (lrbp->command_type == UTP_CMD_TYPE_DEV_MANAGE ||
+ lrbp->command_type == UTP_CMD_TYPE_UFS_STORAGE) {
+ if (hba->dev_cmd.complete) {
+ hba->dev_cmd.cqe = cqe;
+ ufshcd_add_command_trace(hba, task_tag, UFS_DEV_COMP);
+ complete(hba->dev_cmd.complete);
+ ufshcd_clk_scaling_update_busy(hba);
}
}
}
+/**
+ * __ufshcd_transfer_req_compl - handle SCSI and query command completion
+ * @hba: per adapter instance
+ * @completed_reqs: bitmask that indicates which requests to complete
+ */
+static void __ufshcd_transfer_req_compl(struct ufs_hba *hba,
+ unsigned long completed_reqs)
+{
+ int tag;
+
+ for_each_set_bit(tag, &completed_reqs, hba->nutrs)
+ ufshcd_compl_one_cqe(hba, tag, NULL);
+}
+
/*
* Returns > 0 if one or more commands have been completed or 0 if no
* requests have been completed.
--
2.7.4
next prev parent reply other threads:[~2022-11-23 4:17 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1669176158.git.quic_asutoshd@quicinc.com>
2022-11-23 4:10 ` [PATCH v5 01/16] ufs: core: Optimize duplicate code to read extended feature Asutosh Das
2022-11-28 12:20 ` Manivannan Sadhasivam
2022-11-23 4:10 ` [PATCH v5 02/16] ufs: core: Probe for ext_iid support Asutosh Das
2022-11-28 12:53 ` Manivannan Sadhasivam
2022-11-23 4:10 ` [PATCH v5 03/16] ufs: core: Introduce Multi-circular queue capability Asutosh Das
2022-11-26 0:20 ` Bart Van Assche
2022-11-28 14:29 ` Manivannan Sadhasivam
2022-11-23 4:10 ` [PATCH v5 04/16] ufs: core: Defer adding host to scsi if mcq is supported Asutosh Das
2022-11-26 0:28 ` Bart Van Assche
2022-11-28 14:42 ` Manivannan Sadhasivam
2022-11-28 17:50 ` Asutosh Das
2022-11-23 4:10 ` [PATCH v5 05/16] ufs: core: mcq: Add Multi Circular Queue support Asutosh Das
2022-11-26 0:52 ` Bart Van Assche
2022-11-28 14:53 ` Manivannan Sadhasivam
2022-11-23 4:10 ` [PATCH v5 06/16] ufs: core: mcq: Configure resource regions Asutosh Das
2022-11-26 1:10 ` Bart Van Assche
2022-11-23 4:10 ` [PATCH v5 07/16] ufs: core: mcq: Calculate queue depth Asutosh Das
2022-11-26 1:14 ` Bart Van Assche
2022-11-28 15:15 ` Manivannan Sadhasivam
2022-11-28 19:54 ` Asutosh Das
2022-11-28 20:33 ` Bart Van Assche
2022-11-23 4:10 ` [PATCH v5 08/16] ufs: core: mcq: Allocate memory for mcq mode Asutosh Das
2022-11-26 1:20 ` Bart Van Assche
2022-11-28 15:48 ` Manivannan Sadhasivam
2022-11-23 4:10 ` [PATCH v5 09/16] ufs: core: mcq: Configure operation and runtime interface Asutosh Das
2022-11-26 1:28 ` Bart Van Assche
2022-11-28 22:08 ` Asutosh Das
2022-11-28 22:50 ` Bart Van Assche
2022-11-28 15:55 ` Manivannan Sadhasivam
2022-11-23 4:10 ` [PATCH v5 10/16] ufs: core: mcq: Use shared tags for MCQ mode Asutosh Das
2022-11-28 15:59 ` Manivannan Sadhasivam
2022-11-23 4:10 ` [PATCH v5 11/16] ufs: core: Prepare ufshcd_send_command for mcq Asutosh Das
2022-11-28 16:05 ` Manivannan Sadhasivam
2022-11-23 4:10 ` [PATCH v5 12/16] ufs: core: mcq: Find hardware queue to queue request Asutosh Das
2022-11-28 16:08 ` Manivannan Sadhasivam
2022-11-23 4:10 ` Asutosh Das [this message]
2022-11-28 16:11 ` [PATCH v5 13/16] ufs: core: Prepare for completion in mcq Manivannan Sadhasivam
2022-11-23 4:10 ` [PATCH v5 14/16] ufs: mcq: Add completion support of a cqe Asutosh Das
2022-11-28 17:00 ` Manivannan Sadhasivam
2022-11-28 17:47 ` Bart Van Assche
2022-11-23 4:10 ` [PATCH v5 15/16] ufs: core: mcq: Add completion support in poll Asutosh Das
2022-11-28 17:02 ` Manivannan Sadhasivam
2022-11-23 4:10 ` [PATCH v5 16/16] ufs: core: mcq: Enable Multi Circular Queue Asutosh Das
2022-11-28 17:03 ` Manivannan Sadhasivam
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=d076c0b5bfa9c34eed9038d36677853ea042bb78.1669176158.git.quic_asutoshd@quicinc.com \
--to=quic_asutoshd@quicinc.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;
as well as URLs for NNTP newsgroup(s).