Skip to contentSkip to conversation

remoteproc: qcom: fix Q6V5_WCSS dependencies

PATCH In review Arnd Bergmann 3 participants 3 messages Jul 18, 2018 – Jul 31, 2018 Remote processor (remoteproc)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remoteproc: qcom: fix Q6V5_WCSS dependencies

A new driver got added that depends on QCOM_SMD and fails to link as built-in with CONFIG_QCOM_SMD=m:

drivers/remoteproc/qcom_common.o: In function `smd_subdev_stop':
qcom_common.c:(.text+0x674): undefined reference to qcom_smd_unregister_edge' drivers/remoteproc/qcom_common.o: In function smd_subdev_start':
qcom_common.c:(.text+0x700): undefined reference to `qcom_smd_register_edge'

We've fixed the same thing several times before, so use the same dependency here.

Fixes 3a3d4163e0bf ("remoteproc: qcom: Introduce Hexagon V5 based WCSS driver")
---
 drivers/remoteproc/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/remoteproc/Kconfig +1 -0
index 0dde3753c3a5..052d4dd347f9 100644
@@ -127,6 +127,7 @@ config QCOM_Q6V5_WCSS
 	tristate "Qualcomm Hexagon based WCSS Peripheral Image Loader"
 	depends on OF && ARCH_QCOM
 	depends on QCOM_SMEM
+	depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
 	depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
 	depends on QCOM_SYSMON || QCOM_SYSMON=n
 	select MFD_SYSCON
Signature · 1 line
2.9.0
Acked-by on v1 1/1
#1 lore raw

Hi Arnd,

Quoted 8 lines · Arnd Bergmann

A new driver got added that depends on QCOM_SMD and fails to link as built-in with CONFIG_QCOM_SMD=m:

drivers/remoteproc/qcom_common.o: In function `smd_subdev_stop':
qcom_common.c:(.text+0x674): undefined reference to qcom_smd_unregister_edge' drivers/remoteproc/qcom_common.o: In function smd_subdev_start':
qcom_common.c:(.text+0x700): undefined reference to `qcom_smd_register_edge'

Quoted 5 lines

We've fixed the same thing several times before, so use the same dependency here.

Fixes 3a3d4163e0bf ("remoteproc: qcom: Introduce Hexagon V5 based WCSS driver")

Oops, missed it. Sorry.

Regards,
Sricharan

Quoted 17 lines
---
 drivers/remoteproc/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/remoteproc/Kconfig +1 -0
index 0dde3753c3a5..052d4dd347f9 100644
@@ -127,6 +127,7 @@ config QCOM_Q6V5_WCSS
 	tristate "Qualcomm Hexagon based WCSS Peripheral Image Loader"
 	depends on OF && ARCH_QCOM
 	depends on QCOM_SMEM
+	depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
 	depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
 	depends on QCOM_SYSMON || QCOM_SYSMON=n
 	select MFD_SYSCON
Signature · 1 line
"QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
#2 lore raw
In reply to Arnd Bergmann
Quoted 11 lines · Arnd Bergmann

A new driver got added that depends on QCOM_SMD and fails to link as built-in with CONFIG_QCOM_SMD=m:

drivers/remoteproc/qcom_common.o: In function `smd_subdev_stop':
qcom_common.c:(.text+0x674): undefined reference to qcom_smd_unregister_edge' drivers/remoteproc/qcom_common.o: In function smd_subdev_start':
qcom_common.c:(.text+0x700): undefined reference to `qcom_smd_register_edge'

We've fixed the same thing several times before, so use the same dependency here.

I have a change where I remove this inherited dependency, so I asked Sricharan to only depend on the ones he actually uses - but I forgot that I haven't pushed this.

Sorry about screwing this up again. Thanks for catching it!

Regards,
Bjorn

Quoted 21 lines
Fixes 3a3d4163e0bf ("remoteproc: qcom: Introduce Hexagon V5 based WCSS driver")
---
 drivers/remoteproc/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/remoteproc/Kconfig +1 -0
index 0dde3753c3a5..052d4dd347f9 100644
@@ -127,6 +127,7 @@ config QCOM_Q6V5_WCSS
 	tristate "Qualcomm Hexagon based WCSS Peripheral Image Loader"
 	depends on OF && ARCH_QCOM
 	depends on QCOM_SMEM
+	depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
 	depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
 	depends on QCOM_SYSMON || QCOM_SYSMON=n
 	select MFD_SYSCON
Signature · 1 line
2.9.0