Skip to contentSkip to conversation

soc: qcom: fix unmet dependency for QCOM_PDR_MSG

PATCH In review Julian Braha 3 participants 5 messages Jul 19 – Jul 22

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soc: qcom: fix unmet dependency for QCOM_PDR_MSG

QCOM_PDR_MSG is defined in an 'if QCOM_SOC..endif', so its selectors QCOM_PDR_HELPERS and SLIM_QCOM_NGD_CTRL also need to ensure QCOM_SOC is enabled. Otherwise, QCOM_PDR_MSG has an unmet dependency, such as:

WARNING: unmet direct dependencies detected for QCOM_PDR_MSG
Depends on [n]: QCOM_SOC [=n]
Selected by [y]:
- QCOM_PDR_HELPERS [=y] && ARCH_QCOM [=y] && NET [=y]

This unmet dependency was found by kconfirm, a static analysis tool for Kconfig.

Fixes f2866e6a27f7 ("soc: qcom: Hide all drivers behind selectable menu")
---
 drivers/slimbus/Kconfig  | 2 +-
 drivers/soc/qcom/Kconfig | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/slimbus/Kconfig +1 -1
index 60b0dcbc0ebb..5dded61191e0 100644
@@ -17,7 +17,7 @@ config SLIM_QCOM_NGD_CTRL
 	tristate "Qualcomm SLIMbus Satellite Non-Generic Device Component"
 	depends on HAS_IOMEM && DMA_ENGINE && NET
 	depends on QCOM_RPROC_COMMON || (COMPILE_TEST && !QCOM_RPROC_COMMON)
-	depends on ARCH_QCOM || COMPILE_TEST
+	depends on QCOM_SOC && (ARCH_QCOM || COMPILE_TEST)
 	select QCOM_QMI_HELPERS
 	select QCOM_PDR_HELPERS
 	help
drivers/soc/qcom/Kconfig +2 -1
index fd4d4ecd2df0..ef844947593c 100644
@@ -292,7 +292,7 @@ config QCOM_PBS
 	  This module provides the APIs to the client drivers that wants to send the
 	  PBS trigger event to the PBS RAM.
 
-endif
+endif # QCOM_SOC
 
 # Options selected by other drivers from different subsystems must be outside
 # of the menuconfig if-block:
@@ -314,6 +314,7 @@ config QCOM_PDR_HELPERS
 	select QCOM_QMI_HELPERS
 	select QCOM_PDR_MSG
 	depends on NET
+	depends on QCOM_SOC
 
 config QCOM_QMI_HELPERS
 	tristate
Signature · 1 line
2.54.0
#1 lore raw
Quoted 9 lines · Julian Braha

QCOM_PDR_MSG is defined in an 'if QCOM_SOC..endif', so its selectors QCOM_PDR_HELPERS and SLIM_QCOM_NGD_CTRL also need to ensure QCOM_SOC is enabled. Otherwise, QCOM_PDR_MSG has an unmet dependency, such as:

WARNING: unmet direct dependencies detected for QCOM_PDR_MSG
Depends on [n]: QCOM_SOC [=n]
Selected by [y]:
- QCOM_PDR_HELPERS [=y] && ARCH_QCOM [=y] && NET [=y]

Quoted 4 lines

This unmet dependency was found by kconfirm, a static analysis tool for Kconfig.

Fixes f2866e6a27f7 ("soc: qcom: Hide all drivers behind selectable menu")

I don't see this commit in linux-next

Quoted 11 lines
---
 drivers/slimbus/Kconfig  | 2 +-
 drivers/soc/qcom/Kconfig | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/slimbus/Kconfig +0 -0
index 60b0dcbc0ebb..5dded61191e0 100644

drivers/slimbus/Kconfig config SLIM_QCOM_NGD_CTRL · line 20

Quoted 5 lines
drivers/slimbus/Kconfig +1 -1
@@ -17,7 +17,7 @@ config SLIM_QCOM_NGD_CTRL
 	tristate "Qualcomm SLIMbus Satellite Non-Generic Device Component"
 	depends on HAS_IOMEM && DMA_ENGINE && NET
 	depends on QCOM_RPROC_COMMON || (COMPILE_TEST && !QCOM_RPROC_COMMON)
-	depends on ARCH_QCOM || COMPILE_TEST
+	depends on QCOM_SOC && (ARCH_QCOM || COMPILE_TEST)

This defeats the purpose of COMPILE_TEST.

Quoted 3 lines
drivers/slimbus/Kconfig +0 -0
 	select QCOM_QMI_HELPERS
 	select QCOM_PDR_HELPERS
 	help
Signature · 2 lines
With best wishes
Dmitry
#2 lore raw
Quoted 4 lines · Dmitry Baryshkov
Quoted 4 lines
drivers/slimbus/Kconfig +0 -0
index 60b0dcbc0ebb..5dded61191e0 100644
Quoted 8 lines

drivers/slimbus/Kconfig config SLIM_QCOM_NGD_CTRL · line 20

Quoted 6 lines
drivers/slimbus/Kconfig +1 -1
@@ -17,7 +17,7 @@ config SLIM_QCOM_NGD_CTRL
 	tristate "Qualcomm SLIMbus Satellite Non-Generic Device Component"
 	depends on HAS_IOMEM && DMA_ENGINE && NET
 	depends on QCOM_RPROC_COMMON || (COMPILE_TEST && !QCOM_RPROC_COMMON)
-	depends on ARCH_QCOM || COMPILE_TEST
+	depends on QCOM_SOC && (ARCH_QCOM || COMPILE_TEST)

This defeats the purpose of COMPILE_TEST.

The '(ARCH_QCOM || COMPILE_TEST)' is probably not even helpful here because QCOM_SOC also depends on that.

Arnd

#3 lore raw
Quoted 2 lines · Arnd Bergmann

The '(ARCH_QCOM || COMPILE_TEST)' is probably not even helpful here because QCOM_SOC also depends on that.

Nice catch, thanks Arnd. Will send a v2.

- Julian Braha