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>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH v5 15/16] ufs: core: mcq: Add completion support in poll
Date: Tue, 22 Nov 2022 20:10:28 -0800 [thread overview]
Message-ID: <9d638d7921db39e48de30d4913b28076fe86b6dd.1669176158.git.quic_asutoshd@quicinc.com> (raw)
In-Reply-To: <cover.1669176158.git.quic_asutoshd@quicinc.com>
Complete cqe requests in poll. Assumption is that
several poll completion may happen in different CPUs
for the same completion queue. Hence a spin lock
protection is added.
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/ufs-mcq.c | 13 +++++++++++++
drivers/ufs/core/ufshcd-priv.h | 2 ++
drivers/ufs/core/ufshcd.c | 7 +++++++
include/ufs/ufshcd.h | 2 ++
4 files changed, 24 insertions(+)
diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
index 365ad98..5311857 100644
--- a/drivers/ufs/core/ufs-mcq.c
+++ b/drivers/ufs/core/ufs-mcq.c
@@ -387,6 +387,18 @@ unsigned long ufshcd_mcq_poll_cqe_nolock(struct ufs_hba *hba,
return completed_reqs;
}
+unsigned long ufshcd_mcq_poll_cqe_lock(struct ufs_hba *hba,
+ struct ufs_hw_queue *hwq)
+{
+ unsigned long completed_reqs;
+
+ spin_lock(&hwq->cq_lock);
+ completed_reqs = ufshcd_mcq_poll_cqe_nolock(hba, hwq);
+ spin_unlock(&hwq->cq_lock);
+
+ return completed_reqs;
+}
+
void ufshcd_mcq_make_queues_operational(struct ufs_hba *hba)
{
struct ufs_hw_queue *hwq;
@@ -483,6 +495,7 @@ int ufshcd_mcq_init(struct ufs_hba *hba)
hwq = &hba->uhq[i];
hwq->max_entries = hba->nutrs;
spin_lock_init(&hwq->sq_lock);
+ spin_lock_init(&hwq->cq_lock);
}
/* The very first HW queue serves device commands */
diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h
index c5b5bf3..73ce8a2 100644
--- a/drivers/ufs/core/ufshcd-priv.h
+++ b/drivers/ufs/core/ufshcd-priv.h
@@ -75,6 +75,8 @@ unsigned long ufshcd_mcq_poll_cqe_nolock(struct ufs_hba *hba,
struct ufs_hw_queue *hwq);
struct ufs_hw_queue *ufshcd_mcq_req_to_hwq(struct ufs_hba *hba,
struct request *req);
+unsigned long ufshcd_mcq_poll_cqe_lock(struct ufs_hba *hba,
+ struct ufs_hw_queue *hwq);
#define UFSHCD_MCQ_IO_QUEUE_OFFSET 1
#define SD_ASCII_STD true
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 7fb7c5f..8416d42 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -5453,6 +5453,13 @@ static int ufshcd_poll(struct Scsi_Host *shost, unsigned int queue_num)
struct ufs_hba *hba = shost_priv(shost);
unsigned long completed_reqs, flags;
u32 tr_doorbell;
+ struct ufs_hw_queue *hwq;
+
+ if (is_mcq_enabled(hba)) {
+ hwq = &hba->uhq[queue_num + UFSHCD_MCQ_IO_QUEUE_OFFSET];
+
+ return ufshcd_mcq_poll_cqe_lock(hba, hwq);
+ }
spin_lock_irqsave(&hba->outstanding_lock, flags);
tr_doorbell = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);
diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index d5fde64..a709391 100644
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -1069,6 +1069,7 @@ struct ufs_hba {
* @sq_lock: serialize submission queue access
* @cq_tail_slot: current slot to which CQ tail pointer is pointing
* @cq_head_slot: current slot to which CQ head pointer is pointing
+ * @cq_lock: Synchronize between multiple polling instances
*/
struct ufs_hw_queue {
void __iomem *mcq_sq_head;
@@ -1086,6 +1087,7 @@ struct ufs_hw_queue {
spinlock_t sq_lock;
u32 cq_tail_slot;
u32 cq_head_slot;
+ spinlock_t cq_lock;
};
static inline bool is_mcq_enabled(struct ufs_hba *hba)
--
2.7.4
next prev parent reply other threads:[~2022-11-23 4:18 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 ` [PATCH v5 13/16] ufs: core: Prepare for completion in mcq Asutosh Das
2022-11-28 16:11 ` 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 ` Asutosh Das [this message]
2022-11-28 17:02 ` [PATCH v5 15/16] ufs: core: mcq: Add completion support in poll 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=9d638d7921db39e48de30d4913b28076fe86b6dd.1669176158.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=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).