Skip to contentSkip to conversation

wifi: ath12k: fix QCOM_RPROC_COMMON dependency

PATCH Applied Arnd Bergmann 2 participants 2 messages Mar 13 – Nov 12 Qualcomm ATH12K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wifi: ath12k: fix QCOM_RPROC_COMMON dependency

From: Arnd Bergmann <[email protected]>

The AHB driver depends on the remoteproc interface, which could be in a loadable module when ath12k itself is built-in:

arm-linux-gnueabi-ld: drivers/net/wireless/ath/ath12k/ahb.o: in function `ath12k_ahb_probe':
ahb.c:(.text+0xb2c): undefined reference to `qcom_register_ssr_notifier'
arm-linux-gnueabi-ld: ahb.c:(.text+0x1000): undefined reference to `qcom_unregister_ssr_notifier'
arm-linux-gnueabi-ld: drivers/net/wireless/ath/ath12k/ahb.o: in function `ath12k_ahb_remove':
ahb.c:(.text+0x1146): undefined reference to `qcom_unregister_ssr_notifier'

Add a dependency to only allow the AHB portion to be enabled if either remoteproc support is built-in or ath12k is itself a loadable module.

A better way to fix this would be to make the driver more modular and ensure the AHB and PCI components are built into separate loadable modules like it is done for the ATH10K driver, but that is a much larger rework that someone else can do in the future.

---
 drivers/net/wireless/ath/ath12k/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath12k/Kconfig +1 -0
index 1ea1af1b8f6c..ed18e0624e03 100644
@@ -18,6 +18,7 @@ config ATH12K
 config ATH12K_AHB
 	bool "QTI ath12k AHB support"
 	depends on ATH12K && REMOTEPROC
+	depends on QCOM_RPROC_COMMON=y || ATH12K=m
 	select QCOM_MDT_LOADER
 	select QCOM_SCM
 	help
Signature · 1 line
2.39.5
Applied
#1 lore raw
Quoted 10 lines · Arnd Bergmann

The AHB driver depends on the remoteproc interface, which could be in a loadable module when ath12k itself is built-in:

arm-linux-gnueabi-ld: drivers/net/wireless/ath/ath12k/ahb.o: in function `ath12k_ahb_probe':
ahb.c:(.text+0xb2c): undefined reference to `qcom_register_ssr_notifier'
arm-linux-gnueabi-ld: ahb.c:(.text+0x1000): undefined reference to `qcom_unregister_ssr_notifier'
arm-linux-gnueabi-ld: drivers/net/wireless/ath/ath12k/ahb.o: in function `ath12k_ahb_remove':
ahb.c:(.text+0x1146): undefined reference to `qcom_unregister_ssr_notifier'

[...]

Applied, thanks!

[1/1] wifi: ath12k: fix QCOM_RPROC_COMMON dependency

      commit: f8534946346ef1d5a9899b933013d7438d6a0dc8

Best regards,

Signature · 1 line
Jeff Johnson <[email protected]>