| Message ID | 20250404002728.3590501-1-quic_wcheng@quicinc.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Introduce QC USB SND audio offloading support | expand |
On Thu, Apr 03, 2025 at 05:27:19PM -0700, Wesley Cheng wrote: > The QC ADSP is able to support USB playback endpoints, so that the main > application processor can be placed into lower CPU power modes. This adds > the required AFE port configurations and port start command to start an > audio session. > > Specifically, the QC ADSP can support all potential endpoints that are > exposed by the audio data interface. This includes isochronous data > endpoints, in either synchronous mode or asynchronous mode. In the latter > case both implicit or explicit feedback endpoints are supported. The size > of audio samples sent per USB frame (microframe) will be adjusted based on > information received on the feedback endpoint. > > Some pre-requisites are needed before issuing the AFE port start command, > such as setting the USB AFE dev_token. This carries information about the > available USB SND cards and PCM devices that have been discovered on the > USB bus. The dev_token field is used by the audio DSP to notify the USB > offload driver of which card and PCM index to enable playback on. > > Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com> > --- > sound/soc/qcom/qdsp6/q6afe-dai.c | 60 +++++++ > sound/soc/qcom/qdsp6/q6afe.c | 192 ++++++++++++++++++++++- > sound/soc/qcom/qdsp6/q6afe.h | 36 ++++- > sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c | 23 +++ > sound/soc/qcom/qdsp6/q6dsp-lpass-ports.h | 1 + > sound/soc/qcom/qdsp6/q6routing.c | 10 +- > 6 files changed, 319 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c > index 7d9628cda875..0f47aadaabe1 100644 > --- a/sound/soc/qcom/qdsp6/q6afe-dai.c > +++ b/sound/soc/qcom/qdsp6/q6afe-dai.c > [...] > +static int afe_port_send_usb_params(struct q6afe_port *port, struct q6afe_usb_cfg *cfg) > +{ > + union afe_port_config *pcfg = &port->port_cfg; > + struct afe_param_id_usb_audio_dev_lpcm_fmt lpcm_fmt; > + struct afe_param_id_usb_audio_svc_interval svc_int; > + int ret; > + > + if (!pcfg) { > + dev_err(port->afe->dev, "%s: Error, no configuration data\n", __func__); > + ret = -EINVAL; > + goto exit; Nitpick: drop the goto here, just do "return -EINVAL;" > + } > + > + memset(&lpcm_fmt, 0, sizeof(lpcm_fmt)); > + memset(&svc_int, 0, sizeof(svc_int)); > + > + lpcm_fmt.cfg_minor_version = AFE_API_MINOR_VERSION_USB_AUDIO_CONFIG; > + lpcm_fmt.endian = pcfg->usb_cfg.endian; > + ret = q6afe_port_set_param_v2(port, &lpcm_fmt, > + AFE_PARAM_ID_USB_AUDIO_DEV_LPCM_FMT, > + AFE_MODULE_AUDIO_DEV_INTERFACE, sizeof(lpcm_fmt)); > + if (ret) { > + dev_err(port->afe->dev, "%s: AFE device param cmd LPCM_FMT failed %d\n", > + __func__, ret); > + goto exit; return ret; > + } > + > + svc_int.cfg_minor_version = AFE_API_MINOR_VERSION_USB_AUDIO_CONFIG; > + svc_int.svc_interval = pcfg->usb_cfg.service_interval; > + ret = q6afe_port_set_param_v2(port, &svc_int, > + AFE_PARAM_ID_USB_AUDIO_SVC_INTERVAL, > + AFE_MODULE_AUDIO_DEV_INTERFACE, sizeof(svc_int)); > + if (ret) > + dev_err(port->afe->dev, "%s: AFE device param cmd svc_interval failed %d\n", > + __func__, ret); > + > +exit: drop > + return ret; > +} > + > [...] > diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c > index 90228699ba7d..0def036ed3c9 100644 > --- a/sound/soc/qcom/qdsp6/q6routing.c > +++ b/sound/soc/qcom/qdsp6/q6routing.c > @@ -435,6 +435,7 @@ static struct session_data *get_session_from_id(struct msm_routing_data *data, > > return NULL; > } > + > /** > * q6routing_stream_close() - Deregister a stream > * > @@ -515,6 +516,9 @@ static int msm_routing_put_audio_mixer(struct snd_kcontrol *kcontrol, > return 1; > } > > +static const struct snd_kcontrol_new usb_rx_mixer_controls[] = { > + Q6ROUTING_RX_MIXERS(USB_RX) }; > + > static const struct snd_kcontrol_new hdmi_mixer_controls[] = { > Q6ROUTING_RX_MIXERS(HDMI_RX) }; > > @@ -933,6 +937,9 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { > SND_SOC_DAPM_MIXER("RX_CODEC_DMA_RX_7 Audio Mixer", SND_SOC_NOPM, 0, 0, > rx_codec_dma_rx_7_mixer_controls, > ARRAY_SIZE(rx_codec_dma_rx_7_mixer_controls)), > + SND_SOC_DAPM_MIXER("USB Mixer", SND_SOC_NOPM, 0, 0, As I wrote on v36: I think it would be more clear if you call this "USB_RX Audio Mixer" instead for consistency with the other playback mixers. This would also avoid confusion later when USB_TX is added in addition to USB_RX. The "Audio" part in the name is redundant, but looks like all the other playback mixers have it as well ... > + usb_rx_mixer_controls, > + ARRAY_SIZE(usb_rx_mixer_controls)), > SND_SOC_DAPM_MIXER("MultiMedia1 Mixer", SND_SOC_NOPM, 0, 0, > mmul1_mixer_controls, ARRAY_SIZE(mmul1_mixer_controls)), > SND_SOC_DAPM_MIXER("MultiMedia2 Mixer", SND_SOC_NOPM, 0, 0, > @@ -949,7 +956,6 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { > mmul7_mixer_controls, ARRAY_SIZE(mmul7_mixer_controls)), > SND_SOC_DAPM_MIXER("MultiMedia8 Mixer", SND_SOC_NOPM, 0, 0, > mmul8_mixer_controls, ARRAY_SIZE(mmul8_mixer_controls)), > - > }; > > static const struct snd_soc_dapm_route intercon[] = { > @@ -1043,6 +1049,8 @@ static const struct snd_soc_dapm_route intercon[] = { > {"MM_UL6", NULL, "MultiMedia6 Mixer"}, > {"MM_UL7", NULL, "MultiMedia7 Mixer"}, > {"MM_UL8", NULL, "MultiMedia8 Mixer"}, > + > + Q6ROUTING_RX_DAPM_ROUTE("USB Mixer", "USB_RX"), Put this below "Q6ROUTING_RX_DAPM_ROUTE("RX_CODEC_DMA_RX_7 Audio Mixer". Thanks, Stephan
On Thu, Apr 03, 2025 at 05:27:21PM -0700, Wesley Cheng wrote: > Create a USB BE component that will register a new USB port to the ASoC USB > framework. This will handle determination on if the requested audio > profile is supported by the USB device currently selected. > > Check for if the PCM format is supported during the hw_params callback. If > the profile is not supported then the userspace ALSA entity will receive an > error, and can take further action. > > Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com> > --- > include/sound/q6usboffload.h | 20 +++ > sound/soc/qcom/Kconfig | 12 ++ > sound/soc/qcom/qdsp6/Makefile | 1 + > sound/soc/qcom/qdsp6/q6usb.c | 278 ++++++++++++++++++++++++++++++++++ > 4 files changed, 311 insertions(+) > create mode 100644 include/sound/q6usboffload.h > create mode 100644 sound/soc/qcom/qdsp6/q6usb.c > > diff --git a/include/sound/q6usboffload.h b/include/sound/q6usboffload.h > new file mode 100644 > index 000000000000..35ae26ba6509 > --- /dev/null > +++ b/include/sound/q6usboffload.h > @@ -0,0 +1,20 @@ > +/* SPDX-License-Identifier: GPL-2.0 > + * > + * sound/q6usboffload.h -- QDSP6 USB offload > + * > + * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved. > + */ > + > +/** > + * struct q6usb_offload - USB backend DAI link offload parameters > + * @dev: dev handle to usb be > + * @domain: allocated iommu domain > + * @sid: streamID for iommu > + * @intr_num: usb interrupter number > + **/ > +struct q6usb_offload { > + struct device *dev; > + struct iommu_domain *domain; > + long long sid; "long long" feels like overkill for sid, given that it's essentially either an u8 or -1. I see you just copied this from q6asm-dai.c, but unlike q6asm-dai, you don't seem to check for sid < 0 in PATCH 28/31 (qc_audio_offload.c). Looking at the logic in q6asm-dai.c, it feels like this could really just be an "u8", since the -1 for "no iommus specified" is effectively just handled like sid = 0. > + u16 intr_num; > +}; > [...] > diff --git a/sound/soc/qcom/qdsp6/q6usb.c b/sound/soc/qcom/qdsp6/q6usb.c > new file mode 100644 > index 000000000000..cb8c4a62a816 > --- /dev/null > +++ b/sound/soc/qcom/qdsp6/q6usb.c > [...] > +static int q6usb_dai_dev_probe(struct platform_device *pdev) > +{ > + struct device_node *node = pdev->dev.of_node; > + struct q6usb_port_data *data; > + struct device *dev = &pdev->dev; > + struct of_phandle_args args; > + int ret; > + > + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); > + if (!data) > + return -ENOMEM; > + > + ret = of_property_read_u16(node, "qcom,usb-audio-intr-idx", > + &data->priv.intr_num); > + if (ret) { > + dev_err(&pdev->dev, "failed to read intr idx.\n"); > + return ret; > + } > + > + ret = of_parse_phandle_with_fixed_args(node, "iommus", 1, 0, &args); > + if (ret < 0) > + data->priv.sid = -1; > + else Could just do if (ret == 0) here and drop the if branch above, if you make sid an u8 like I suggested above. > + data->priv.sid = args.args[0] & Q6_USB_SID_MASK; > + > + data->priv.domain = iommu_get_domain_for_dev(&pdev->dev); > + > + data->priv.dev = dev; > + INIT_LIST_HEAD(&data->devices); I think you also need devm_mutex_init(&data->lock) or separate mutex_init()/mutex_destroy() here, if someone enables CONFIG_DEBUG_MUTEXES. Thanks, Stephan
Requesting to see if we can get some Acked-By tags, and merge on usb-next. Several Qualcomm based chipsets can support USB audio offloading to a dedicated audio DSP, which can take over issuing transfers to the USB host controller. The intention is to reduce the load on the main processors in the SoC, and allow them to be placed into lower power modes. There are several parts to this design: 1. Adding ASoC binding layer 2. Create a USB backend for Q6DSP 3. Introduce XHCI interrupter support 4. Create vendor ops for the USB SND driver USB | ASoC -------------------------------------------------------------------- | _________________________ | |sm8250 platform card | | |_________________________| | | | | ___V____ ____V____ | |Q6USB | |Q6AFE | | |"codec" | |"cpu" | | |________| |_________| | ^ ^ ^ | | |________| | ___V____ | | |SOC-USB | | ________ ________ | | | |USB SND |<--->|QC offld|<------------>|________| | |(card.c)| | |<---------- | |________| |________|___ | | | ^ ^ | | | ____________V_________ | | | | | |APR/GLINK | __ V_______________V_____ | | | |______________________| |USB SND (endpoint.c) | | | | ^ |_________________________| | | | | ^ | | | ___________V___________ | | | |->|audio DSP | ___________V_____________ | | |_______________________| |XHCI HCD |<- | |_________________________| | Adding ASoC binding layer ========================= soc-usb: Intention is to treat a USB port similar to a headphone jack. The port is always present on the device, but cable/pin status can be enabled/disabled. Expose mechanisms for USB backend ASoC drivers to communicate with USB SND. Create a USB backend for Q6DSP ============================== q6usb: Basic backend driver that will be responsible for maintaining the resources needed to initiate a playback stream using the Q6DSP. Will be the entity that checks to make sure the connected USB audio device supports the requested PCM format. If it does not, the PCM open call will fail, and userspace ALSA can take action accordingly. Introduce XHCI interrupter support ================================== XHCI HCD supports multiple interrupters, which allows for events to be routed to different event rings. This is determined by "Interrupter Target" field specified in Section "6.4.1.1 Normal TRB" of the XHCI specification. Events in the offloading case will be routed to an event ring that is assigned to the audio DSP. Create vendor ops for the USB SND driver ======================================== qc_audio_offload: This particular driver has several components associated with it: - QMI stream request handler - XHCI interrupter and resource management - audio DSP memory management When the audio DSP wants to enable a playback stream, the request is first received by the ASoC platform sound card. Depending on the selected route, ASoC will bring up the individual DAIs in the path. The Q6USB backend DAI will send an AFE port start command (with enabling the USB playback path), and the audio DSP will handle the request accordingly. Part of the AFE USB port start handling will have an exchange of control messages using the QMI protocol. The qc_audio_offload driver will populate the buffer information: - Event ring base address - EP transfer ring base address and pass it along to the audio DSP. All endpoint management will now be handed over to the DSP, and the main processor is not involved in transfers. Overall, implementing this feature will still expose separate sound card and PCM devices for both the platform card and USB audio device: 0 [SM8250MTPWCD938]: sm8250 - SM8250-MTP-WCD9380-WSA8810-VA-D SM8250-MTP-WCD9380-WSA8810-VA-DMIC 1 [Audio ]: USB-Audio - USB Audio Generic USB Audio at usb-xhci-hcd.1.auto-1.4, high speed This is to ensure that userspace ALSA entities can decide which route to take when executing the audio playback. In the above, if card#1 is selected, then USB audio data will take the legacy path over the USB PCM drivers, etc... The current limitation is that the latest USB audio device that is identified will be automatically selected by the Q6USB BE DAI for offloading. Future patches can be added to possibly add for more flexibility, but until the userpace applications can be better defined, having these mechanisms will complicate the overall implementation. USB offload Kcontrols ===================== Part of the vendor offload package will have a mixer driver associated with it (mixer_usb_offload.c). This entity will be responsible for coordinating with SOC USB and the Q6USB backend DAI to fetch information about the sound card and PCM device indices associated with the offload path. The logic is done based on the current implementation of how paths are controlled within the QC ASoC implementation. QC ASoC Q6Routing ----------------- Within the Q6 ASOC design, the registered ASoC platform card will expose a set of kcontrols for enabling the BE DAI links to the FE DAI link. For example: tinymix -D 0 contents Number of controls: 1033 ctl type num name value ... 1025 BOOL 1 USB Mixer MultiMedia1 Off 1026 BOOL 1 USB Mixer MultiMedia2 Off 1027 BOOL 1 USB Mixer MultiMedia3 Off 1028 BOOL 1 USB Mixer MultiMedia4 Off 1029 BOOL 1 USB Mixer MultiMedia5 Off 1030 BOOL 1 USB Mixer MultiMedia6 Off 1031 BOOL 1 USB Mixer MultiMedia7 Off 1032 BOOL 1 USB Mixer MultiMedia8 Off Each of these kcontrols will enable the USB BE DAI link (q6usb) to be connected to a FE DAI link (q6asm). Since each of these controls are DAPM widgets, when it is enabled, the DAPM widget's "connect" flag is updated accordingly. USB Offload Mapping ------------------- Based on the Q6routing, the USB BE DAI link can determine which sound card and PCM device is enabled for offloading. Fetching the ASoC platform sound card's information is fairly straightforward, and the bulk of the work goes to finding the corresponding PCM device index. As mentioned above, the USB BE DAI can traverse the DAPM widgets to find the DAPM path that is related to the control for the "USB Mixer." Based on which "USB Mixer" is enabled, it can find the corresponding DAPM widget associated w/ the FE DAI link (Multimedia*). From there it can find the PCM device created for the Multimedia* stream. Only one BE DAI link can be enabled per FE DAI. For example, if the HDMI path is enabled for Multimedia1, the USB Mixer will be disabled and switched over. Examples of kcontrol -------------------- tinymix -D 0 contents Number of controls: 1033 ctl type num name ... 1025 BOOL 1 USB Mixer MultiMedia1 Off 1026 BOOL 1 USB Mixer MultiMedia2 On 1027 BOOL 1 USB Mixer MultiMedia3 Off 1028 BOOL 1 USB Mixer MultiMedia4 Off 1029 BOOL 1 USB Mixer MultiMedia5 Off 1030 BOOL 1 USB Mixer MultiMedia6 Off 1031 BOOL 1 USB Mixer MultiMedia7 Off 1032 BOOL 1 USB Mixer MultiMedia8 Off tinymix -D 2 contents Number of controls: 10 ctl type num name value 0 INT 2 Capture Channel Map 0, 0 (range 0->36) 1 INT 2 Playback Channel Map 0, 0 (range 0->36) 2 BOOL 1 Headset Capture Switch On 3 INT 1 Headset Capture Volume 10 (range 0->13) 4 BOOL 1 Sidetone Playback Switch On 5 INT 1 Sidetone Playback Volume 4096 (range 0->8192) 6 BOOL 1 Headset Playback Switch On 7 INT 2 Headset Playback Volume 20, 20 (range 0->24) 8 INT 1 USB Offload Playback Card Route PCM#0 0 (range -1->32) 9 INT 1 USB Offload Playback PCM Route PCM#0 1 (range -1->255) The example highlights that the userspace/application can utilize the offload path for the USB device on card#0 PCM device#1. When dealing with multiple USB audio devices, only the latest USB device identified is going to be selected for offload capable. tinymix -D 1 contents Number of controls: 9 ctl type num name value 0 INT 2 Capture Channel Map 0, 0 (range 0->36) 1 INT 2 Playback Channel Map 0, 0 (range 0->36) 2 BOOL 1 Headset Capture Switch On 3 INT 1 Headset Capture Volume 1 (range 0->4) 4 BOOL 1 Sidetone Playback Switch On 5 INT 1 Sidetone Playback Volume 4096 (range 0->8192) 6 BOOL 1 Headset Playback Switch On 7 INT 2 Headset Playback Volume 20, 20 (range 0->24) 8 INT 1 USB Offload Playback Card Route PCM#0 -1 (range -1->32) 9 INT 1 USB Offload Playback PCM Route PCM#0 -1 (range -1->255) "-1, -1" shows that this device has no route to the offload path. This feature was validated using: - tinymix: set/enable the multimedia path to route to USB backend - tinyplay: issue playback on platform card Changelog -------------------------------------------- Changes in v37: - Added auxiliary device management between QC USB SND offload and the Q6 USB backend DAI. - Allowed for simplier device references between the two drivers. Removed the need for usb_get_usb_backend() and the usb-soc-be property. - Removed limitation for the Q6 routing to only allow one FE path to USB offload. - Fix for properly maintaining multiple Q6ADM streams will be followed up by Stephan. - Compiling the QC USB offload mixer as part of the overall QC offload SW package. Removes the need for a separate kconfig. Changes in v36: - Removed the tristate definition for xHCI sideband, as the introduction of hooks to the xHCI sideband driver from xHCI HCD will have some depmod issues. This is required so that xHCI is able to notify offloaded clients on specific sequences, such as EP ring free. This is how Mathias initially defined the xHCI sideband module, so we are just reverting back to that submission. - Rebased on usb-next. Changes in v35: - Fixed kernel bot and sparse errors. Changes in v34: - Fixed comments to align to kernel doc format. - Rebased to usb-next Changes in v33: - Removed patch#1, which introduced the xhci skip_events flag. Refactored this as an argument to the xhci_handle_events() API. Events will be skipped accordingly. - Updated patch#2 and patch#3 to accommodate for the patch#1 removal. - Replaced sec intr term from xHCI sideband commit message. Changes in v32: - Updated license year. Happy new years, 2025! Changes in v31: - Rebased to usb-next, which required some minor updates to APIs and structures changed upstream. - Moved USB SND offload mixer as part of the QCOM vendor USB offload package. - Have separate kcontrols for PCM and sound card offload mapping versus one kcontrol returning a pair. - Added a xHCI sideband notifier into sideband client drivers, so that clients can handle certain xHCI sequences properly. Currently, track the xfer ring free, so the client can ensure transfers are fully stopped by the DSP. - Updated documentation for #3 - Removed SoC USB enable/disable sound jack calls, and replaced with direct calls to SoC jack. Changes in v30: - Rebased to usb-next tip - Renamed the xhci-sideband driver to xhci-sec-intr to avoid confusion with the xHCI audio sideband feature mentioned within the spec. - Squashed the xhci-sec-intr change to set IMOD for secondary interrupters into the main patch that introduces the overall driver. Changes in v29: - Fixed some phrases/wording within the SOC USB documentation, and also added an output with aplay -l for the example output. - Fixed allocated string buffer for creating the USB SND offload mixer, and added a PCM index check to ensure that the pcm index is less than the expected number. - Added a complement enable jack call if USB backend DAI link drivers need access to it. Changes in v28: - Updated comments and commit log in the stop endpoint sync patch. Clarified that the default stop endpoint completion routine won't fully run as expected since it has a completion associated w/ the command. - Added a null check for sb->xhci within xhci_sideband_create_interrupter(). This is to just ensure that caller has registered sideband before calling create interrupter. Changes in v27: - Added some comments and notes about the offload design. Enforcing the q6routing to only allow one USB mixer (PCM device) to be enabled at a time. - Modified SND_JACK_USB notifications for all USB audio offloadable devices plugged in - Rebased on latest XHCI secondary interrupter IMOD changes upstream. Modified the change in this series to allow for XHCI sideband to set the IMOD for sideband clients. - Updated documentation on how USB SND kcontrols are involved in the overall design. - Remove mutex locking from suspend/resume platform ops, as USB core ensures that the interface and device are in the RPM_ACTIVE state while disconnect is handled. Changes in v26: - Cleaned up drivers based on errors from checkpatch - Fixed several typos using codespell - Removed any vendor specific notation from USB SND offload mixer patch Changes in v25: - Cleanups on typos mentioned within the xHCI layers - Modified the xHCI interrupter search if clients specify interrupter index - Moved mixer_usb_offload into its own module, so that other vendor offload USB modules can utilize it also. - Added support for USB audio devices that may have multiple PCM streams, as previous implementation only assumed a single PCM device. SOC USB will be able to handle an array of PCM indexes supported by the USB audio device. - Added some additional checks in the QC USB offload driver to check that device has at least one playback stream before allowing to bind - Reordered DT bindings to fix the error found by Rob's bot. The patch that added USB_RX was after the example was updated. - Updated comments within SOC USB to clarify terminology and to keep it consistent - Added SND_USB_JACK type for notifying of USB device audio connections Changes in v24: - Simplified the kcontrols involved in determining how to utilize the offload path. - There is one kcontrol registered to each USB audio device that will output which card/pcm device it is mapped to for the offload route. - Removed kcontrols to track offload status and device selection. - Default to last USB audio device plugged in as offload capable. - kcontrol will reside on USB SND device. - Reworked the tracking of connected USB devices from the Q6USB BE DAI link. Previously, it was convoluted by doing it over an array, but moved to using a list made it much simpler. Logic is still unchanged in that the last USB headset plugged in will be selected for offloading. - Updated the USB SOC RST documentation accordingly with new kcontrol updates. - Added logic to fetch mapped ASoC card and pcm device index that the offload path is mapped to for the USB SND kcontrol (for offload route). - Re-ordered series to hopefully make reviews more readable by combining patches based on the layer modified (ie QC ASoC, ASoC, USB sound, and USB XHCI). Changes in v23: - Added MODULE_DESCRIPTION() fields to drivers that needed it. Changes in v22: - Removed components tag for the ASoC platform card, as the USB SND kcontrol for notifying userspace of offload capable card achieves similar results. - Due to the above, had to remove the review-by tag for the RST documentation, as changes were made to remove the components tag section. - Took in feedback to make the SOC USB add/remove ports void. - Fixed an issue w/ the USB SND kcontrol management for devices that have multi UAC interfaces. (would attempt to create the kcontrol more than once) - Modified SOC USB card and PCM index select to be based off the num_supported streams that is specified by the USB BE DAI. - Modified comments on selecting the latest USB headset for offloading. Changes in v21: - Added an offload jack disable path from the ASoC platform driver and SOC USB. - Refactored some of the existing SOC USB context look up APIs and created some new helpers to search for the USB context. - Renamed snd_soc_usb_find_format to snd_soc_usb_find_supported_format - Removed some XHCI sideband calls that would allow clients to actually enable the IRQ line associated w/ the secondary interrupter. This is removed because there are other dependencies that are required for that to happen, which are not covered as part of this series, and to avoid confusion. - Due to the above, removed the need to export IMOD setting, and enable/disable interrupter APIs. Changes in v20: - Fixed up some formatting changes pointed out in the usb.rst - Added SB null check during XHCI sideband unregister in case caller passes improper argument (xhci_sideband_unregister()) Changes in v19: - Rebased to usb-next to account for some new changes in dependent drivers. Changes in v18: - Rebased to usb-next, which merged in part of the series. Removed these patches. - Reworked Kconfigs for the ASoC USB related components from QCOM Q6DSP drivers to keep dependencies in place for SoC USB and USB SND. - Removed the repurposing of the stop ep sync API into existing XHCI operations. This will be solely used by the XHCI sideband for now. Changes in v17: - Fixed an issue where one patch was squashed into another. - Re-added some kconfig checks for helpers exposed in USB SND for the soc usb driver, after running different kconfigs. Changes in v16: - Modified some code layer dependencies so that soc usb can be split as a separate module. - Split the kcontrols from ASoC QCOM common layer into a separate driver - Reworked SOC USB kcontrols for controlling card + pcm offload routing and status so that there are individual controls for card and pcm devices. - Added a kcontrol remove API in SOC USB to remove the controls on the fly. This required to add some kcontrol management to SOC USB. - Removed the disconnect work and workqueue for the QC USB offload as it is not required, since QMI interface driver ensures events are handled in its own WQ. Changes in v15: - Removed some already merged XHCI changes - Separated SOC USB driver from being always compiled into SOC core. Now configurable from kconfig. - Fixed up ASoC kcontrol naming to fit guidelines. - Removed some unnecessary dummy ifdefs. - Moved usb snd offload capable kcontrol to be initialized by the platform offloading driver. Changes in v14: - Cleaned up some USB SND related feedback: - Renamed SNDUSB OFFLD playback available --> USB offload capable card - Fixed locking while checking if stream is in use - Replaced some mutex pairs with guard(mutex) Changes in v13: - Pulled in secondary/primary interrupter rework from Mathias from: https://git.kernel.org/pub/scm/linux/kernel/git/mnyman/xhci.git/log/drivers/usb/host?h=fix_eventhandling - Did some cleanup and commit message updates, and tested on current code base. - Added mutex locking to xhci sideband to help prevent any race conditions, esp. for when accessing shared references. - Addressed concerns from Hillf about gfp_flags and locking used in qc_usb_audio_offload. - Rebased onto usb-next Changes in v12: - Updated copyright year to 2024. Happy new years! - Fixed newline format on mixer offload driver. Changes in v11: - Modified QMI format structures to be const Changes in v10: - Added new mixer for exposing kcontrol for sound card created by USB SND. This allows for applications to know which platform sound card has offload support. Will return the card number. - Broke down and cleaned up some functions/APIs within qc_audio_offload driver. - Exported xhci_initialize_ring_info(), and modified XHCI makefile to allow for the XHCI sideband to exist as a module. - Reworked the jack registration and moved it to the QCOM platform card driver, ie sm8250. - Added an SOC USB API to fetch a standard component tag that can be appended to the platform sound card. Added this tag to sm8250 if any USB path exists within the DT node. - Moved kcontrols that existed in the Q6USB driver, and made it a bit more generic, so that naming can be standardized across solutions. SOC USB is now responsible for creation of these kcontrols. - Added a SOC USB RST document explaining some code flows and implementation details so that other vendors can utilize the framework. - Addressed a case where USB device connection events are lost if usb offload driver (qc_audio_offload) is not probed when everything else has been initialized, ie USB SND, SOC USB and ASoC sound card. Add a rediscover device call during module init, to ensure that connection events will be propagated. - Rebased to usb-next. Changes in v9: - Fixed the dt binding check issue with regards to num-hc-interrupters. Changes in v8: - Cleaned up snd_soc_usb_find_priv_data() based on Mark's feedback. Removed some of the duplicate looping code that was present on previous patches. Also renamed the API. - Integrated Mathias' suggestions on his new sideband changes: https://git.kernel.org/pub/scm/linux/kernel/git/mnyman/xhci.git/log/?h=feature_interrupters - Addressed some of Mathias' fixme tags, such as: - Resetting transfer ring dequeue/enqueue pointers - Issuing stop endpoint command during ep removal - Reset ERDP properly to first segment ring during interrupter removal. (this is currently just being cleared to 0, but should be pointing to a valid segment if controller is still running. Changes in v7: - Fixed dt check error for q6usb bindings - Updated q6usb property from qcom,usb-audio-intr-num --> qcom,usb-audio-intr-idx - Removed separate DWC3 HC interrupters num property, and place limits to XHCI one. - Modified xhci_ring_to_sgtable() to use assigned IOVA/DMA address to fetch pages, as it is not ensured event ring allocated is always done in the vmalloc range. Changes in v6: - Fixed limits and description on several DT bindings (XHCI and Q6USB) - Fixed patch subjects to follow other ALSA/ASoC notations. USB SND - Addressed devices which expose multiple audio (UAC) interfaces. These devices will create a single USB sound card with multiple audio streams, and receive multiple interface probe routines. QC offload was not properly considering cases with multiple probe calls. - Renamed offload module name and kconfig to fit within the SND domain. - Renamed attach/detach endpoint API to keep the hw_params notation. Changes in v5: - Removed some unnecessary files that were included - Fixed some typos mentioned - Addressed dt-binding issues and added hc-interrupters definition to usb-xhci.yaml XHCI: - Moved secondary skip events API to xhci-ring and updated implementation - Utilized existing XHCI APIs, such as inc_deq and xhci_update_erst_dequeue() USB SND - Renamed and reworked the APIs in "sound: usb: Export USB SND APIs for modules" patch to include suggestions to utilize snd_usb_hw_params/free and to avoid generic naming. - Added a resume_cb() op for completion sake. - Addressed some locking concerns with regards to when registering for platform hooks. - Added routine to disconnect all offloaded devices during module unbind. ASoC - Replaced individual PCM parameter arguments in snd_soc_usb_connect() with new snd_soc_usb_device structure to pass along PCM info. - Modified snd_jack set report to notify HEADPHONE event, as we do not support record path. Changes in v4: - Rebased to xhci/for-usb-next - Addressed some dt-bindings comments XHCI: - Pulled in latest changes from Mathias' feature_interrupters branch: https://git.kernel.org/pub/scm/linux/kernel/git/mnyman/xhci.git/log/?h=feature_interrupters - Fixed commit text and signage for the XHCI sideband/interrupter related changes - Added some logic to address the FIXME tags mentioned throughout the commits, such as handling multi segment rings and building the SGT, locking concerns, and ep cleanup operations. - Removed some fixme tags for conditions that may not be needed/addressed. - Repurposed the new endpoint stop sync API to be utilized in other places. - Fixed potential compile issue if XHCI sideband config is not defined. ASoC: - Added sound jack control into the Q6USB driver. Allows for userspsace to know when an offload capable device is connected. USB SND: - Avoided exporting _snd_pcm_hw_param_set based on Takashi's recommendation. - Split USB QMI packet header definitions into a separate commit. This is used to properly allow the QMI interface driver to parse and route QMI packets accordingly - Added a "depends on" entry when enabling QC audio offload to avoid compile time issues. Changes in v3: - Changed prefix from RFC to PATCH - Rebased entire series to usb-next - Updated copyright years XHCI: - Rebased changes on top of XHCI changes merged into usb-next, and only added changes that were still under discussion. - Added change to read in the "num-hc-interrupters" device property. ASoC: - qusb6 USB backend - Incorporated suggestions to fetch iommu information with existing APIs - Added two new sound kcontrols to fetch offload status and offload device selection. - offload status - will return the card and pcm device in use tinymix -D 0 get 1 --> 1, 0 (offload in progress on card#1 pcm#0) - device selection - set the card and pcm device to enable offload on. Ex.: tinymix -D 0 set 1 2 0 --> sets offload on card#2 pcm#0 (this should be the USB card) USB SND: - Fixed up some locking related concerns for registering platform ops. - Moved callbacks under the register_mutex, so that - Modified APIs to properly pass more information about the USB SND device, so that the Q6USB backend can build a device list/map, in order to monitor offload status and device selection. Changes in v2: XHCI: - Replaced XHCI and HCD changes with Mathias' XHCI interrupter changes in his tree: https://git.kernel.org/pub/scm/linux/kernel/git/mnyman/xhci.git/log/?h=feature_interrupters Adjustments made to Mathias' changes: - Created xhci-intr.h to export/expose interrupter APIs versus exposing xhci.h. Moved dependent structures to this file as well. (so clients can parse out information from "struct xhci_interrupter") - Added some basic locking when requesting interrupters. - Fixed up some sanity checks. - Removed clearing of the ERSTBA during freeing of the interrupter. (pending issue where SMMU fault occurs if DMA addr returned is 64b - TODO) - Clean up pending events in the XHCI secondary interrupter. While testing USB bus suspend, it was seen that on bus resume, the xHCI HC would run into a command timeout. - Added offloading APIs to xHCI to fetch transfer and event ring information. ASoC: - Modified soc-usb to allow for multiple USB port additions. For this to work, the USB offload driver has to have a reference to the USB backend by adding a "usb-soc-be" DT entry to the device saved into XHCI sysdev. - Created separate dt-bindings for defining USB_RX port. - Increased APR timeout to accommodate the situation where the AFE port start command could be delayed due to having to issue a USB bus resume while handling the QMI stream start command. Mathias Nyman (1): xhci: sideband: add initial api to register a secondary interrupter entity Wesley Cheng (30): usb: host: xhci-mem: Cleanup pending secondary event ring events usb: host: xhci-mem: Allow for interrupter clients to choose specific index usb: host: xhci-plat: Set XHCI max interrupters if property is present usb: host: xhci: Notify xHCI sideband on transfer ring free usb: dwc3: Specify maximum number of XHCI interrupters ALSA: Add USB audio device jack type ALSA: usb-audio: Export USB SND APIs for modules ALSA: usb-audio: Check for support for requested audio format ALSA: usb-audio: Save UAC sample size information ALSA: usb-audio: Prevent starting of audio stream if in use ALSA: usb-audio: Introduce USB SND platform op callbacks ALSA: usb-audio: Allow for rediscovery of connected USB SND devices ASoC: Add SoC USB APIs for adding an USB backend ASoC: usb: Add PCM format check API for USB backend ASoC: usb: Create SOC USB SND jack kcontrol ASoC: usb: Fetch ASoC card and pcm device information ASoC: usb: Rediscover USB SND devices on USB port add ASoC: doc: Add documentation for SOC USB ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Add USB_RX port ASoC: dt-bindings: Update example for enabling USB offload on SM8250 ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp ASoC: qcom: qdsp6: q6afe: Increase APR timeout ASoC: qcom: qdsp6: Add USB backend ASoC driver for Q6 ASoC: qcom: qdsp6: Add headphone jack for offload connection status ASoC: qcom: qdsp6: Fetch USB offload mapped card and PCM device ALSA: usb-audio: qcom: Add USB QMI definitions ALSA: usb-audio: qcom: Introduce QC USB SND offloading support ALSA: usb-audio: qcom: Don't allow USB offload path if PCM device is in use ALSA: usb-audio: qcom: Add USB offload route kcontrol ALSA: usb-audio: qcom: Notify USB audio devices on USB offload probing .../bindings/sound/qcom,sm8250.yaml | 15 + Documentation/sound/soc/index.rst | 1 + Documentation/sound/soc/usb.rst | 482 ++++ drivers/usb/dwc3/core.c | 12 + drivers/usb/dwc3/core.h | 2 + drivers/usb/dwc3/host.c | 3 + drivers/usb/host/Kconfig | 9 + drivers/usb/host/Makefile | 4 + drivers/usb/host/xhci-mem.c | 31 +- drivers/usb/host/xhci-plat.c | 2 + drivers/usb/host/xhci-ring.c | 47 +- drivers/usb/host/xhci-sideband.c | 457 ++++ drivers/usb/host/xhci.c | 5 +- drivers/usb/host/xhci.h | 13 +- .../sound/qcom,q6dsp-lpass-ports.h | 1 + include/linux/mod_devicetable.h | 2 +- include/linux/usb/xhci-sideband.h | 102 + include/sound/jack.h | 4 +- include/sound/q6usboffload.h | 20 + include/sound/soc-usb.h | 138 ++ include/uapi/linux/input-event-codes.h | 3 +- sound/core/jack.c | 6 +- sound/soc/Kconfig | 10 + sound/soc/Makefile | 2 + sound/soc/qcom/Kconfig | 16 + sound/soc/qcom/Makefile | 2 + sound/soc/qcom/qdsp6/Makefile | 1 + sound/soc/qcom/qdsp6/q6afe-dai.c | 60 + sound/soc/qcom/qdsp6/q6afe.c | 194 +- sound/soc/qcom/qdsp6/q6afe.h | 36 +- sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c | 23 + sound/soc/qcom/qdsp6/q6dsp-lpass-ports.h | 1 + sound/soc/qcom/qdsp6/q6routing.c | 10 +- sound/soc/qcom/qdsp6/q6usb.c | 417 ++++ sound/soc/qcom/sm8250.c | 24 +- sound/soc/qcom/usb_offload_utils.c | 56 + sound/soc/qcom/usb_offload_utils.h | 30 + sound/soc/soc-usb.c | 322 +++ sound/usb/Kconfig | 14 + sound/usb/Makefile | 2 +- sound/usb/card.c | 106 + sound/usb/card.h | 17 + sound/usb/endpoint.c | 1 + sound/usb/format.c | 1 + sound/usb/helper.c | 1 + sound/usb/pcm.c | 104 +- sound/usb/pcm.h | 11 + sound/usb/qcom/Makefile | 4 + sound/usb/qcom/mixer_usb_offload.c | 156 ++ sound/usb/qcom/mixer_usb_offload.h | 11 + sound/usb/qcom/qc_audio_offload.c | 2004 +++++++++++++++++ sound/usb/qcom/usb_audio_qmi_v01.c | 863 +++++++ sound/usb/qcom/usb_audio_qmi_v01.h | 164 ++ 53 files changed, 5967 insertions(+), 55 deletions(-) create mode 100644 Documentation/sound/soc/usb.rst create mode 100644 drivers/usb/host/xhci-sideband.c create mode 100644 include/linux/usb/xhci-sideband.h create mode 100644 include/sound/q6usboffload.h create mode 100644 include/sound/soc-usb.h create mode 100644 sound/soc/qcom/qdsp6/q6usb.c create mode 100644 sound/soc/qcom/usb_offload_utils.c create mode 100644 sound/soc/qcom/usb_offload_utils.h create mode 100644 sound/soc/soc-usb.c create mode 100644 sound/usb/qcom/Makefile create mode 100644 sound/usb/qcom/mixer_usb_offload.c create mode 100644 sound/usb/qcom/mixer_usb_offload.h create mode 100644 sound/usb/qcom/qc_audio_offload.c create mode 100644 sound/usb/qcom/usb_audio_qmi_v01.c create mode 100644 sound/usb/qcom/usb_audio_qmi_v01.h