Skip to contentSkip to conversation

ALSA: usb-audio: qcom: fix USB_XHCI dependency

PATCH Superseded Arnd Bergmann 3 participants 4 messages May 5, 2025 – May 21, 2025 Sound

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: usb-audio: qcom: fix USB_XHCI dependency

From: Arnd Bergmann <[email protected]>

SND_USB_AUDIO_QMI depends on USB_XHCI_SIDEBAND, but that is a bool symbol and allows it to be built-in even when XHCI itself is in a loadable module. That configuration causes a link failure:

arm-linux-gnueabi-ld: sound/usb/qcom/qc_audio_offload.o: in function `uaudio_event_ring_cleanup_free':
qc_audio_offload.c:(.text+0x7dc): undefined reference to `xhci_sideband_remove_interrupter'
arm-linux-gnueabi-ld: sound/usb/qcom/qc_audio_offload.o: in function `uaudio_endpoint_setup':
qc_audio_offload.c:(.text+0xe88): undefined reference to `xhci_sideband_add_endpoint'

Add the extra dependency on USB_XHCI itself.

Fixes 326bbc348298 ("ALSA: usb-audio: qcom: Introduce QC USB SND offloading support")
---
 sound/usb/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
sound/usb/Kconfig +2 -1
index 6daa551738da..15bc212cb211 100644
@@ -178,7 +178,8 @@ config SND_BCD2000
 
 config SND_USB_AUDIO_QMI
 	tristate "Qualcomm Audio Offload driver"
-	depends on QCOM_QMI_HELPERS && SND_USB_AUDIO && USB_XHCI_SIDEBAND && SND_SOC_USB
+	depends on QCOM_QMI_HELPERS && SND_USB_AUDIO && SND_SOC_USB
+	depends on USB_XHCI && USB_XHCI_SIDEBAND
 	help
 	  Say Y here to enable the Qualcomm USB audio offloading feature.
 
Signature · 1 line
2.39.5
#1 lore raw

sound/usb/Kconfig config SND_BCD2000 · line 182

Quoted 6 lines · Arnd Bergmann

config SND_USB_AUDIO_QMI

(quoted diff) +0 -1
 	tristate "Qualcomm Audio Offload driver"
-	depends on QCOM_QMI_HELPERS && SND_USB_AUDIO && USB_XHCI_SIDEBAND && 

SND_SOC_USB

sound/usb/Kconfig +2 -0
+	depends on QCOM_QMI_HELPERS && SND_USB_AUDIO && SND_SOC_USB
+	depends on USB_XHCI && USB_XHCI_SIDEBAND

Sorry, this should have been USB_XHCI_HCD, not USB_XHCI. I have some more patches for this driver that I'm still testing I'll include a fixed version when I send the rest, or you can fix it up yourself when applying this one.

Arnd

#2 lore raw
Quoted 13 lines · Arnd Bergmann

sound/usb/Kconfig config SND_BCD2000 · line 182

Quoted 6 lines · Arnd Bergmann

config SND_USB_AUDIO_QMI

(quoted diff) +0 -1
 	tristate "Qualcomm Audio Offload driver"
-	depends on QCOM_QMI_HELPERS && SND_USB_AUDIO && USB_XHCI_SIDEBAND && 

SND_SOC_USB

sound/usb/Kconfig +2 -0
+	depends on QCOM_QMI_HELPERS && SND_USB_AUDIO && SND_SOC_USB
+	depends on USB_XHCI && USB_XHCI_SIDEBAND

Sorry, this should have been USB_XHCI_HCD, not USB_XHCI. I have some more patches for this driver that I'm still testing I'll include a fixed version when I send the rest, or you can fix it up yourself when applying this one.

Can you send a fixed up one?

thanks,

greg k-h

#3 lore raw
Quoted 9 lines · Greg Kroah-Hartman
Quoted 5 lines · Arnd Bergmann

Sorry, this should have been USB_XHCI_HCD, not USB_XHCI. I have some more patches for this driver that I'm still testing I'll include a fixed version when I send the rest, or you can fix it up yourself when applying this one.

Can you send a fixed up one?

Done, sorry I had forgotten about this one by the time I had finished the other three.

Arnd