All of
 help / color / mirror / Atom feed
From: Arnd Bergmann <>
To: "James E.J. Bottomley" <>,
	"Martin K. Petersen" <>,
	Manivannan Sadhasivam <>,
	Can Guo <>
Cc: Arnd Bergmann <>, Andy Gross <>,
	Bjorn Andersson <>,
	Konrad Dybcio <>,
	Bart Van Assche <>,
	Avri Altman <>, Bean Huo <>,
	Jason Gunthorpe <>,
	Thomas Gleixner <>,,,
Subject: [PATCH] scsi: ufs: qcom: fix platform_msi_domain_free_irqs() reference
Date: Thu, 26 Jan 2023 22:17:31 +0100	[thread overview]
Message-ID: <> (raw)

From: Arnd Bergmann <>

The newly added MSI support is mostly hidden inside of an #ifdef,
except for one line that now causes a build failure when MSI
is disabled:

drivers/ufs/host/ufs-qcom.c: In function 'ufs_qcom_remove':
drivers/ufs/host/ufs-qcom.c:1698:9: error: implicit declaration of function 'platform_msi_domain_free_irqs' [-Werror=i]
 1698 |         platform_msi_domain_free_irqs(hba->dev);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Above that, the symbol that guards the other call was recently
removed, so that is all dead code at the moment.

Remove the incorrect #ifdef and instead of a Kconfig dependency
to only allow building the driver when CONFIG_GENERIC_MSI_IRQ
is enabled. This symbol is always present when PCI_MSI
or ARM_GIC_V3_ITS are enabled, both of which should be present
on kernels that can run on Qualcomm SoCs.

The 'select RESET_CONTROLLER' in combination with this dependency
unfortunately causes a dependency loop and this is a user-visible
symbol, so it's better to change both to 'depends on'.

Fixes: 519b6274a777 ("scsi: ufs: qcom: Add MCQ ESI config vendor specific ops")
Fixes: 13e7accb81d6 ("genirq: Get rid of GENERIC_MSI_IRQ_DOMAIN")
Signed-off-by: Arnd Bergmann <>
Not sure if this is the best solution, both the GENERIC_MSI_IRQ
dependencies and the RESET_CONTROLLER dependencies are a bit
inconsistent already. Feel free to pick another approach that
addresses both of the bugs I found.
 drivers/ufs/host/Kconfig    | 3 ++-
 drivers/ufs/host/ufs-qcom.c | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/ufs/host/Kconfig b/drivers/ufs/host/Kconfig
index 139064e70a34..663881437921 100644
--- a/drivers/ufs/host/Kconfig
+++ b/drivers/ufs/host/Kconfig
@@ -57,8 +57,9 @@ config SCSI_UFS_DWC_TC_PLATFORM
 	tristate "QCOM specific hooks to UFS controller platform driver"
+	depends on GENERIC_MSI_IRQ
 	  This selects the QCOM specific additions to UFSHCD platform driver.
 	  UFS host on QCOM needs some vendor specific configuration before
diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 681da3ea7154..eb66b5f6cf19 100644
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -1538,7 +1538,6 @@ static int ufs_qcom_get_outstanding_cqs(struct ufs_hba *hba,
 	return 0;
 static void ufs_qcom_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg)
 	struct device *dev = msi_desc_to_dev(desc);
@@ -1626,13 +1625,6 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)
 	return ret;
-static int ufs_qcom_config_esi(struct ufs_hba *hba)
-	return -EOPNOTSUPP;
  * struct ufs_hba_qcom_vops - UFS QCOM specific variant operations

             reply	other threads:[~2023-01-26 21:18 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-26 21:17 Arnd Bergmann [this message]
2023-01-27  6:02 ` [PATCH] scsi: ufs: qcom: fix platform_msi_domain_free_irqs() reference Manivannan Sadhasivam
2023-01-30  4:03   ` Can Guo
2023-01-30  7:45     ` Manivannan Sadhasivam
2023-01-30  7:55       ` Can Guo
2023-02-04  1:17 ` Martin K. Petersen
2023-02-09  2:43 ` Martin K. Petersen

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \

* 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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.