linux-sound.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ALSA: usb-audio: qcom: fix USB_XHCI dependency
@ 2025-05-05  5:20 Arnd Bergmann
  2025-05-05  5:59 ` Arnd Bergmann
  0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2025-05-05  5:20 UTC (permalink / raw)
  To: Mark Brown
  Cc: Arnd Bergmann, Jaroslav Kysela, Takashi Iwai, Greg Kroah-Hartman,
	Wesley Cheng, linux-sound, linux-kernel

From: Arnd Bergmann <arnd@arndb.de>

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")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 sound/usb/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 6daa551738da..15bc212cb211 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -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.
 
-- 
2.39.5


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] ALSA: usb-audio: qcom: fix USB_XHCI dependency
  2025-05-05  5:20 [PATCH] ALSA: usb-audio: qcom: fix USB_XHCI dependency Arnd Bergmann
@ 2025-05-05  5:59 ` Arnd Bergmann
  2025-05-21 12:33   ` Greg Kroah-Hartman
  0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2025-05-05  5:59 UTC (permalink / raw)
  To: Arnd Bergmann, Mark Brown
  Cc: Jaroslav Kysela, Takashi Iwai, Greg Kroah-Hartman, Wesley Cheng,
	linux-sound, linux-kernel

On Mon, May 5, 2025, at 07:20, Arnd Bergmann wrote:
>  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


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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] ALSA: usb-audio: qcom: fix USB_XHCI dependency
  2025-05-05  5:59 ` Arnd Bergmann
@ 2025-05-21 12:33   ` Greg Kroah-Hartman
  2025-05-21 13:56     ` Arnd Bergmann
  0 siblings, 1 reply; 4+ messages in thread
From: Greg Kroah-Hartman @ 2025-05-21 12:33 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Arnd Bergmann, Mark Brown, Jaroslav Kysela, Takashi Iwai,
	Wesley Cheng, linux-sound, linux-kernel

On Mon, May 05, 2025 at 07:59:21AM +0200, Arnd Bergmann wrote:
> On Mon, May 5, 2025, at 07:20, Arnd Bergmann wrote:
> >  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
> 
> 
> 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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] ALSA: usb-audio: qcom: fix USB_XHCI dependency
  2025-05-21 12:33   ` Greg Kroah-Hartman
@ 2025-05-21 13:56     ` Arnd Bergmann
  0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2025-05-21 13:56 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Arnd Bergmann, Mark Brown, Jaroslav Kysela, Takashi Iwai,
	Wesley Cheng, linux-sound, linux-kernel

On Wed, May 21, 2025, at 14:33, Greg Kroah-Hartman wrote:
> On Mon, May 05, 2025 at 07:59:21AM +0200, Arnd Bergmann wrote:
>> 
>> 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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2025-05-21 13:56 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-05  5:20 [PATCH] ALSA: usb-audio: qcom: fix USB_XHCI dependency Arnd Bergmann
2025-05-05  5:59 ` Arnd Bergmann
2025-05-21 12:33   ` Greg Kroah-Hartman
2025-05-21 13:56     ` Arnd Bergmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).