- Alsa-devel - mailman.alsa-project.org

[PATCH v16 00/50] Introduce QC USB SND audio offloading support
by Wesley Cheng 17 Feb '24

17 Feb '24

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 userpsace 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 platorm 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... 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 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… - 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. - Addresed 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=feat… - 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 unnescessary 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=feat… - 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 userpsace 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=feat… 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. USB SND: - Added a platform ops during usb_audio_suspend(). This allows for the USB offload driver to halt the audio stream when system enters PM suspend. This ensures the audio DSP is not issuing transfers on the USB bus. - Do not override platform ops if they are already populated. - Introduce a shared status variable between the USB offload and USB SND layers, to ensure that only one path is active at a time. If the USB bus is occupied, then userspace is notified that the path is busy. Mathias Nyman (11): xhci: Add interrupt pending autoclear flag to each interrupter xhci: Add helper to set an interrupters interrupt moderation interval xhci: make isoc_bei_interval variable interrupter specific. xhci: remove unnecessary event_ring_deq parameter from xhci_handle_event() xhci: update event ring dequeue pointer position to controller correctly xhci: move event processing for one interrupter to a separate function xhci: add helper that checks for unhandled events on a event ring xhci: Don't check if the event ring is valid before every event TRB xhci: Decouple handling an event from checking for unhandled events xhci: add helper to stop endpoint and wait for completion xhci: sideband: add initial api to register a sideband entity Wesley Cheng (39): usb: host: xhci: Export enable and disable interrupter APIs usb: host: xhci: Repurpose event handler for skipping interrupter events xhci: export XHCI IMOD setting helper for interrupters usb: host: xhci-sideband: Expose a sideband interrupter enable API usb: host: xhci-mem: Cleanup pending secondary event ring events usb: host: xhci-mem: Allow for interrupter clients to choose specific index ASoC: Add SOC USB APIs for adding an USB backend ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Add USB_RX port ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp ASoC: qdsp6: q6afe: Increase APR timeout ASoC: qcom: qdsp6: Add USB backend ASoC driver for Q6 ALSA: usb-audio: Introduce USB SND platform op callbacks ALSA: usb-audio: Export USB SND APIs for modules ALSA: usb-audio: Save UAC sample size information usb: dwc3: Specify maximum number of XHCI interrupters usb: host: xhci-plat: Set XHCI max interrupters if property is present ALSA: usb-audio: qcom: Add USB QMI definitions ALSA: usb-audio: qcom: Introduce QC USB SND offloading support ALSA: usb-audio: Check for support for requested audio format ASoC: usb: Add PCM format check API for USB backend ASoC: qcom: qdsp6: Ensure PCM format is supported by USB audio device ALSA: usb-audio: Prevent starting of audio stream if in use ALSA: usb-audio: Do not allow USB offload path if PCM device is in use ASoC: dt-bindings: Add Q6USB backend ASoC: dt-bindings: Update example for enabling USB offload on SM8250 ALSA: usb-audio: qcom: Populate PCM and USB chip information ASoC: qcom: qdsp6: Add support to track available USB PCM devices ASoC: Introduce SND kcontrols to select sound card and PCM device ASoC: qcom: qdsp6: Add SOC USB offload select get/put callbacks ASoC: Introduce SND kcontrols to track USB offloading state ASoC: qcom: qdsp6: Add PCM ops to track current state ASoC: usb: Create SOC USB SND jack kcontrol ASoC: qcom: qdsp6: Add headphone jack for offload connection status ASoC: usb: Fetch ASoC sound card information ALSA: usb-audio: Add USB offloading capable kcontrol ALSA: usb-audio: qcom: Use card and PCM index from QMI request ASoC: usb: Rediscover USB SND devices on USB port add ASoC: qcom: Populate SoC components string ASoC: doc: Add documentation for SOC USB .../devicetree/bindings/sound/qcom,q6usb.yaml | 55 + .../bindings/sound/qcom,sm8250.yaml | 15 + Documentation/sound/soc/index.rst | 1 + Documentation/sound/soc/usb.rst | 611 ++++++ 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 | 2 + drivers/usb/host/xhci-mem.c | 39 +- drivers/usb/host/xhci-plat.c | 2 + drivers/usb/host/xhci-ring.c | 240 ++- drivers/usb/host/xhci-sideband.c | 439 ++++ drivers/usb/host/xhci.c | 97 +- drivers/usb/host/xhci.h | 21 +- .../sound/qcom,q6dsp-lpass-ports.h | 1 + include/linux/usb/xhci-sideband.h | 70 + include/sound/q6usboffload.h | 20 + include/sound/soc-usb.h | 182 ++ sound/soc/Kconfig | 9 + sound/soc/Makefile | 2 + sound/soc/qcom/Kconfig | 10 + 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 | 193 +- 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 | 9 + sound/soc/qcom/qdsp6/q6usb.c | 408 ++++ sound/soc/qcom/sm8250.c | 15 +- sound/soc/qcom/usb_offload_utils.c | 51 + sound/soc/qcom/usb_offload_utils.h | 26 + sound/soc/soc-usb.c | 660 ++++++ sound/usb/Kconfig | 25 + sound/usb/Makefile | 2 +- sound/usb/card.c | 109 + sound/usb/card.h | 15 + 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 | 6 + sound/usb/qcom/mixer_usb_offload.c | 65 + sound/usb/qcom/mixer_usb_offload.h | 17 + sound/usb/qcom/qc_audio_offload.c | 1914 +++++++++++++++++ sound/usb/qcom/usb_audio_qmi_v01.c | 892 ++++++++ sound/usb/qcom/usb_audio_qmi_v01.h | 162 ++ 50 files changed, 6485 insertions(+), 167 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6usb.yaml 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

1 51

[v4 PATCH] ALSA: virtio: Fix "Coverity: virtsnd_kctl_tlv_op(): Uninitialized variables" warning.
by Aiswarya Cyriac 16 Feb '24

16 Feb '24

This commit fixes the following warning when building virtio_snd driver. " *** CID 1583619: Uninitialized variables (UNINIT) sound/virtio/virtio_kctl.c:294 in virtsnd_kctl_tlv_op() 288 289 break; 290 } 291 292 kfree(tlv); 293 vvv CID 1583619: Uninitialized variables (UNINIT) vvv Using uninitialized value "rc". 294 return rc; 295 } 296 297 /** 298 * virtsnd_kctl_get_enum_items() - Query items for the ENUMERATED element type. 299 * @snd: VirtIO sound device. " This warning is caused by the absence of the "default" branch in the switch-block, and is a false positive because the kernel calls virtsnd_kctl_tlv_op() only with values for op_flag processed in this block. Also, this commit unifies the cleanup path for all possible control paths in the callback function. Signed-off-by: Anton Yakovlev <anton.yakovlev(a)opensynergy.com> Signed-off-by: Aiswarya Cyriac <aiswarya.cyriac(a)opensynergy.com> Reported-by: coverity-bot <keescook+coverity-bot(a)chromium.org> Addresses-Coverity-ID: 1583619 ("Uninitialized variables") Fixes: d6568e3de42d ("ALSA: virtio: add support for audio controls") --- sound/virtio/virtio_kctl.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sound/virtio/virtio_kctl.c b/sound/virtio/virtio_kctl.c index 0c6ac74aca1e..7aa79c05b464 100644 --- a/sound/virtio/virtio_kctl.c +++ b/sound/virtio/virtio_kctl.c @@ -253,8 +253,8 @@ static int virtsnd_kctl_tlv_op(struct snd_kcontrol *kcontrol, int op_flag, tlv = kzalloc(size, GFP_KERNEL); if (!tlv) { - virtsnd_ctl_msg_unref(msg); - return -ENOMEM; + rc = -ENOMEM; + goto on_msg_unref; } sg_init_one(&sg, tlv, size); @@ -281,14 +281,25 @@ static int virtsnd_kctl_tlv_op(struct snd_kcontrol *kcontrol, int op_flag, hdr->hdr.code = cpu_to_le32(VIRTIO_SND_R_CTL_TLV_COMMAND); - if (copy_from_user(tlv, utlv, size)) + if (copy_from_user(tlv, utlv, size)) { rc = -EFAULT; - else + goto on_msg_unref; + } else { rc = virtsnd_ctl_msg_send(snd, msg, &sg, NULL, false); + } break; + default: + rc = -EINVAL; + /* We never get here - we listed all values for op_flag */ + WARN_ON(1); + goto on_msg_unref; } + kfree(tlv); + return rc; +on_msg_unref: + virtsnd_ctl_msg_unref(msg); kfree(tlv); return rc; -- 2.43.2

3 4

[PATCH] soundwire: bus_type: make sdw_bus_type const
by Ricardo B. Marliere 16 Feb '24

16 Feb '24

Since commit d492cc2573a0 ("driver core: device.h: make struct bus_type a const *"), the driver core can properly handle constant struct bus_type, move the sdw_bus_type variable to be a constant structure as well, placing it into read-only memory which can not be modified at runtime. Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Suggested-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Ricardo B. Marliere <ricardo(a)marliere.net> --- drivers/soundwire/bus_type.c | 2 +- include/linux/soundwire/sdw_type.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c index 9fa93bb923d7..fd65b2360fc1 100644 --- a/drivers/soundwire/bus_type.c +++ b/drivers/soundwire/bus_type.c @@ -72,7 +72,7 @@ int sdw_slave_uevent(const struct device *dev, struct kobj_uevent_env *env) return 0; } -struct bus_type sdw_bus_type = { +const struct bus_type sdw_bus_type = { .name = "soundwire", .match = sdw_bus_match, }; diff --git a/include/linux/soundwire/sdw_type.h b/include/linux/soundwire/sdw_type.h index d8c27f1e5559..b445f7200f06 100644 --- a/include/linux/soundwire/sdw_type.h +++ b/include/linux/soundwire/sdw_type.h @@ -4,7 +4,7 @@ #ifndef __SOUNDWIRE_TYPES_H #define __SOUNDWIRE_TYPES_H -extern struct bus_type sdw_bus_type; +extern const struct bus_type sdw_bus_type; extern struct device_type sdw_slave_type; extern struct device_type sdw_master_type; --- base-commit: 9282cfa2eb080e3bbb95f488af35618b614cdf76 change-id: 20240213-bus_cleanup-soundwire-8b56c6862ef1 Best regards, -- Ricardo B. Marliere <ricardo(a)marliere.net>

3 2

[PATCH] ALSA: usb-audio: More relaxed check of MIDI jack names
by Takashi Iwai 15 Feb '24

15 Feb '24

The USB audio driver tries to retrieve MIDI jack name strings that can be used for rawmidi substream names and sequencer port names, but its checking is too strict: often the firmware provides the jack info for unexpected directions, and then we miss the info although it's present. In this patch, the code to extract the jack info is changed to allow both in and out directions in a single loop. That is, the former two functions to obtain the descriptor pointers for jack in and out are changed to a single function that returns iJack of the corresponding jack ID, no matter which direction is used. It's a code simplification at the same time as well as the fix. Fixes: eb596e0fd13c ("ALSA: usb-audio: generate midi streaming substream names from jack names") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/midi.c | 77 +++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 50 deletions(-) diff --git a/sound/usb/midi.c b/sound/usb/midi.c index 6b0993258e03..c1f2e5a03de9 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -1742,50 +1742,44 @@ static void snd_usbmidi_get_port_info(struct snd_rawmidi *rmidi, int number, } } -static struct usb_midi_in_jack_descriptor *find_usb_in_jack_descriptor( - struct usb_host_interface *hostif, uint8_t jack_id) +/* return iJack for the corresponding jackID */ +static int find_usb_ijack(struct usb_host_interface *hostif, uint8_t jack_id) { unsigned char *extra = hostif->extra; int extralen = hostif->extralen; + struct usb_descriptor_header *h; + struct usb_midi_out_jack_descriptor *outjd; + struct usb_midi_in_jack_descriptor *injd; + size_t sz; while (extralen > 4) { - struct usb_midi_in_jack_descriptor *injd = - (struct usb_midi_in_jack_descriptor *)extra; + h = (struct usb_descriptor_header *)extra; + if (h->bDescriptorType != USB_DT_CS_INTERFACE) + goto next; - if (injd->bLength >= sizeof(*injd) && - injd->bDescriptorType == USB_DT_CS_INTERFACE && - injd->bDescriptorSubtype == UAC_MIDI_IN_JACK && - injd->bJackID == jack_id) - return injd; - if (!extra[0]) - break; - extralen -= extra[0]; - extra += extra[0]; - } - return NULL; -} - -static struct usb_midi_out_jack_descriptor *find_usb_out_jack_descriptor( - struct usb_host_interface *hostif, uint8_t jack_id) -{ - unsigned char *extra = hostif->extra; - int extralen = hostif->extralen; - - while (extralen > 4) { - struct usb_midi_out_jack_descriptor *outjd = - (struct usb_midi_out_jack_descriptor *)extra; - - if (outjd->bLength >= sizeof(*outjd) && - outjd->bDescriptorType == USB_DT_CS_INTERFACE && + outjd = (struct usb_midi_out_jack_descriptor *)h; + if (h->bLength >= sizeof(*outjd) && outjd->bDescriptorSubtype == UAC_MIDI_OUT_JACK && - outjd->bJackID == jack_id) - return outjd; + outjd->bJackID == jack_id) { + sz = USB_DT_MIDI_OUT_SIZE(outjd->bNrInputPins); + if (outjd->bLength < sz) + goto next; + return *(extra + sz - 1); + } + + injd = (struct usb_midi_in_jack_descriptor *)h; + if (injd->bLength >= sizeof(*injd) && + injd->bDescriptorSubtype == UAC_MIDI_IN_JACK && + injd->bJackID == jack_id) + return injd->iJack; + +next: if (!extra[0]) break; extralen -= extra[0]; extra += extra[0]; } - return NULL; + return 0; } static void snd_usbmidi_init_substream(struct snd_usb_midi *umidi, @@ -1796,13 +1790,10 @@ static void snd_usbmidi_init_substream(struct snd_usb_midi *umidi, const char *name_format; struct usb_interface *intf; struct usb_host_interface *hostif; - struct usb_midi_in_jack_descriptor *injd; - struct usb_midi_out_jack_descriptor *outjd; uint8_t jack_name_buf[32]; uint8_t *default_jack_name = "MIDI"; uint8_t *jack_name = default_jack_name; uint8_t iJack; - size_t sz; int res; struct snd_rawmidi_substream *substream = @@ -1816,21 +1807,7 @@ static void snd_usbmidi_init_substream(struct snd_usb_midi *umidi, intf = umidi->iface; if (intf && jack_id >= 0) { hostif = intf->cur_altsetting; - iJack = 0; - if (stream != SNDRV_RAWMIDI_STREAM_OUTPUT) { - /* in jacks connect to outs */ - outjd = find_usb_out_jack_descriptor(hostif, jack_id); - if (outjd) { - sz = USB_DT_MIDI_OUT_SIZE(outjd->bNrInputPins); - if (outjd->bLength >= sz) - iJack = *(((uint8_t *) outjd) + sz - sizeof(uint8_t)); - } - } else { - /* and out jacks connect to ins */ - injd = find_usb_in_jack_descriptor(hostif, jack_id); - if (injd) - iJack = injd->iJack; - } + iJack = find_usb_ijack(hostif, jack_id); if (iJack != 0) { res = usb_string(umidi->dev, iJack, jack_name_buf, ARRAY_SIZE(jack_name_buf)); -- 2.35.3

1 0

[ASOC][tlv320aic3110] Error resetting registers
by Jesús Jiménez Sánchez 15 Feb '24

15 Feb '24

Hello, I am having an issue with the tlv320aic3110 codec. I get these two errors during boot up in my embedded device: [ 10.079068] tlv320aic31xx-codec 0-0018: Unable to sync registers 0x1d-0x1d. -6 [ 10.161668] tlv320aic31xx-codec 0-0018: Failed to restore cache: -6 According to the datasheet, 0x1d can be "Table 7-69. Page 0 / Register 29 (0x1D): Codec Interface Control 2" or "Table 7-136. Page 1 / Register 1 (0x01) Through Page 1 / Register 29 (0x1D): Reserved". After about a minute, there are also these errors: [ 66.858820] tlv320aic31xx-codec 0-0018: ASoC: error at snd_soc_component_update_bits on tlv320aic31xx-codec.0-0018: -16 [ 66.943057] tlv320aic31xx-codec 0-0018: ASoC: error at snd_soc_component_update_bits on tlv320aic31xx-codec.0-0018: -16 [ 67.092200] tlv320aic31xx-codec 0-0018: ASoC: POST_PMU: HPL Driver event failed: -16 [ 67.383700] tlv320aic31xx-codec 0-0018: ASoC: error at soc_component_read_no_lock on tlv320aic31xx-codec.0-0018: -16 [ 67.482291] tlv320aic31xx-codec 0-0018: ASoC: error at soc_component_read_no_lock on tlv320aic31xx-codec.0-0018: -16 [ 67.545386] tlv320aic31xx-codec 0-0018: ASoC: POST_PMU: SPL ClassD event failed: -16 [ 67.823211] tlv320aic31xx-codec 0-0018: ASoC: error at soc_component_read_no_lock on tlv320aic31xx-codec.0-0018: -16 [ 67.895536] tlv320aic31xx-codec 0-0018: ASoC: error at soc_component_read_no_lock on tlv320aic31xx-codec.0-0018: -16 And finally, after suspend/resume, I get these last errors: [ 5981.210062] tlv320aic31xx-codec 0-0018: ASoC: POST_PMD: HPL Driver event failed: -16 [ 5981.210103] tlv320aic31xx-codec 0-0018: ASoC: POST_PMD: SPL ClassD event failed: -16 [ 5981.210170] v1v8_ao: Underflow of regulator enable count [ 5981.210184] Failed to disable DVDD: -EINVAL [ 5981.223267] tlv320aic31xx-codec 0-0018: Unable to sync registers 0x1d-0x1d. -6 [ 5981.223303] tlv320aic31xx-codec 0-0018: Failed to restore cache: -6 [ 5981.233551] tlv320aic31xx-codec 0-0018: aic31xx_wait_bits: Failed! 0x25 was 0xc1855ddb expected 0x20 (-16, 0x20, 0 us) [ 5981.233591] tlv320aic31xx-codec 0-0018: ASoC: POST_PMU: HPL Driver event failed: -1 [ 5981.233669] tlv320aic31xx-codec 0-0018: ASoC: POST_PMU: SPL ClassD event failed: -16 Here are all the relevant parts of our device tree: / { sound0: sound@0 { compatible = "simple-audio-card"; simple-audio-card,name = "Sound"; simple-audio-card,widgets = "Microphone", "Microphone Jack", "Headphone", "Headphone Jack", "Speaker", "Speaker"; simple-audio-card,routing = "MIC1LP", "Microphone Jack", "MIC1RP", "Microphone Jack", "MIC1LP", "MICBIAS", "MIC1RP", "MICBIAS", "Headphone Jack", "HPL", "Headphone Jack", "HPR", "Speaker", "SPL", "Speaker", "SPR"; simple-audio-card,format = "i2s"; simple-audio-card,bitclock-master = <&sound0_master>; simple-audio-card,frame-master = <&sound0_master>; simple-audio-card,bitclock-inversion; simple-audio-card,convert-rate = <48000>; sound0_master: simple-audio-card,cpu { sound-dai = <&i2s1>; system-clock-frequency = <12000000>; }; simple-audio-card,codec { sound-dai = <&codec>; system-clock-frequency = <12000000>; }; }; }; &pinctrl { codec_pins_a: codec_pins_a { pins1 { pinmux = <STM32_PINMUX('H', 2, GPIO)>; /* AUDIO_PWR_EN1 */ }; pins2 { pinmux = <STM32_PINMUX('C', 0, AF6)>, /* CODEC_I2S1_SDO */ <STM32_PINMUX('A', 6, AF5)>, /* CODEC_I2S1_SDI */ <STM32_PINMUX('B', 1, AF5)>, /* CODEC_I2S1_BITCLK / I2S1_CK */ <STM32_PINMUX('B', 0, AF5)>, /* I2S1_MCK */ <STM32_PINMUX('A', 4, AF5)>; /* CODEC_I2S1_WORDCLK / I2S1_WS */ }; }; codec_sleep_pins_a: codec_sleep_pins_a { pins { pinmux = <STM32_PINMUX('H', 2, ANALOG)>, /* AUDIO_PWR_EN1 */ <STM32_PINMUX('C', 0, ANALOG)>, /* CODEC_I2S1_SDO */ <STM32_PINMUX('A', 6, ANALOG)>, /* CODEC_I2S1_SDI */ <STM32_PINMUX('B', 1, ANALOG)>, /* CODEC_I2S1_BITCLK / I2S1_CK */ <STM32_PINMUX('B', 0, ANALOG)>, /* I2S1_MCK */ <STM32_PINMUX('A', 4, ANALOG)>; /* CODEC_I2S1_WORDCLK / I2S1_WS */ }; }; }; &i2s1 { status = "okay"; pinctrl-names = "default", "sleep"; pinctrl-0 = <&codec_pins_a>; pinctrl-1 = <&codec_sleep_pins_a>; /* Sleep pins */ clock-names = "pclk", "i2sclk", "x8k", "x11k"; clocks = <&rcc SPI1>, <&rcc SPI1_K>, <&scmi_clk CK_SCMI_PLL3_Q>, <&scmi_clk CK_SCMI_PLL3_R>; }; &i2c1 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&i2c1_pins_a>; pinctrl-1 = <&i2c1_sleep_pins_a>; i2c-scl-rising-time-ns = <96>; i2c-scl-falling-time-ns = <3>; clock-frequency = <100000>; status = "okay"; /* spare dmas for other usage */ /delete-property/dmas; /delete-property/dma-names; codec: codec@18 { compatible = "ti,tlv320aic3110"; reg = <0x18>; #sound-dai-cells = <0>; status = "okay"; reset-gpios = <&gpiof 6 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; ai31xx-micbias-vg = <MICBIAS_2_0V>; /* Regulators */ HPVDD-supply = <&scmi_v3v3_sw>; /* 3V3_CODEC */ SPRVDD-supply = <&v5v0_ao>; /* 5V0_CODEC */ SPLVDD-supply = <&v5v0_ao>; /* 5V0_CODEC */ AVDD-supply = <&scmi_v3v3_sw>; /* 3V3_CODEC */ IOVDD-supply = <&scmi_v3v3_sw>; /* 3V3_CODEC */ DVDD-supply = <&scmi_v1v8_periph>; /* 1V8_CODEC */ }; }; I have been trying to find a solution for a few days but I haven't been able to find anything important. Is there anything I could do to maybe get closer to the root cause of these errors? Has anyone seen something like this before? Let me know if you need any other information from me that might help. Thanks in advance!

1 0

[GIT PULL] ASoC fixes for v6.8-rc4
by Mark Brown 15 Feb '24

15 Feb '24

The following changes since commit e81fdba0208666b65bafeaba814874b4d6e5edde: ALSA: Various fixes for Cirrus Logic CS35L56 support (2024-02-01 17:45:32 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.8-rc4 for you to fetch changes up to 0db0c1770834f39e11a2902e20e1f11a482f4465: ASoC: cs35l56: Workaround for ACPI with broken spk-id-gpios property (2024-02-13 19:37:25 +0000) ---------------------------------------------------------------- ASoC: Fixes for v6.8 A relatively large set of fixes and quirk additions here but they're all driver specific, people seem to be back into the swing of things after the holidays. This is all driver specific and much of it fairly minor. ---------------------------------------------------------------- Alexey Khoroshilov (1): ASoC: rt5645: Fix deadlock in rt5645_jack_detect_work() Amadeusz Sławiński (1): ASoC: Intel: avs: Fix dynamic port assignment when TDM is set Arnd Bergmann (1): ASoC: q6dsp: fix event handler prototype Attila Tőkés (1): ASoC: amd: yc: Fix non-functional mic on Lenovo 82UU Cezary Rojewski (1): ASoC: Intel: avs: Fix pci_probe() error path Charles Keepax (2): ASoC: cs42l43: Handle error from devm_pm_runtime_enable ASoC: cs42l43: Add system suspend ops to disable IRQ Cristian Ciocaltea (1): ASoC: SOF: amd: Fix locking in ACP IRQ handler Curtis Malainey (1): ASoC: SOF: IPC3: fix message bounds on ipc ops Dan Carpenter (1): ASoC: cs35l56: fix reversed if statement in cs35l56_dspwait_asp1tx_put() Gergo Koteles (1): ASoC: tas2781: add module parameter to tascodec_init() Hans de Goede (4): ASoC: Intel: Boards: Fix NULL pointer deref in BYT/CHT boards ASoC: Intel: cht_bsw_rt5645: Cleanup codec_name handling ASoC: rt5645: Make LattePanda board DMI match more precise ASoC: rt5645: Add DMI quirk for inverted jack-detect on MeeGoPad T8 Jeffrey Hugo (1): ASoC: dt-bindings: google,sc7280-herobrine: Drop bouncing @codeaurora Mario Limonciello (1): ASoC: amd: yc: Add DMI quirk for Lenovo Ideapad Pro 5 16ARP8 Mark Brown (2): ASoC: Intel: Boards: Fix NULL pointer deref in BYT/CHT ASoC: SOF: Intel: pci-tgl/lnl: Change default paths Peter Ujfalusi (3): ASoC: SOF: Intel: pci-tgl: Change the default paths and firmware names ASoC: SOF: Intel: pci-lnl: Change the topology path to intel/sof-ipc4-tplg ASoC: SOF: ipc4-pcm: Workaround for crashed firmware on system suspend Ranjani Sridharan (1): ASoC: SOF: ipc3-topology: Fix pipeline tear down logic Richard Fitzgerald (3): ASoC: cs35l56: Fix deadlock in ASP1 mixer register initialization ASoC: cs35l56: Remove default from IRQ1_CFG register ASoC: cs35l56: Workaround for ACPI with broken spk-id-gpios property .../bindings/sound/google,sc7280-herobrine.yaml | 1 - include/sound/tas2781.h | 1 + sound/pci/hda/tas2781_hda_i2c.c | 2 +- sound/soc/amd/yc/acp6x-mach.c | 14 ++ sound/soc/codecs/cs35l56-shared.c | 1 - sound/soc/codecs/cs35l56.c | 246 ++++++++++++++------- sound/soc/codecs/cs35l56.h | 2 +- sound/soc/codecs/cs42l43.c | 48 +++- sound/soc/codecs/rt5645.c | 26 +++ sound/soc/codecs/tas2781-comlib.c | 3 +- sound/soc/codecs/tas2781-i2c.c | 2 +- sound/soc/intel/avs/core.c | 3 + sound/soc/intel/avs/topology.c | 2 +- sound/soc/intel/boards/bytcht_cx2072x.c | 3 +- sound/soc/intel/boards/bytcht_da7213.c | 3 +- sound/soc/intel/boards/bytcht_es8316.c | 3 +- sound/soc/intel/boards/bytcr_rt5640.c | 3 +- sound/soc/intel/boards/bytcr_rt5651.c | 3 +- sound/soc/intel/boards/bytcr_wm5102.c | 3 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 7 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 3 +- sound/soc/qcom/qdsp6/q6apm-dai.c | 8 +- sound/soc/sof/amd/acp-ipc.c | 2 + sound/soc/sof/amd/acp.c | 17 +- sound/soc/sof/intel/pci-lnl.c | 2 +- sound/soc/sof/intel/pci-tgl.c | 64 +++--- sound/soc/sof/ipc3-topology.c | 55 +++-- sound/soc/sof/ipc3.c | 2 +- sound/soc/sof/ipc4-pcm.c | 13 +- 29 files changed, 378 insertions(+), 164 deletions(-)

2 1

[PATCH 0/2] ALSA: struct bus_type cleanup
by Ricardo B. Marliere 15 Feb '24

15 Feb '24

This series is part of an effort to cleanup the users of the driver core, as can be seen in many recent patches authored by Greg across the tree (e.g. [1]). --- [1]: https://lore.kernel.org/lkml/?q=f%3Agregkh%40linuxfoundation.org+s%3A%22mak… To: Johannes Berg <johannes(a)sipsolutions.net> To: Jaroslav Kysela <perex(a)perex.cz> To: Takashi Iwai <tiwai(a)suse.com> Cc: <linuxppc-dev(a)lists.ozlabs.org> Cc: <alsa-devel(a)alsa-project.org> Cc: <linux-sound(a)vger.kernel.org> Cc: <linux-kernel(a)vger.kernel.org> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Ricardo B. Marliere <ricardo(a)marliere.net> --- Ricardo B. Marliere (2): ALSA: aoa: make soundbus_bus_type const ALSA: seq: make snd_seq_bus_type const sound/aoa/soundbus/core.c | 2 +- sound/core/seq_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- base-commit: d7bf73809849463f76de42aad62c850305dd6c5d change-id: 20240214-bus_cleanup-alsa-1d05ffc6507b Best regards, -- Ricardo B. Marliere <ricardo(a)marliere.net>

3 4

Codec stops working after sleep and resume
by Jesús Jiménez Sánchez 15 Feb '24

15 Feb '24

I am using the tlv320aic31xx codec in my embedded device and I've noticed that, after forcing the unit into sleep and then, resume, I get a bunch of these errors: ``` tlv320aic31xx-codec 0-0018: ASoC: error at snd_soc_component_update_bits on tlv320aic31xx-codec.0-0018: -108 tlv320aic31xx-codec 0-0018: aic31xx_wait_bits: Failed! 0x25 was 0xcc239ca8 expected 0x0 (-108, 0x20, 0 us) tlv320aic31xx-codec 0-0018: ASoC: POST_PMD: HPL Driver event failed: -1 tlv320aic31xx-codec 0-0018: ASoC: error at snd_soc_component_update_bits on tlv320aic31xx-codec.0-0018: -108 tlv320aic31xx-codec 0-0018: ASoC: POST_PMD: SPL ClassD event failed: -108 tlv320aic31xx-codec 0-0018: ASoC: POST_PMD: SPR ClassD event failed: -108 tlv320aic31xx-codec 0-0018: ASoC: error at snd_soc_component_update_bits on tlv320aic31xx-codec.0-0018: -108 tlv320aic31xx-codec 0-0018: ASoC: error at snd_soc_component_update_bits on tlv320aic31xx-codec.0-0018: -108 tlv320aic31xx-codec 0-0018: ASoC: error at snd_soc_component_update_bits on tlv320aic31xx-codec.0-0018: -108 tlv320aic31xx-codec 0-0018: ASoC: error at snd_soc_component_update_bits on tlv320aic31xx-codec.0-0018: -108 tlv320aic31xx-codec 0-0018: ASoC: error at snd_soc_component_update_bits on tlv320aic31xx-codec.0-0018: -108 tlv320aic31xx-codec 0-0018: ASoC: error at snd_soc_component_update_bits on tlv320aic31xx-codec.0-0018: -108 tlv320aic31xx-codec 0-0018: ASoC: error at snd_soc_component_update_bits on tlv320aic31xx-codec.0-0018: -108 ``` When I look at he output of `dmesg`, I found this: ``` ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1506 at drivers/i2c/i2c-core.h:54 __i2c_transfer+0xac/0xb4 i2c i2c-0: Transfer while suspended Modules linked in: rfcomm stm32_adc stm32_timer_trigger stm32_lptimer_trigger sha256_generic libsha256 sha256_arm snd_soc_simple_card snd_soc_simple_card_utils cfg80211 stm32_crc32 hci_uart btqca stm32_cryp libdes crypto_engine snd_soc_stm32_i2s snd_soc_tlv320aic31xx bluetooth stm32_adc_core snd_soc_core atmel_mxt_ts snd_pcm_dmaengine snd_pcm ecdh_generic snd_timer snd ecc sgm4151x_charger soundcore libaes [last unloaded: wlan] CPU: 0 PID: 1506 Comm: sh Tainted: G O 5.15.67 #1 Hardware name: STM32 (Device Tree Support) [<c010e8cc>] (unwind_backtrace) from [<c010c120>] (show_stack+0x10/0x14) [<c010c120>] (show_stack) from [<c011dc1c>] (__warn+0xec/0x148) [<c011dc1c>] (__warn) from [<c0bed42c>] (warn_slowpath_fmt+0x78/0xac) [<c0bed42c>] (warn_slowpath_fmt) from [<c092ecdc>] (__i2c_transfer+0xac/0xb4) [<c092ecdc>] (__i2c_transfer) from [<c092ed80>] (i2c_transfer+0x9c/0x138) [<c092ed80>] (i2c_transfer) from [<c06f5a40>] (regmap_i2c_read+0x5c/0x98) [<c06f5a40>] (regmap_i2c_read) from [<c06f0e2c>] (_regmap_raw_read+0x10c/0x2a8) [<c06f0e2c>] (_regmap_raw_read) from [<c06f1008>] (_regmap_bus_read+0x40/0x6c) [<c06f1008>] (_regmap_bus_read) from [<c06ef9c4>] (_regmap_read+0x60/0x14c) [<c06ef9c4>] (_regmap_read) from [<c06effdc>] (_regmap_update_bits+0xb4/0xf4) [<c06effdc>] (_regmap_update_bits) from [<c06f00c0>] (_regmap_select_page+0xa4/0x108) [<c06f00c0>] (_regmap_select_page) from [<c06f07a8>] (_regmap_raw_write_impl+0x684/0x968) [<c06f07a8>] (_regmap_raw_write_impl) from [<c06f0b04>] (_regmap_bus_raw_write+0x78/0xa0) [<c06f0b04>] (_regmap_bus_raw_write) from [<c06efe40>] (_regmap_write+0x4c/0x134) [<c06efe40>] (_regmap_write) from [<c06f0010>] (_regmap_update_bits+0xe8/0xf4) [<c06f0010>] (_regmap_update_bits) from [<c06f1820>] (regmap_update_bits_base+0x50/0x74) [<c06f1820>] (regmap_update_bits_base) from [<bf0d0980>] (snd_soc_component_update_bits+0x78/0x124 [snd_soc_core]) [<bf0d0980>] (snd_soc_component_update_bits [snd_soc_core]) from [<bf0daa20>] (dapm_seq_run_coalesced+0x14c/0x1a4 [snd_soc_core]) [<bf0daa20>] (dapm_seq_run_coalesced [snd_soc_core]) from [<bf0dab68>] (dapm_seq_run+0xf0/0x350 [snd_soc_core]) [<bf0dab68>] (dapm_seq_run [snd_soc_core]) from [<bf0db170>] (dapm_power_widgets+0x3a8/0x530 [snd_soc_core]) [<bf0db170>] (dapm_power_widgets [snd_soc_core]) from [<bf0cc214>] (snd_soc_dapm_sync+0x48/0x54 [snd_soc_core]) [<bf0cc214>] (snd_soc_dapm_sync [snd_soc_core]) from [<bf0c652c>] (snd_soc_suspend+0xf0/0x230 [snd_soc_core]) [<bf0c652c>] (snd_soc_suspend [snd_soc_core]) from [<c06df188>] (dpm_run_callback+0x48/0x134) [<c06df188>] (dpm_run_callback) from [<c06df58c>] (__device_suspend+0x11c/0x4c4) [<c06df58c>] (__device_suspend) from [<c06e1c10>] (dpm_suspend+0x148/0x2cc) [<c06e1c10>] (dpm_suspend) from [<c06e20e8>] (dpm_suspend_start+0x64/0x6c) [<c06e20e8>] (dpm_suspend_start) from [<c0159f00>] (suspend_devices_and_enter+0x150/0x2b4) [<c0159f00>] (suspend_devices_and_enter) from [<c0bede38>] (enter_state+0x204/0x250) [<c0bede38>] (enter_state) from [<c015a0a4>] (pm_suspend+0x40/0x98) [<c015a0a4>] (pm_suspend) from [<c0158ae4>] (state_store+0x68/0xc8) [<c0158ae4>] (state_store) from [<c0330a68>] (kernfs_fop_write_iter+0x10c/0x1cc) [<c0330a68>] (kernfs_fop_write_iter) from [<c028ea40>] (vfs_write+0x298/0x45c) [<c028ea40>] (vfs_write) from [<c028ed4c>] (ksys_write+0x60/0xe4) [<c028ed4c>] (ksys_write) from [<c0100060>] (ret_fast_syscall+0x0/0x48) Exception stack(0xcffcbfa8 to 0xcffcbff0) bfa0: 00000004 005ac7d8 00000001 005ac7d8 00000004 00000000 bfc0: 00000004 005ac7d8 00000001 00000004 b6f01680 bee896d8 005a8448 005a8590 bfe0: 005a6dfc bee89690 004fcda4 b6dcb4f8 ---[ end trace 75457fd792755cae ]--- ``` I've been trying for a few days, but I can't find the source of the problem or a way to solve it. Is there anything I might be missing? I assume the problem is that it's trying to write to the registers after the suspend has happened, but I haven't been able to prove that either, and I wouldn't know how to fix that. Could that be what's happening here? Thanks.

1 1

Fwd: No sound on Lenovo P1 Gen 6 (00:1f.3 Multimedia audio controller: Intel Corporation Device 51ca (rev 01))
by Jeff Chua 15 Feb '24

15 Feb '24

[Reposted to ALSA Deveopment] I've just about everything but still couldn't get souns on the Lenovo P1 Gen 6. I've even tried SOF modules in the kernel but not working either. I'm just using standard alsa without other sound utils. Alsa has served me fine on IBM/Lenovo for many years. Latest on Lenovo X1 Gen 10. Sound works fine on the headphone plugged in to the headphone jack. Attached is my kernel .config ... # lspci 00:1f.3 Multimedia audio controller: Intel Corporation Device 51ca (rev 01) Subsystem: Lenovo Device 2317 Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx+ Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 64 Interrupt: pin A routed to IRQ 130 Region 0: Memory at 6452b30000 (64-bit, non-prefetchable) [size=16K] Region 4: Memory at 6452a00000 (64-bit, non-prefetchable) [size=1M] Capabilities: [50] Power Management version 3 Flags: PMEClk- DSI- D1- D2- AuxCurrent=55mA PME(D0-,D1-,D2-,D3hot+,D3cold+) Status: D0 NoSoftRst+ PME-Enable- DSel=0 DScale=0 PME- Capabilities: [80] Vendor Specific Information: Len=14 <?> Capabilities: [60] MSI: Enable+ Count=1/1 Maskable- 64bit+ Address: 00000000fee3c000 Data: 0020 Kernel driver in use: snd_hda_intel Kernel modules: snd_hda_intel # lsmod ... snd_ctl_led 20480 0 snd_hda_codec_realtek 147456 1 snd_hda_codec_generic 73728 1 snd_hda_codec_realtek snd_hda_codec_hdmi 61440 1 snd_hda_intel 36864 0 snd_intel_dspcfg 12288 1 snd_hda_intel snd_hda_codec 114688 4 snd_hda_codec_generic,snd_hda_codec_hdmi,snd_hda_intel,snd_hda_codec_realtek snd_hwdep 12288 1 snd_hda_codec snd_hda_core 69632 5 snd_hda_codec_generic,snd_hda_codec_hdmi,snd_hda_intel,snd_hda_codec,snd_hda_codec_realtek # dmesg ... snd_hda_codec_realtek hdaudioC0D0: autoconfig for ALC287: line_outs=1 (0x17/0x0/0x0/0x0/0x0) type:speaker snd_hda_codec_realtek hdaudioC0D0: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) snd_hda_codec_realtek hdaudioC0D0: hp_outs=1 (0x21/0x0/0x0/0x0/0x0) snd_hda_codec_realtek hdaudioC0D0: mono: mono_out=0x0 snd_hda_codec_realtek hdaudioC0D0: inputs: snd_hda_codec_realtek hdaudioC0D0: Mic=0x19 snd_hda_codec_realtek hdaudioC0D0: cs35l41_generic_fixup snd_hda_codec_realtek hdaudioC0D0: cs35l41_generic_fixup snd_hda_codec_realtek hdaudioC0D0: cs35l41_generic_fixup # uname -a Linux p1 6.8.0-rc4 #10 SMP PREEMPT_DYNAMIC Thu Feb 15 09:09:25 SGT 2024 x86_64 GNU/Linux I've the latest linux, alsa-lib, alsa-utils, alsa-plugins inatall ... # linux-kernel commit 8d3dea210042f54b952b481838c1e7dfc4ec751d (HEAD -> master, origin/master, origin/HEAD) Merge: 6004b044f771 8fa507083388 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Wed Feb 14 16:06:31 2024 -0800 And all the latest alsa-lib, alsa-utils, alsa-plugins install from git. # alsa-lib commit d8ce72f2561f23293ad0d98d30060c4a80a74c36 (HEAD -> master, origin/master, origin/HEAD) Author: Jaroslav Kysela <perex(a)perex.cz> Date: Fri Feb 9 11:21:04 2024 +0100 # alsa-utils commit 7cae8880234149b42d99abd603b387f91a8c7013 (HEAD -> master, tag: v1.2.11, origin/master, origin/HEAD) Author: Jaroslav Kysela <perex(a)perex.cz> Date: Mon Jan 29 13:57:30 2024 +0100 Release v1.2.11 # alsa-plugins commit 873a2966d22cd2956dc3c844fdc5d5573178502a (HEAD -> master, origin/master, origin/HEAD) Author: Takashi Iwai <tiwai(a)suse.de> Date: Sat Oct 7 09:20:41 2023 +0200 # cat /proc/cmdline BOOT_IMAGE=/linux/bzc1 root=/dev/nvme0n1p2 ro resume=/dev/nvme0n1p12 nosplash master=nvme0n1p fstype=f2fs reboot=acpi loop.max_part=63 modules=\"i915\" drm_kms_helper.poll=0 nomodeset vga=755 i915.modeset=1 i915.enable_fbc=1 i915.enable_guc=3 i915.enable_gvt=1 i915.enable_psr=0 i915.fastboot=1 iwlwifi.enable_ini=0 split_lock_detect=off thinkpad_acpi.fan_control=1 thinkpad_acpi.volume_control=1 x11 sd_mod.ssd=1 psmouse.synaptics_intertouch=1 Any help is very much appreciated! My best., Jeff

1 0

[v3 PATCH] ALSA: virtio: Fix "Coverity: virtsnd_kctl_tlv_op(): Uninitialized variables" warning.
by Aiswarya Cyriac 15 Feb '24

15 Feb '24

This commit fixes the following warning when building virtio_snd driver. " *** CID 1583619: Uninitialized variables (UNINIT) sound/virtio/virtio_kctl.c:294 in virtsnd_kctl_tlv_op() 288 289 break; 290 } 291 292 kfree(tlv); 293 vvv CID 1583619: Uninitialized variables (UNINIT) vvv Using uninitialized value "rc". 294 return rc; 295 } 296 297 /** 298 * virtsnd_kctl_get_enum_items() - Query items for the ENUMERATED element type. 299 * @snd: VirtIO sound device. " This warning is caused by the absence of the "default" branch in the switch-block, and is a false positive because the kernel calls virtsnd_kctl_tlv_op() only with values for op_flag processed in this block. Also, this commit unifies the cleanup path for all possible control paths in the callback function. Signed-off-by: Anton Yakovlev <anton.yakovlev(a)opensynergy.com> Signed-off-by: Aiswarya Cyriac <aiswarya.cyriac(a)opensynergy.com> Reported-by: coverity-bot <keescook+coverity-bot(a)chromium.org> Addresses-Coverity-ID: 1583619 ("Uninitialized variables") Fixes: d6568e3de42d ("ALSA: virtio: add support for audio controls") --- sound/virtio/virtio_kctl.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/sound/virtio/virtio_kctl.c b/sound/virtio/virtio_kctl.c index 0c6ac74aca1e..40606eb381af 100644 --- a/sound/virtio/virtio_kctl.c +++ b/sound/virtio/virtio_kctl.c @@ -253,8 +253,8 @@ static int virtsnd_kctl_tlv_op(struct snd_kcontrol *kcontrol, int op_flag, tlv = kzalloc(size, GFP_KERNEL); if (!tlv) { - virtsnd_ctl_msg_unref(msg); - return -ENOMEM; + rc = -ENOMEM; + goto on_cleanup; } sg_init_one(&sg, tlv, size); @@ -266,6 +266,11 @@ static int virtsnd_kctl_tlv_op(struct snd_kcontrol *kcontrol, int op_flag, case SNDRV_CTL_TLV_OP_READ: hdr->hdr.code = cpu_to_le32(VIRTIO_SND_R_CTL_TLV_READ); + /* Since virtsnd_ctl_msg_send() drops the reference, we increase + * the counter to be consistent with the on_cleanup path. + */ + virtsnd_ctl_msg_ref(msg); + rc = virtsnd_ctl_msg_send(snd, msg, NULL, &sg, false); if (!rc) { if (copy_to_user(utlv, tlv, size)) @@ -281,14 +286,26 @@ static int virtsnd_kctl_tlv_op(struct snd_kcontrol *kcontrol, int op_flag, hdr->hdr.code = cpu_to_le32(VIRTIO_SND_R_CTL_TLV_COMMAND); - if (copy_from_user(tlv, utlv, size)) + if (copy_from_user(tlv, utlv, size)) { rc = -EFAULT; - else + } else { + /* Same as the comment above */ + virtsnd_ctl_msg_ref(msg); + rc = virtsnd_ctl_msg_send(snd, msg, &sg, NULL, false); + } + + break; + default: + rc = -EINVAL; + WARN_ON(1); break; } +on_cleanup: + virtsnd_ctl_msg_unref(msg); + kfree(tlv); return rc; -- 2.43.0

2 2