platform_msi_domain_alloc_irqs() does not always get consecutive
IRQ numbers, hence queue IDs calculated out from IRQ numbers may
be incorrect if we assume IRQ numbers are consecutive. Fix it by
passing msi_desc to ESI handler to use msi_desc->msi_index as
queue ID.
Signed-off-by: Can Guo <[email protected]>
Signed-off-by: Ziqi Chen <[email protected]>
---
drivers/ufs/host/ufs-qcom.c | 25 ++++++++++---------------
drivers/ufs/host/ufs-qcom.h | 1 -
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 8d6fd4c..f36bcdb 100644
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -1643,11 +1643,13 @@ static void ufs_qcom_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg)
ufshcd_mcq_config_esi(hba, msg);
}
-static irqreturn_t ufs_qcom_mcq_esi_handler(int irq, void *__hba)
+static irqreturn_t ufs_qcom_mcq_esi_handler(int irq, void *data)
{
- struct ufs_hba *hba = __hba;
+ struct msi_desc *desc = data;
+ struct device *dev = msi_desc_to_dev(desc);
+ struct ufs_hba *hba = dev_get_drvdata(dev);
struct ufs_qcom_host *host = ufshcd_get_variant(hba);
- u32 id = irq - host->esi_base;
+ u32 id = desc->msi_index;
struct ufs_hw_queue *hwq = &hba->uhq[id];
ufshcd_mcq_write_cqis(hba, 0x1, id);
@@ -1665,8 +1667,6 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)
if (host->esi_enabled)
return 0;
- else if (host->esi_base < 0)
- return -EINVAL;
/*
* 1. We only handle CQs as of now.
@@ -1675,16 +1675,15 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)
nr_irqs = hba->nr_hw_queues - hba->nr_queues[HCTX_TYPE_POLL];
ret = platform_msi_domain_alloc_irqs(hba->dev, nr_irqs,
ufs_qcom_write_msi_msg);
- if (ret)
+ if (ret) {
+ dev_err(hba->dev, "Failed to request Platform MSI %d\n", ret);
goto out;
+ }
msi_for_each_desc(desc, hba->dev, MSI_DESC_ALL) {
- if (!desc->msi_index)
- host->esi_base = desc->irq;
-
ret = devm_request_irq(hba->dev, desc->irq,
ufs_qcom_mcq_esi_handler,
- IRQF_SHARED, "qcom-mcq-esi", hba);
+ IRQF_SHARED, "qcom-mcq-esi", desc);
if (ret) {
dev_err(hba->dev, "%s: Fail to request IRQ for %d, err = %d\n",
__func__, desc->irq, ret);
@@ -1712,12 +1711,8 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)
}
out:
- if (ret) {
- host->esi_base = -1;
- dev_warn(hba->dev, "Failed to request Platform MSI %d\n", ret);
- } else {
+ if (!ret)
host->esi_enabled = true;
- }
return ret;
}
diff --git a/drivers/ufs/host/ufs-qcom.h b/drivers/ufs/host/ufs-qcom.h
index 6289ad5..7292403 100644
--- a/drivers/ufs/host/ufs-qcom.h
+++ b/drivers/ufs/host/ufs-qcom.h
@@ -226,7 +226,6 @@ struct ufs_qcom_host {
u32 hs_gear;
- int esi_base;
bool esi_enabled;
};
--
2.7.4
Ziqi,
> platform_msi_domain_alloc_irqs() does not always get consecutive IRQ
> numbers, hence queue IDs calculated out from IRQ numbers may be
> incorrect if we assume IRQ numbers are consecutive. Fix it by passing
> msi_desc to ESI handler to use msi_desc->msi_index as queue ID.
Applied to 6.6/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
On Tue, 11 Jul 2023 15:59:08 +0800, Ziqi Chen wrote:
> platform_msi_domain_alloc_irqs() does not always get consecutive
> IRQ numbers, hence queue IDs calculated out from IRQ numbers may
> be incorrect if we assume IRQ numbers are consecutive. Fix it by
> passing msi_desc to ESI handler to use msi_desc->msi_index as
> queue ID.
>
>
> [...]
Applied to 6.6/scsi-queue, thanks!
[1/1] scsi: ufs: qcom: Get queue ID from MSI index in ESI handler
https://git.kernel.org/mkp/scsi/c/8f2b78652d05
--
Martin K. Petersen Oracle Linux Engineering