From: Po-Wen Kao <powen.kao@mediatek.com>
To: <linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
Alim Akhtar <alim.akhtar@samsung.com>,
Avri Altman <avri.altman@wdc.com>,
Bart Van Assche <bvanassche@acm.org>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>
Cc: <wsd_upstream@mediatek.com>, <peter.wang@mediatek.com>,
<stanley.chu@mediatek.com>, <powen.kao@mediatek.com>,
<alice.chao@mediatek.com>, <naomi.chu@mediatek.com>,
<chun-hung.wu@mediatek.com>, <cc.chou@mediatek.com>,
<eddie.huang@mediatek.com>
Subject: [PATCH v2 1/3] scsi: ufs: core: Introduce mcq ops to config cqid
Date: Tue, 30 May 2023 10:32:25 +0800 [thread overview]
Message-ID: <20230530023227.16653-2-powen.kao@mediatek.com> (raw)
In-Reply-To: <20230530023227.16653-1-powen.kao@mediatek.com>
From: Peter Wang <peter.wang@mediatek.com>
MCQ sq/cq mapping is not just one for one, could many for one.
This patch allow host driver to change the mapping, assign cqid
for each hw queue.
Signed-off-by: Po-Wen Kao <powen.kao@mediatek.com>
Signed-off-by: Peter Wang <peter.wang@mediatek.com>
---
drivers/ufs/core/ufs-mcq.c | 2 +-
drivers/ufs/core/ufshcd-priv.h | 8 ++++++++
drivers/ufs/core/ufshcd.c | 11 +++++++++++
include/ufs/ufshcd.h | 3 +++
4 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
index 51b3c6ae781d..1ba9c395c6b0 100644
--- a/drivers/ufs/core/ufs-mcq.c
+++ b/drivers/ufs/core/ufs-mcq.c
@@ -368,7 +368,7 @@ void ufshcd_mcq_make_queues_operational(struct ufs_hba *hba)
* Submission Queue Attribute
*/
ufsmcq_writel(hba, (1 << QUEUE_EN_OFFSET) | qsize |
- (i << QUEUE_ID_OFFSET),
+ (hwq->cqid << QUEUE_ID_OFFSET),
MCQ_CFG_n(REG_SQATTR, i));
}
}
diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h
index d53b93c21a0c..2de068b96c71 100644
--- a/drivers/ufs/core/ufshcd-priv.h
+++ b/drivers/ufs/core/ufshcd-priv.h
@@ -287,6 +287,14 @@ static inline int ufshcd_mcq_vops_config_esi(struct ufs_hba *hba)
return -EOPNOTSUPP;
}
+static inline int ufshcd_mcq_vops_config_cqid(struct ufs_hba *hba)
+{
+ if (hba->vops && hba->vops->config_cqid)
+ return hba->vops->config_cqid(hba);
+
+ return -EOPNOTSUPP;
+}
+
extern const struct ufs_pm_lvl_states ufs_pm_lvl_states[];
/**
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 4ec8dacb447c..fad9ff4469b0 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -8488,11 +8488,22 @@ static int ufshcd_alloc_mcq(struct ufs_hba *hba)
static void ufshcd_config_mcq(struct ufs_hba *hba)
{
int ret;
+ struct ufs_hw_queue *hwq;
+ int i;
ret = ufshcd_mcq_vops_config_esi(hba);
dev_info(hba->dev, "ESI %sconfigured\n", ret ? "is not " : "");
ufshcd_enable_intr(hba, UFSHCD_ENABLE_MCQ_INTRS);
+
+ ret = ufshcd_mcq_vops_config_cqid(hba);
+ if (ret) {
+ for (i = 0; i < hba->nr_hw_queues; i++) {
+ hwq = &hba->uhq[i];
+ hwq->cqid = i;
+ }
+ }
+
ufshcd_mcq_make_queues_operational(hba);
ufshcd_mcq_config_mac(hba, hba->nutrs);
diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index df1d04f7a542..d5b16f968d7f 100644
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -307,6 +307,7 @@ struct ufs_pwr_mode_info {
* @op_runtime_config: called to config Operation and runtime regs Pointers
* @get_outstanding_cqs: called to get outstanding completion queues
* @config_esi: called to config Event Specific Interrupt
+ * @config_cqid: called to config cqid for each sq
*/
struct ufs_hba_variant_ops {
const char *name;
@@ -352,6 +353,7 @@ struct ufs_hba_variant_ops {
int (*get_outstanding_cqs)(struct ufs_hba *hba,
unsigned long *ocqs);
int (*config_esi)(struct ufs_hba *hba);
+ int (*config_cqid)(struct ufs_hba *hba);
};
/* clock gating state */
@@ -1100,6 +1102,7 @@ struct ufs_hw_queue {
dma_addr_t cqe_dma_addr;
u32 max_entries;
u32 id;
+ u32 cqid;
u32 sq_tail_slot;
spinlock_t sq_lock;
u32 cq_tail_slot;
--
2.18.0
next prev parent reply other threads:[~2023-05-30 2:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-30 2:32 [PATCH v2 0/3] Add MCQ support for MTK platform Po-Wen Kao
2023-05-30 2:32 ` Po-Wen Kao [this message]
2023-05-30 7:20 ` [PATCH v2 1/3] scsi: ufs: core: Introduce mcq ops to config cqid AngeloGioacchino Del Regno
2023-05-30 9:42 ` Powen Kao (高伯文)
2023-05-30 23:54 ` Bart Van Assche
2023-05-31 1:54 ` Stanley Chu
2023-05-31 12:48 ` Bart Van Assche
2023-06-01 10:25 ` Powen Kao (高伯文)
2023-06-01 14:23 ` Bart Van Assche
[not found] ` <d5f239c6f104d9dd4e5493d5d06709e33f12226b.camel@mediatek.com>
2023-06-01 20:54 ` Bart Van Assche
2023-05-30 2:32 ` [PATCH v2 2/3] scsi: ufs: core: Export symbols for MTK driver module Po-Wen Kao
2023-05-31 0:00 ` Bart Van Assche
2023-05-30 2:32 ` [PATCH v2 3/3] scsi: ufs: ufs-mediatek: Add MCQ support for MTK platform Po-Wen Kao
2023-05-30 23:58 ` Bart Van Assche
2023-05-30 2:53 ` [PATCH v2 0/3] " Stanley Chu
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=20230530023227.16653-2-powen.kao@mediatek.com \
--to=powen.kao@mediatek.com \
--cc=alice.chao@mediatek.com \
--cc=alim.akhtar@samsung.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=avri.altman@wdc.com \
--cc=bvanassche@acm.org \
--cc=cc.chou@mediatek.com \
--cc=chun-hung.wu@mediatek.com \
--cc=eddie.huang@mediatek.com \
--cc=jejb@linux.ibm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=matthias.bgg@gmail.com \
--cc=naomi.chu@mediatek.com \
--cc=peter.wang@mediatek.com \
--cc=stanley.chu@mediatek.com \
--cc=wsd_upstream@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).