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

Re: Re: [PATCH] ALSA: hda/realtek: the bass speaker can't output sound on Yoga 9i
by R Guerra 21 Dec '23

21 Dec '23

Hello, sorry to inconvenience you. I'm having the same problem with the bass speakers on my new 9i pro. Did you made another post or something that explains better what I need to do to fix this? I didn't realy understand what I needed to do (i'm learning linux now) Thank you for your attention.

1 1

[PATCH 1/1] ALSA: hda: cs35l41: Dell Fiorano add missing _DSD properties
by Aleksandrs Vinarskis 21 Dec '23

21 Dec '23

Dell XPS 9530 (2023) has two SPI connected CS35L41 amplifiers, however is missing _DSD properties, cs-gpios and has a firmware bug which caps SPI controller's speed to unusable 3051Hz. This patch adds _DSD properties and sets second cs-gpio. In case SPI speed bug is detected, it will not initialize the device to avoid hangs on wake up. Resolution of SPI speed bug requires either a patch to `intel-lpss.c` or an UEFI update with corrected values from Dell. Tested with locally applied patch to `intel-lpss` on multiple XPS 9530 devices. Co-developed-by: Jasper Smet <josbeir(a)gmail.com> Signed-off-by: Jasper Smet <josbeir(a)gmail.com> Signed-off-by: Aleksandrs Vinarskis <alex.vinarskis(a)gmail.com> --- sound/pci/hda/cs35l41_hda_property.c | 47 ++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/sound/pci/hda/cs35l41_hda_property.c b/sound/pci/hda/cs35l41_hda_property.c index c83328971728..69446a794397 100644 --- a/sound/pci/hda/cs35l41_hda_property.c +++ b/sound/pci/hda/cs35l41_hda_property.c @@ -7,9 +7,55 @@ // Author: Stefan Binding <sbinding(a)opensource.cirrus.com> #include <linux/gpio/consumer.h> +#include <linux/spi/spi.h> #include <linux/string.h> #include "cs35l41_hda_property.h" +/* + * Device 10280BEB (Dell XPS 9530) doesn't have _DSD at all. Moreover, pin that is typically + * used for `speaker_id` is missing. SPI's cs-gpios definitions are also missing. + */ +static int dell_fiorano_no_acpi(struct cs35l41_hda *cs35l41, struct device *physdev, int id, + const char *hid) +{ + struct cs35l41_hw_cfg *hw_cfg = &cs35l41->hw_cfg; + struct spi_device *spi = to_spi_device(cs35l41->dev); + + /* + * 10280BEB has a firmware bug, which wrongly enables clock divider for intel-lpss + * Resultant SPI clock is 100Mhz/32767=3051Hz, which leads to ~3 minute hang on boot/wake up + * Avoid initializing device if lpss was not patched/fixed UEFI was not installed + */ + if (spi->max_speed_hz < CS35L41_SPI_MAX_FREQ) { + dev_err(cs35l41->dev, "SPI's max_speed_hz is capped at %u Hz, will not continue to avoid hanging\n", + spi->max_speed_hz); + return -EINVAL; + } + + dev_info(cs35l41->dev, "Adding DSD properties for %s\n", cs35l41->acpi_subsystem_id); + + /* check SPI address to assign the index */ + cs35l41->index = id; + cs35l41->channel_index = 0; + /* 10280BEB is missing pin which is typically assigned to `spk-id-gpios` */ + cs35l41->speaker_id = cs35l41_get_speaker_id(physdev, cs35l41->index, 2, -1); + cs35l41->reset_gpio = gpiod_get_index(physdev, NULL, 1, GPIOD_OUT_LOW); + + hw_cfg->spk_pos = cs35l41->index ? 1 : 0; // 0th L, 1st R + hw_cfg->bst_type = CS35L41_EXT_BOOST; + hw_cfg->gpio1.func = CS35l41_VSPK_SWITCH; + hw_cfg->gpio1.valid = true; + hw_cfg->gpio2.func = CS35L41_INTERRUPT; + hw_cfg->gpio2.valid = true; + hw_cfg->valid = true; + + /* Add second cs-gpio here */ + if (cs35l41->index) + spi->cs_gpiod = gpiod_get_index(physdev, NULL, 0, GPIOD_OUT_HIGH); + + return 0; +} + /* * Device CLSA010(0/1) doesn't have _DSD so a gpiod_get by the label reset won't work. * And devices created by serial-multi-instantiate don't have their device struct @@ -92,6 +138,7 @@ static const struct cs35l41_prop_model cs35l41_prop_model_table[] = { { "CLSA0100", NULL, lenovo_legion_no_acpi }, { "CLSA0101", NULL, lenovo_legion_no_acpi }, { "CSC3551", "103C89C6", hp_vision_acpi_fix }, + { "CSC3551", "10280BEB", dell_fiorano_no_acpi }, {} }; -- 2.40.1

5 12

[PATCH v1 0/3] Support Dell models without _DSD
by Stefan Binding 21 Dec '23

21 Dec '23

Add Quirks and driver properties for Dell models. Driver properties are required since these models do not have _DSD. Additionally, some laptops, including some of these, have an issue with their BIOS which causes the SPI speed to be set too slow. To ensure a decent performance for laptops with this slow speed, disable firmware loading. Running without firmware results in lower volume. Stefan Binding (3): ALSA: hda: cs35l41: Support additional Dell models without _DSD ALSA: hda: cs35l41: Prevent firmware load if SPI speed too low ALSA: hda/realtek: Add quirks for Dell models sound/pci/hda/cs35l41_hda.c | 25 ++++++++-- sound/pci/hda/cs35l41_hda.h | 12 ++++- sound/pci/hda/cs35l41_hda_i2c.c | 2 +- sound/pci/hda/cs35l41_hda_property.c | 74 +++++++++++++++------------- sound/pci/hda/cs35l41_hda_spi.c | 2 +- sound/pci/hda/patch_realtek.c | 13 +++++ 6 files changed, 87 insertions(+), 41 deletions(-) -- 2.34.1

2 4

[PATCH v1 0/7] Add support for various laptops using CS35L41 HDA without _DSD
by Stefan Binding 21 Dec '23

21 Dec '23

The CS35L41 HDA driver requires various system defined properties to configure the driver for an individual system. For some laptops, these properties are missing in the BIOS. To be able to support these laptops, there is a mechanism in the driver to get this configuration from a lookup table, to be able to add or patch _DSD as necessary. However this mechanism currently only allows for laptops to be patched one at a time, however, in the case where there are many laptops which need to be configured generically, a generic function has been added, with an additional lookup table to the individual laptops, indexed by SSID. To support laptops using SPI without _DSD, an additional workaround is needed to be able to support the SPI Chip Select GPIOs whose resources are defined inside the _CRS for the Speaker ACPI Node. This workaround only works for SPI laptops which contain up to 2 amps, since the SPI controller would not allow more than 2 amps to be instantiated without the cs-gpios entry in _DSD. These patches add support for various ASUS laptops without _DSD, but the framework added here allows for support for more laptops in the future for other manufacturers. Support for laptops without _DSD from other manufacturers is coming in the future. Note: for systems which use modified _DSD to emulate the missing _DSD, these patches are incompatible, and the modified _DSD must be removed in order for the support through this framework to work for those laptops. Stefan Binding (7): ALSA: hda: cs35l41: Add config table to support many laptops without _DSD ALSA: hda: cs35l41: Support additional ASUS ROG 2023 models ALSA: hda/realtek: Add quirks for ASUS ROG 2023 models ALSA: hda: cs35l41: Support additional ASUS Zenbook 2022 Models ALSA: hda/realtek: Add quirks for ASUS Zenbook 2022 Models ALSA: hda: cs35l41: Support additional ASUS Zenbook 2023 Models ALSA: hda/realtek: Add quirks for ASUS Zenbook 2023 Models sound/pci/hda/cs35l41_hda.c | 2 + sound/pci/hda/cs35l41_hda.h | 5 +- sound/pci/hda/cs35l41_hda_property.c | 362 ++++++++++++++++++++++++--- sound/pci/hda/patch_realtek.c | 39 ++- 4 files changed, 353 insertions(+), 55 deletions(-) -- 2.34.1

3 9

[PATCH v1 0/2] Minor fixes for CS35L41 HDA Property driver
by Stefan Binding 21 Dec '23

21 Dec '23

Minor issues were found in static analysis. First fix ensures unitialised variables will never be freed. Second fix only compiles in the SPI workaround if SPI is enabled in the kernel. Stefan Binding (2): ALSA: hda: cs35l41: Do not allow uninitialised variables to be freed ALSA: hda: cs35l41: Only add SPI CS GPIO if SPI is enabled in kernel sound/pci/hda/cs35l41_hda_property.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.34.1

2 4

[GIT PULL] ASoC fixes for v6.7-rc7
by Mark Brown 21 Dec '23

21 Dec '23

The following changes since commit 0a10d15280a385e5971fb58a6d2eddbf7c0aa9f3: ASoC: qcom: Limit Digital gains on speaker (2023-12-04 21:42:29 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.7-rc7 for you to fetch changes up to 8f0f01647550daf9cd8752c1656dcb0136d79ce1: ASoC: fsl_sai: Fix channel swap issue on i.MX8MP (2023-12-19 13:23:39 +0000) ---------------------------------------------------------------- ASoC: Fixes for v6.7 Quite a big collection of fixes, as ever mostly in drivers. There's one framework fix for the HDMI CODEC where it wasn't handling startup properly for some controllers, and one new x86 quirk, but otherwise all local fixes or dropping things we don't want to see in a release. ---------------------------------------------------------------- Charles Keepax (1): ASoC: cs42l43: Don't enable bias sense during type detect Curtis Malainey (1): ASoC: SOF: mediatek: mt8186: Revert Add Google Steelix topology compatible Gergo Koteles (1): ASoC: tas2781: check the validity of prm_no/cfg_no Hans de Goede (2): ASoC: Intel: bytcr_rt5640: Add quirk for the Medion Lifetab S10346 ASoC: Intel: bytcr_rt5640: Add new swapped-speakers quirk Jerome Brunet (1): ASoC: hdmi-codec: fix missing report for jack initial status Ricardo Rivera-Matos (3): ASoC: cs35l45: Use modern pm_ops ASoC: cs35l45: Prevent IRQ handling when suspending/resuming ASoC: cs35l45: Prevents spinning during runtime suspend Richard Fitzgerald (1): ASoC: Intel: soc-acpi-intel-mtl-match: Change CS35L56 prefixes to AMPn Shengjiu Wang (1): ASoC: fsl_sai: Fix channel swap issue on i.MX8MP sound/soc/codecs/cs35l45-i2c.c | 2 +- sound/soc/codecs/cs35l45-spi.c | 2 +- sound/soc/codecs/cs35l45.c | 56 +++++++++++++++++++++-- sound/soc/codecs/cs42l43-jack.c | 23 +++++----- sound/soc/codecs/hdmi-codec.c | 12 ++++- sound/soc/codecs/tas2781-fmwlib.c | 14 +++--- sound/soc/fsl/fsl_sai.c | 3 ++ sound/soc/intel/boards/bytcr_rt5640.c | 31 ++++++++++--- sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 8 ++-- sound/soc/sof/mediatek/mt8186/mt8186.c | 3 -- 10 files changed, 115 insertions(+), 39 deletions(-)

2 1

[PATCH v2 00/17] Prepare the PowerQUICC QMC and TSA for the HDLC QMC driver
by Herve Codina 21 Dec '23

21 Dec '23

Hi, This series updates PowerQUICC QMC and TSA drivers to prepare the support for the QMC HDLC driver. Patches were previously sent as part of a full feature series: "Add support for QMC HDLC, framer infrastructure and PEF2256 framer" [1] The full feature series reached the v9 iteration. The v1 was sent the 07/25/2023 followed by the other iterations (07/26/2023, 08/09/2023, 08/18/2023, 09/12/2023, 09/22/2023, 09/28/2023, 10/11/23, 11/15/2023) and was ready to be merged in its v8. https://lore.kernel.org/linux-kernel/20231025123215.5caca7d4@kernel.org/ The lack of feedback from the Freescale SoC and the Quicc Engine maintainers (i.e. drivers/soc/fsl/qe/ to which the QMC and TSA drivers belong) blocks the entire full feature series. These patches are fixes and improvements to TSA and QMC drivers. These drivers were previously acked by Li Yang but without any feedback from Li Yang nor Qiang Zhao the series cannot move forward. In order to ease the review/merge, the full feature series has been split and this series contains patches related to the PowerQUICC SoC part (QMC and TSA). - Perform some fixes (patches 1 to 5) - Add support for child devices (patch 6) - Add QMC dynamic timeslot support (patches 7 to 17) Compare to the previous iteration: https://lore.kernel.org/linux-kernel/20231128140818.261541-1-herve.codina@b… this v2 series: - Removes a forward declaration in the driver. - Adds kernel test robot tags as the issue was detected. - Adds some missing Cc: stable. Best regards, Hervé [1]: https://lore.kernel.org/linux-kernel/20231115144007.478111-1-herve.codina@b… Changes v1 -> v2: - Patch 1 Add 'Reported-by: kernel test robot <lkp(a)intel.com>' Add 'Closes: https://lore.kernel.org/oe-kbuild-all/202312051959.9YdRIYbg-lkp@intel.com/' Add 'Cc: stable(a)vger.kernel.org' - Patch 2, 3 Add 'Cc: stable(a)vger.kernel.org - Patch 15 Move qmc_setup_chan_trnsync() to avoid a forward declaration. Patches extracted: - Patch 1..6 : full feature series patch 1..6 - Patch 7..17 : full feature series patch 9..19 Herve Codina (17): soc: fsl: cpm1: tsa: Fix __iomem addresses declaration soc: fsl: cpm1: qmc: Fix __iomem addresses declaration soc: fsl: cpm1: qmc: Fix rx channel reset soc: fsl: cpm1: qmc: Extend the API to provide Rx status soc: fsl: cpm1: qmc: Remove inline function specifiers soc: fsl: cpm1: qmc: Add support for child devices soc: fsl: cpm1: qmc: Introduce available timeslots masks soc: fsl: cpm1: qmc: Rename qmc_setup_tsa* to qmc_init_tsa* soc: fsl: cpm1: qmc: Introduce qmc_chan_setup_tsa* soc: fsl: cpm1: qmc: Remove no more needed checks from qmc_check_chans() soc: fsl: cpm1: qmc: Check available timeslots in qmc_check_chans() soc: fsl: cpm1: qmc: Add support for disabling channel TSA entries soc: fsl: cpm1: qmc: Split Tx and Rx TSA entries setup soc: fsl: cpm1: qmc: Introduce is_tsa_64rxtx flag soc: fsl: cpm1: qmc: Handle timeslot entries at channel start() and stop() soc: fsl: cpm1: qmc: Remove timeslots handling from setup_chan() soc: fsl: cpm1: qmc: Introduce functions to change timeslots at runtime drivers/soc/fsl/qe/qmc.c | 658 ++++++++++++++++++++++++++-------- drivers/soc/fsl/qe/tsa.c | 22 +- include/soc/fsl/qe/qmc.h | 27 +- sound/soc/fsl/fsl_qmc_audio.c | 2 +- 4 files changed, 538 insertions(+), 171 deletions(-) -- 2.43.0

1 18

Fwd: No sound drivers on HP Envy x360 ey0xxx
by Bagas Sanjaya 21 Dec '23

21 Dec '23

Hi all, I'm forwarding a Bugzilla report [1], as many developers don't take a look on Bugzilla. The reporter (Lukas Voreck <overloader(a)tutanota.com>, Cc'ed) wrote: > On an HP Envy x360 ey0xxx (and probably similar devices) there is no sound from > the internal Speakers whatsoever. > > Currently I'm using the patch found here > https://lore.kernel.org/all/20220811053950.11810-1-faenkhauser@gmail.com/T/ But > with newer kernel versions that patch wont work, It will fail to build (tested > with 6.6.6) > > This is my first issue here and my first encounter with hardware issues, if I > can provide more Info, please let me know Thanks. [1]: https://bugzilla.kernel.org/show_bug.cgi?id=218280 -- An old man doll... just what I always wanted! - Clara

1 0

[PATCH v11 00/41] Introduce QC USB SND audio offloading support
by Wesley Cheng 21 Dec '23

21 Dec '23

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 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 (3): xhci: add support to allocate several interrupters xhci: add helper to stop endpoint and wait for completion xhci: sideband: add initial api to register a sideband entity Wesley Cheng (38): 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 dt-bindings: usb: xhci: Add num-hc-interrupters definition dt-bindings: usb: dwc3: Limit num-hc-interrupters definition 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: Add SND kcontrol for fetching USB offload status 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: mixer: Add USB offloading mixer control ALSA: usb-audio: qcom: Use card and PCM index from QMI request ALSA: usb-audio: Allow for rediscovery of connected USB SND devices 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 + .../devicetree/bindings/usb/snps,dwc3.yaml | 4 + .../devicetree/bindings/usb/usb-xhci.yaml | 6 + 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 | 5 +- drivers/usb/host/Kconfig | 9 + drivers/usb/host/Makefile | 2 + drivers/usb/host/xhci-debugfs.c | 2 +- drivers/usb/host/xhci-mem.c | 113 +- drivers/usb/host/xhci-plat.c | 2 + drivers/usb/host/xhci-ring.c | 48 +- drivers/usb/host/xhci-sideband.c | 374 ++++ drivers/usb/host/xhci.c | 115 +- drivers/usb/host/xhci.h | 19 +- .../sound/qcom,q6dsp-lpass-ports.h | 1 + include/linux/usb/xhci-sideband.h | 67 + include/sound/q6usboffload.h | 20 + include/sound/soc-usb.h | 90 + sound/soc/Makefile | 2 +- sound/soc/qcom/Kconfig | 4 + sound/soc/qcom/common.c | 41 + sound/soc/qcom/common.h | 4 +- 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 | 401 ++++ sound/soc/qcom/sm8250.c | 14 +- sound/soc/soc-usb.c | 538 +++++ sound/usb/Kconfig | 19 + sound/usb/Makefile | 3 +- sound/usb/card.c | 123 ++ sound/usb/card.h | 24 + sound/usb/endpoint.c | 1 + sound/usb/format.c | 1 + sound/usb/helper.c | 1 + sound/usb/mixer.c | 5 + sound/usb/mixer_usb_offload.c | 82 + sound/usb/mixer_usb_offload.h | 14 + sound/usb/pcm.c | 94 +- sound/usb/pcm.h | 11 + sound/usb/qcom/Makefile | 2 + sound/usb/qcom/qc_audio_offload.c | 1909 +++++++++++++++++ sound/usb/qcom/usb_audio_qmi_v01.c | 892 ++++++++ sound/usb/qcom/usb_audio_qmi_v01.h | 162 ++ 52 files changed, 6161 insertions(+), 82 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/soc-usb.c create mode 100644 sound/usb/mixer_usb_offload.c create mode 100644 sound/usb/mixer_usb_offload.h create mode 100644 sound/usb/qcom/Makefile 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 41

[PATCH v4] sof-soundwire: Add basic support for cs42l43
by Charles Keepax 20 Dec '23

20 Dec '23

cs42l43 is a codec device, add basic support for it. Including a dual channel DMIC input, stereo headphones, and a mono headset microphone. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- Changes since v3: - Rebase on GitHub series - Add control remapping for the PDM volume/switch Little earlier than expected, still reviewing the workings behind the scenes but this all tests out fine. So no need to hold everything up on my account. Thanks, Charles ucm2/codecs/cs42l43/init.conf | 14 ++++++++ ucm2/sof-soundwire/cs42l43-dmic.conf | 26 +++++++++++++++ ucm2/sof-soundwire/cs42l43.conf | 46 +++++++++++++++++++++++++++ ucm2/sof-soundwire/sof-soundwire.conf | 2 +- 4 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 ucm2/codecs/cs42l43/init.conf create mode 100644 ucm2/sof-soundwire/cs42l43-dmic.conf create mode 100644 ucm2/sof-soundwire/cs42l43.conf diff --git a/ucm2/codecs/cs42l43/init.conf b/ucm2/codecs/cs42l43/init.conf new file mode 100644 index 0000000..10a6e1f --- /dev/null +++ b/ucm2/codecs/cs42l43/init.conf @@ -0,0 +1,14 @@ +# cs42l43 specific control settings + +LibraryConfig.remap.Config { + ctl.default.map { + "name='cs42l43 PDM2 Switch'" { + "name='cs42l43 Decimator 3 Switch'".vindex.0 0 + "name='cs42l43 Decimator 4 Switch'".vindex.1 0 + } + "name='cs42l43 PDM2 Volume'" { + "name='cs42l43 Decimator 3 Volume'".vindex.0 0 + "name='cs42l43 Decimator 4 Volume'".vindex.1 0 + } + } +} diff --git a/ucm2/sof-soundwire/cs42l43-dmic.conf b/ucm2/sof-soundwire/cs42l43-dmic.conf new file mode 100644 index 0000000..d5f895d --- /dev/null +++ b/ucm2/sof-soundwire/cs42l43-dmic.conf @@ -0,0 +1,26 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Mic" { + Comment "Microphones" + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + cset "name='cs42l43 DP1TX1 Input' 'Decimator 3'" + cset "name='cs42l43 DP1TX2 Input' 'Decimator 4'" + ] + + DisableSequence [ + cset "name='cs42l43 DP1TX1 Input' 'None'" + cset "name='cs42l43 DP1TX2 Input' 'None'" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},4" + CaptureMixer "default:${CardId}" + CaptureMixerElem "cs42l43 PDM2" + } +} diff --git a/ucm2/sof-soundwire/cs42l43.conf b/ucm2/sof-soundwire/cs42l43.conf new file mode 100644 index 0000000..1702cf0 --- /dev/null +++ b/ucm2/sof-soundwire/cs42l43.conf @@ -0,0 +1,46 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Headphones" { + Comment "Headphones" + + EnableSequence [ + cset "name='cs42l43 Headphone L Input 1' 'DP5RX1'" + cset "name='cs42l43 Headphone R Input 1' 'DP5RX2'" + ] + + DisableSequence [ + cset "name='cs42l43 Headphone L Input 1' 'None'" + cset "name='cs42l43 Headphone R Input 1' 'None'" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId},0" + PlaybackVolume "cs42l43 Headphone Digital Volume" + JackControl "Headphone Jack" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + EnableSequence [ + cset "name='cs42l43 ADC1 Input' 'IN1'" + cset "name='cs42l43 Decimator 1 Mode' 'ADC'" + + cset "name='cs42l43 DP1TX1 Input' 'Decimator 1'" + cset "name='cs42l43 DP1TX2 Input' 'Decimator 1'" + ] + + DisableSequence [ + cset "name='cs42l43 DP1TX1 Input' 'None'" + cset "name='cs42l43 DP1TX2 Input' 'None'" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},4" + CaptureMixerElem "cs42l43 Decimator 1" + JackControl "Headset Mic Jack" + } +} diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf index 18b1bf8..35a262c 100644 --- a/ucm2/sof-soundwire/sof-soundwire.conf +++ b/ucm2/sof-soundwire/sof-soundwire.conf @@ -47,7 +47,7 @@ DefineRegex { If.hs_init { Condition { Type RegexMatch - Regex "(rt5682|rt700|rt711|rt713(-sdca)?)" + Regex "(cs42l43|rt5682|rt700|rt711|rt713(-sdca)?)" String "${var:HeadsetCodec1}" } True.Include.hs_init.File "/codecs/${var:HeadsetCodec1}/init.conf" -- 2.39.2

1 0