[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <14a23717-b517-3d7d-bd5b-17e265dffe82@collabora.com>
Date: Tue, 30 May 2023 09:20:45 +0200
From: AngeloGioacchino Del Regno
<angelogioacchino.delregno@...labora.com>
To: Po-Wen Kao <powen.kao@...iatek.com>, linux-scsi@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org,
Alim Akhtar <alim.akhtar@...sung.com>,
Avri Altman <avri.altman@....com>,
Bart Van Assche <bvanassche@....org>,
"James E.J. Bottomley" <jejb@...ux.ibm.com>,
"Martin K. Petersen" <martin.petersen@...cle.com>,
Matthias Brugger <matthias.bgg@...il.com>
Cc: wsd_upstream@...iatek.com, peter.wang@...iatek.com,
stanley.chu@...iatek.com, alice.chao@...iatek.com,
naomi.chu@...iatek.com, chun-hung.wu@...iatek.com,
cc.chou@...iatek.com, eddie.huang@...iatek.com
Subject: Re: [PATCH v2 1/3] scsi: ufs: core: Introduce mcq ops to config cqid
Il 30/05/23 04:32, Po-Wen Kao ha scritto:
> From: Peter Wang <peter.wang@...iatek.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@...iatek.com>
> Signed-off-by: Peter Wang <peter.wang@...iatek.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) {
If your return value here is not -EOPNOTSUPP you may want to perform some
different action... and perhaps ufshcd_config_mcq() should be changed to
return a failure.
Should also be trivial to do so, since this function is called 3 times in
total, and only in ufshcd_device_init(), which is already returning int.
So, I would say....
static int ufshcd_config_mcq(struct ufs_hba *hba)
{
..... code .....
ret = ufshcd_mcq_vops_config_cqid(hba);
if (ret) {
if (ret != -EOPNOTSUPP)
return ret;
/* No special configuration, go for 1:1 mapping */
for (i = 0; ....)
....
}
Regards,
Angelo
Powered by blists - more mailing lists