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

sof-audio-pci-intel-tgl/soundwire 6.6.8 kernel outputs no sound on speakers but works on headphones
by Marc MERLIN 02 Jan '24

02 Jan '24

Howdy, First, apologies if I'm not sending this to the right place, I could not find an approrpriate soundwire/sof mailing list, please redirect me as needed (I had to find an old soundwire message for reference) laptop; Dell XPS 17 9730 merlin:~# lspci | grep -i audio 0000:00:1f.3 Multimedia audio controller: Intel Corporation Device 51ca (rev 01) stock mainline 6.6.8 shows the device, but no sound comes out, as if it were muted, but I do not see anyting muted in alsamixer. If I plug in headphones, sound works, if I unplug them, no sound on speakers. Nothing is shown as muted alsamixer and the sound levels look ok. I ran the test as root from console so that pulseaudio/pipewire doesn't get in the way. Under xorg pavucontrol detects when I plug in headphones, and says speaker unvailable, when I switch to headphones output it works, when I unplug the headphones, speaker unavailable goes back to speaker. So I kill X and pulseaudio, play audio on the console directly to alsa instead of pulse and same thing, it plays but no sound on the speakers, but sound on headphones when I plug them in Alsamixer is using default:0 sof-soundwire Any idea what could be muting the speakers if alsamixer shows them unmuted? It is a kernel bug or userspace bug? merlin:~# cat /proc/asound/* cat: /proc/asound/card0: Is a directory 0 [sofsoundwire ]: sof-soundwire - sof-soundwire Intel Soundwire SOF 1: : sequencer 2: [ 0- 0]: digital audio playback 3: [ 0- 1]: digital audio capture 4: [ 0- 2]: digital audio playback 5: [ 0- 4]: digital audio capture 6: [ 0- 5]: digital audio playback 7: [ 0- 6]: digital audio playback 8: [ 0- 7]: digital audio playback 9: [ 0- 2]: hardware dependent 10: [ 0] : control 33: : timer 00-02: HDA Codec 2 0 snd_soc_sof_sdw cat: /proc/asound/oss: Is a directory 00-00: Jack Out (*) : : playback 1 00-01: Jack In (*) : : capture 1 00-02: Speaker (*) : : playback 1 00-04: Microphone (*) : : capture 1 00-05: HDMI 1 (*) : : playback 1 00-06: HDMI 2 (*) : : playback 1 00-07: HDMI 3 (*) : : playback 1 cat: /proc/asound/seq: Is a directory cat: /proc/asound/sofsoundwire: Is a directory G0: system timer : 4000.000us (10000000 ticks) G3: HR timer : 0.001us (1000000000 ticks) Client sequencer queue 1 : stopped P0-0-0: PCM playback 0-0-0 : 21333.333us (1 ticks) SLAVE P0-1-1: PCM capture 0-1-1 : SLAVE P0-2-0: PCM playback 0-2-0 : SLAVE P0-4-1: PCM capture 0-4-1 : SLAVE P0-5-0: PCM playback 0-5-0 : SLAVE P0-6-0: PCM playback 0-6-0 : SLAVE P0-7-0: PCM playback 0-7-0 : SLAVE Advanced Linux Sound Architecture Driver Version k6.6.8-amd64-volpre-sysrq-20231218. merlin:~# dmesg | grep -E '(snd|sof|soundcore)' [ 0.090196] software IO TLB: area num 32. [ 1.567086] PCI-DMA: Using software bounce buffering for IO (SWIOTLB) [ 1.567087] software IO TLB: mapped [mem 0x0000000053683000-0x0000000057683000] (64MB) [ 15.941644] snd_hda_intel 0000:00:1f.3: vgaarb: pci_notify [ 15.941656] snd_hda_intel 0000:00:1f.3: runtime IRQ mapping not provided by arch [ 15.941662] snd_hda_intel 0000:00:1f.3: DSP detected with PCI class/subclass/prog-if info 0x040100 [ 15.942126] snd_hda_intel 0000:00:1f.3: SoundWire enabled on CannonLake+ platform, using SOF driver [ 15.942151] snd_hda_intel 0000:00:1f.3: vgaarb: pci_notify [ 16.089302] sof-audio-pci-intel-tgl 0000:00:1f.3: vgaarb: pci_notify [ 16.089311] sof-audio-pci-intel-tgl 0000:00:1f.3: runtime IRQ mapping not provided by arch [ 16.089317] sof-audio-pci-intel-tgl 0000:00:1f.3: power state changed by ACPI to D0 [ 16.089320] sof-audio-pci-intel-tgl 0000:00:1f.3: ACPI _REG connect evaluation failed (5) [ 16.089417] sof-audio-pci-intel-tgl 0000:00:1f.3: DSP detected with PCI class/subclass/prog-if info 0x040100 [ 16.089503] sof-audio-pci-intel-tgl 0000:00:1f.3: SoundWire enabled on CannonLake+ platform, using SOF driver [ 16.089542] sof-audio-pci-intel-tgl 0000:00:1f.3: enabling device (0000 -> 0002) [ 16.089937] sof-audio-pci-intel-tgl 0000:00:1f.3: vgaarb: pci_notify [ 16.090083] sof-audio-pci-intel-tgl 0000:00:1f.3: DSP detected with PCI class/subclass/prog-if 0x040100 [ 16.090473] sof-audio-pci-intel-tgl 0000:00:1f.3: bound 0000:00:02.0 (ops i915_audio_component_bind_ops [i915]) [ 16.102000] sof-audio-pci-intel-tgl 0000:00:1f.3: use msi interrupt mode [ 16.102152] sof-audio-pci-intel-tgl 0000:00:1f.3: enabling bus mastering [ 16.120035] sof-audio-pci-intel-tgl 0000:00:1f.3: hda codecs found, mask 4 [ 16.125472] sof-audio-pci-intel-tgl 0000:00:1f.3: Firmware info: version 2:2:0-57864 [ 16.125499] sof-audio-pci-intel-tgl 0000:00:1f.3: Firmware: ABI 3:22:1 Kernel ABI 3:23:0 [ 16.125522] sof-audio-pci-intel-tgl 0000:00:1f.3: unknown sof_ext_man header type 3 size 0x30 [ 16.218672] sof-audio-pci-intel-tgl 0000:00:1f.3: Firmware info: version 2:2:0-57864 [ 16.218704] sof-audio-pci-intel-tgl 0000:00:1f.3: Firmware: ABI 3:22:1 Kernel ABI 3:23:0 [ 16.235176] sof-audio-pci-intel-tgl 0000:00:1f.3: Topology: ABI 3:22:1 Kernel ABI 3:23:0 [ 16.235457] sof_sdw sof_sdw: ASoC: Parent card not yet available, widget card binding deferred [ 16.285146] sof_sdw sof_sdw: hda_dsp_hdmi_build_controls: no PCM in topology for HDMI converter 3 [ 16.304414] input: sof-soundwire Headset Jack as /devices/pci0000:00/0000:00:1f.3/sof_sdw/sound/card0/input12 [ 16.307681] input: sof-soundwire HDMI/DP,pcm=5 as /devices/pci0000:00/0000:00:1f.3/sof_sdw/sound/card0/input13 [ 16.314904] input: sof-soundwire HDMI/DP,pcm=6 as /devices/pci0000:00/0000:00:1f.3/sof_sdw/sound/card0/input14 [ 16.321892] input: sof-soundwire HDMI/DP,pcm=7 as /devices/pci0000:00/0000:00:1f.3/sof_sdw/sound/card0/input15 merlin:~# lsmod | grep -E "(^snd|sof|soundwire)" snd_seq_dummy 12288 0 snd_hrtimer 12288 1 snd_ctl_led 24576 0 snd_soc_sof_sdw 86016 3 snd_soc_intel_hda_dsp_common 16384 1 snd_soc_sof_sdw snd_soc_intel_sof_maxim_common 20480 1 snd_soc_sof_sdw snd_sof_probes 24576 0 snd_soc_rt711_sdca 53248 1 snd_soc_rt715_sdca 45056 1 snd_hda_codec_hdmi 90112 1 snd_soc_rt1316_sdw 28672 2 snd_soc_dmic 12288 0 snd_sof_pci_intel_tgl 12288 2 snd_sof_intel_hda_common 208896 1 snd_sof_pci_intel_tgl snd_sof_intel_hda 24576 1 snd_sof_intel_hda_common snd_sof_pci 24576 2 snd_sof_intel_hda_common,snd_sof_pci_intel_tgl snd_sof_xtensa_dsp 12288 1 snd_sof_intel_hda_common snd_sof 352256 4 snd_sof_pci,snd_sof_intel_hda_common,snd_sof_probes,snd_sof_intel_hda snd_sof_utils 16384 1 snd_sof snd_soc_hdac_hda 24576 1 snd_sof_intel_hda_common snd_soc_acpi_intel_match 98304 2 snd_sof_intel_hda_common,snd_sof_pci_intel_tgl snd_soc_acpi 16384 2 snd_soc_acpi_intel_match,snd_sof_intel_hda_common snd_hda_intel 57344 0 snd_intel_dspcfg 36864 3 snd_hda_intel,snd_sof,snd_sof_intel_hda_common snd_intel_sdw_acpi 16384 2 snd_sof_intel_hda_common,snd_intel_dspcfg snd_hda_codec 217088 5 snd_hda_codec_hdmi,snd_hda_intel,snd_soc_intel_hda_dsp_common,snd_soc_hdac_hda,snd_sof_intel_hda snd_hwdep 20480 1 snd_hda_codec soundwire_intel 69632 5 snd_sof_intel_hda_common snd_sof_intel_hda_mlink 40960 2 soundwire_intel,snd_sof_intel_hda_common soundwire_cadence 40960 1 soundwire_intel snd_hda_ext_core 40960 4 snd_sof_intel_hda_common,snd_soc_hdac_hda,snd_sof_intel_hda_mlink,snd_sof_intel_hda snd_hda_core 147456 8 snd_hda_codec_hdmi,snd_hda_intel,snd_hda_ext_core,snd_hda_codec,snd_soc_intel_hda_dsp_common,snd_sof_intel_hda_common,snd_soc_hdac_hda,snd_sof_intel_hda soundwire_generic_allocation 12288 1 soundwire_intel snd_soc_core 421888 11 snd_soc_sof_sdw,snd_soc_rt715_sdca,snd_soc_rt1316_sdw,soundwire_intel,snd_sof,snd_sof_intel_hda_common,snd_soc_hdac_hda,snd_soc_rt711_sdca,snd_soc_intel_sof_maxim_common,snd_sof_probes,snd_soc_dmic snd_compress 28672 2 snd_soc_core,snd_sof_probes snd_pcm_dmaengine 16384 1 snd_soc_core snd_pcm 192512 16 snd_soc_rt715_sdca,snd_hda_codec_hdmi,snd_soc_rt1316_sdw,snd_hda_intel,snd_hda_codec,soundwire_intel,snd_sof,snd_sof_intel_hda_common,snd_compress,snd_soc_rt711_sdca,snd_soc_core,snd_sof_utils,snd_soc_intel_sof_maxim_common,snd_hda_core,snd_pcm_dmaengine snd_seq_midi 20480 0 snd_seq_midi_event 16384 1 snd_seq_midi snd_rawmidi 53248 1 snd_seq_midi snd_seq 106496 9 snd_seq_midi,snd_seq_midi_event,snd_seq_dummy snd_seq_device 16384 3 snd_seq,snd_seq_midi,snd_rawmidi snd_timer 49152 3 snd_seq,snd_hrtimer,snd_pcm snd 155648 21 snd_ctl_led,snd_soc_sof_sdw,snd_seq,snd_seq_device,snd_hda_codec_hdmi,snd_hwdep,snd_hda_intel,snd_hda_codec,snd_sof,snd_timer,snd_compress,snd_soc_core,snd_pcm,snd_rawmidi Thanks, Marc -- "A mouse is a device used to point at the xterm you want to type in" - A.S.R. Home page: http://marc.merlins.org/

2 4

[PATCH v2 0/3] Support Dell models without _DSD
by Stefan Binding 02 Jan '24

02 Jan '24

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. Changes since v1: - Rebased onto for-linus 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 v2] ALSA: hda: cs35l41: Add HP override
by Lorenz Brun 02 Jan '24

02 Jan '24

This adds an override for a series of notebooks using a common config taken from HP's proprietary Windows driver. This has been tested on a HP 15-ey0xxxx device (subsystem 103C8A31) together with another Realtek quirk and the calibration files from the proprietary driver. Signed-off-by: Lorenz Brun <lorenz(a)brun.one> --- Changes in v2: - Use newly-introduced config table instead of function - Change boost cap value from 10uF to 24uF after cross-referencing my sources with the preexisting 103C89C6 entry. Just noticed that yesterday I sent out another copy of v1 instead of v2, sorry about that. sound/pci/hda/cs35l41_hda_property.c | 46 ++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/sound/pci/hda/cs35l41_hda_property.c b/sound/pci/hda/cs35l41_hda_property.c index c9eb70290973..c65b106ff1ab 100644 --- a/sound/pci/hda/cs35l41_hda_property.c +++ b/sound/pci/hda/cs35l41_hda_property.c @@ -42,6 +42,30 @@ static const struct cs35l41_config cs35l41_config_table[] = { * in the ACPI. The Reset GPIO is also valid, so we can use the Reset defined in _DSD. */ { "103C89C6", SPI, 2, INTERNAL, { CS35L41_RIGHT, CS35L41_LEFT, 0, 0 }, -1, -1, -1, 1000, 4500, 24 }, + + { "103C8A28", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8A29", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8A2A", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8A2B", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8A2C", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8A2D", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8A2E", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8A30", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8A31", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8BB3", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8BB4", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8BDF", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8BE0", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8BE1", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8BE2", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8BE9", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8BDD", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8BDE", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8BE3", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8BE5", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8BE6", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "103C8B3A", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 }, + { "104312AF", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 }, { "10431433", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 }, { "10431463", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 }, @@ -374,6 +398,28 @@ static const struct cs35l41_prop_model cs35l41_prop_model_table[] = { { "CSC3551", "10431F12", generic_dsd_config }, { "CSC3551", "10431F1F", generic_dsd_config }, { "CSC3551", "10431F62", generic_dsd_config }, + { "CSC3551", "103C8A28", generic_dsd_config }, + { "CSC3551", "103C8A29", generic_dsd_config }, + { "CSC3551", "103C8A2A", generic_dsd_config }, + { "CSC3551", "103C8A2B", generic_dsd_config }, + { "CSC3551", "103C8A2C", generic_dsd_config }, + { "CSC3551", "103C8A2D", generic_dsd_config }, + { "CSC3551", "103C8A2E", generic_dsd_config }, + { "CSC3551", "103C8A30", generic_dsd_config }, + { "CSC3551", "103C8A31", generic_dsd_config }, + { "CSC3551", "103C8BB3", generic_dsd_config }, + { "CSC3551", "103C8BB4", generic_dsd_config }, + { "CSC3551", "103C8BDF", generic_dsd_config }, + { "CSC3551", "103C8BE0", generic_dsd_config }, + { "CSC3551", "103C8BE1", generic_dsd_config }, + { "CSC3551", "103C8BE2", generic_dsd_config }, + { "CSC3551", "103C8BE9", generic_dsd_config }, + { "CSC3551", "103C8BDD", generic_dsd_config }, + { "CSC3551", "103C8BDE", generic_dsd_config }, + { "CSC3551", "103C8BE3", generic_dsd_config }, + { "CSC3551", "103C8BE5", generic_dsd_config }, + { "CSC3551", "103C8BE6", generic_dsd_config }, + { "CSC3551", "103C8B3A", generic_dsd_config }, {} }; -- 2.42.0

2 1

[PATCH 00/16] ALSA: hda/tas2781: Add tas2563 support
by Gergo Koteles 02 Jan '24

02 Jan '24

The tas2781-hda driver can be modified to support tas2563 as well. Before knowing this information, I created another series for a new driver. https://lore.kernel.org/lkml/cover.1701733441.git.soyer@irl.hu/ This series now extends tas2781-hda, addresses differences and fixes various bugs. The tas2563 is a smart amplifier. Similar to tas2562 but with DSP. Some Lenovo laptops have it to drive the bass speakers. By default, it is in software shutdown state. To make the DSP work it needs a firmware and some calibration data. The latter can be read from the EFI in Lenovo laptops. For the correct configuration it needs additional register data. It captured after running the Windows driver. The firmware can be extracted as TAS2563Firmware.bin from the Windows driver with innoextract. https://download.lenovo.com/consumer/mobiles/h5yd037fbfyy7kd0.exe The driver will search for it as TAS2XXX3870.bin with the 14ARB7. The captured registers extracted with TI's regtool: https://github.com/soyersoyer/tas2563rca/raw/main/INT8866RCA2.bin Gergo Koteles (16): ASoC: tas2781: add support for fw version 0x0503 ALSA: hda/tas2781: leave hda_component in usable state ASoC: tas2781: disable regmap regcache ALSA: hda/tas2781: handle missing calibration data ALSA: hda/tas2781: fix typos in comment ASoC: tas2781: add ptrs to calibration functions ALSA: hda/tas2781: load_calibration just load ASoC: tas2781: add configurable global_addr ALSA: hda/tas2781: add TAS2563 support for 14ARB7 ASoC: tas2781: check negative indexes ASoC: tas2781: use 0 as default prog/conf index ASoC: tas2781: move set_drv_data outside tasdevice_init ALSA: hda/tas2781: remove sound controls in unbind ALSA: hda/tas2781: call cleaner functions only once ALSA: hda/tas2781: reset the amp before component_add ALSA: hda/tas2781: configure the amp after firmware load include/sound/tas2781.h | 8 + sound/pci/hda/tas2781_hda_i2c.c | 364 +++++++++++++++++++----------- sound/soc/codecs/tas2781-comlib.c | 23 +- sound/soc/codecs/tas2781-fmwlib.c | 11 +- sound/soc/codecs/tas2781-i2c.c | 2 + 5 files changed, 270 insertions(+), 138 deletions(-) base-commit: ffc253263a1375a65fa6c9f62a893e9767fbebfa -- 2.43.0

4 39

[PATCH 00/23] ALSA: scarlett2: Refactor in preparation for gen4
by Geoffrey D. Bennett 02 Jan '24

02 Jan '24

Hi Takashi, This series is preparation for adding support for the Focusrite Scarlett 4th Gen devices. It applies on top of the previous series https://lore.kernel.org/linux-sound/cover.1703001053.git.g@b4.vu/ "ALSA: scarlett2: Firmware Upgrade and Error Handling Improvements". There should be no notable functional changes in this series, just refactoring/restructuring/renaming/reformatting. Regards, Geoffrey. Geoffrey D. Bennett (23): ALSA: scarlett2: Simplify enums by removing explicit values ALSA: scarlett2: Infer has_msd_mode from config items ALSA: scarlett2: Infer standalone switch from config items ALSA: scarlett2: Check for phantom persistence config item ALSA: scarlett2: Check presence of mixer using mux_assignment ALSA: scarlett2: Add config set struct ALSA: scarlett2: Remove scarlett2_config_sets array ALSA: scarlett2: Add check for config_item presence ALSA: scarlett2: Refactor scarlett2_usb_set_config() ALSA: scarlett2: Refactor scarlett2_config_save() ALSA: scarlett2: Formatting fixes ALSA: scarlett2: Parameterise notifications ALSA: scarlett2: Change num_mux_* from int to u8 ALSA: scarlett2: Refactor common port_count lookups ALSA: scarlett2: Remove struct scarlett2_usb_volume_status ALSA: scarlett2: Split dim_mute_update from vol_updated ALSA: scarlett2: Remove line_out_hw_vol device info entry ALSA: scarlett2: Allow for interfaces without per-channel volume ALSA: scarlett2: Add scarlett2_mixer_value_to_db() ALSA: scarlett2: Add #define for SCARLETT2_MIX_MAX ALSA: scarlett2: Rename db_scale_scarlett2_gain to volume ALSA: scarlett2: Split input_other into level/pad/air/phantom ALSA: scarlett2: Split direct_monitor out from monitor_other sound/usb/mixer_scarlett2.c | 1536 ++++++++++++++++++++--------------- 1 file changed, 879 insertions(+), 657 deletions(-) -- 2.43.0

2 24

[PATCH] ALSA: hda/tas2781: fix typos in comment
by Gergo Koteles 02 Jan '24

02 Jan '24

Correct typos. Signed-off-by: Gergo Koteles <soyer(a)irl.hu> --- sound/pci/hda/tas2781_hda_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index fb802802939e..8f63e3099d3e 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -421,9 +421,9 @@ static void tas2781_apply_calib(struct tasdevice_priv *tas_priv) } } -/* Update the calibrate data, including speaker impedance, f0, etc, into algo. +/* Update the calibration data, including speaker impedance, f0, etc, into algo. * Calibrate data is done by manufacturer in the factory. These data are used - * by Algo for calucating the speaker temperature, speaker membrance excursion + * by Algo for calculating the speaker temperature, speaker membrane excursion * and f0 in real time during playback. */ static int tas2781_save_calibration(struct tasdevice_priv *tas_priv) base-commit: c7e37b07cc7564a07125ae48c11fd1ca2bcbeae2 -- 2.43.0

3 2

[PATCH 00/11] ALSA: scarlett2: Firmware Upgrade and Error Handling Improvements
by Geoffrey D. Bennett 02 Jan '24

02 Jan '24

Hi Takashi, 11 patches to improve error handling and add firmware upgrade support to the scarlett2 driver. The notes below incorporate your feedback & include answers to your questions in response to my previous RFC v2 email. Patch 1 adds GitHub links for the repo where I share this code before submission here, and for issue reporting. Patches 2-5 add missing error/bounds checks. Patch 6 adds a missing lock. Patches 7-11 add support for firmware upgrades. The usage of the hwdep interface is as per my previous proposal: - ioctl pversion to check the protocol version - ioctl select_flash_segment SCARLETT2_SEGMENT_ID_SETTINGS - ioctl erase_flash_segment - ioctl get_erase_progress (optional) - ioctl select_flash_segment SCARLETT2_SEGMENT_ID_FIRMWARE - ioctl erase_flash_segment - ioctl get_erase_progress (optional) - write() the firmware - ioctl reboot Notes on the hwdep interface: - Conflicting mixer operations are denied with EBUSY. - The hwdep interface is marked as exclusive so there can't be conflicting hwdep operations. - Invalid sequences of operations (e.g. erase before select, write before erase) return an error. - The erase operation is asynchronous, and the progress can optionally be monitored by calling get_erase_progress. - If the erase progress is not monitored then subsequent hwdep operations will wait until the erase is complete. - The write operation is synchronous, but <1KB can be written per call, and it returns very quickly. On the user-side it looks like this with error checking omitted: while (offset < len) offset += snd_hwdep_write(hwdep, buf + offset, len - offset); - By using a subset of the firmware-upgrade steps, other useful high-level operations can be performed: reset-to-factory-defaults, reset-to-factory-firmware, or just reboot. - I considered combining the select and erase operations, but that would prevent a future read-flash operation if that ever become possible. - I considered separate one-shot ioctls for reset-to-factory, etc., but that prevents providing progress feedback. - In case the purpose of the other firmware segments is discovered in the future, this implementation would be able to support erase/write/read of them with minimal changes. Here is a user-space implementation of all of the above: https://github.com/geoffreybennett/scarlett2 This has been tested by me on every supported Scarlett 2nd, 3rd, 4th Gen and Clarett+ device, and tested by a handful of others on their Scarlett 4th Gen devices. Thanks, Geoffrey. Geoffrey D. Bennett (11): ALSA: scarlett2: Update maintainer info ALSA: scarlett2: Add missing error check to scarlett2_config_save() ALSA: scarlett2: Add missing error check to scarlett2_usb_set_config() ALSA: scarlett2: Add missing error checks to *_ctl_get() ALSA: scarlett2: Add clamp() in scarlett2_mixer_ctl_put() ALSA: scarlett2: Add missing mutex lock around get meter levels ALSA: scarlett2: Add #defines for firmware upgrade ALSA: scarlett2: Retrieve useful flash segment numbers ALSA: scarlett2: Add skeleton hwdep/ioctl interface ALSA: scarlett2: Add ioctl commands to erase flash segments ALSA: scarlett2: Add support for uploading new firmware MAINTAINERS | 7 +- include/uapi/sound/scarlett2.h | 54 ++ sound/usb/mixer_scarlett2.c | 914 ++++++++++++++++++++++++++++++--- 3 files changed, 901 insertions(+), 74 deletions(-) create mode 100644 include/uapi/sound/scarlett2.h -- 2.43.0

2 13

[PATCH] ALSA: hda/tas2781: do not use regcache
by Gergo Koteles 02 Jan '24

02 Jan '24

There are two problems with using regcache in this module. The amplifier has 3 addressing levels (BOOK, PAGE, REG). The firmware contains blocks that must be written to BOOK 0x8C. The regcache doesn't know anything about BOOK, so regcache_sync writes invalid values to the actual BOOK. The module handles 2 or more separate amplifiers. The amplifiers have different register values, and the module uses only one regmap/regcache for all the amplifiers. The regcache_sync only writes the last amplifier used. The module successfully restores all the written register values (RC profile, program, configuration, calibration) without regcache. Remove regcache functions and set regmap cache_type to REGCACHE_NONE. Link: https://lore.kernel.org/r/21a183b5a08cb23b193af78d4b1114cc59419272.17019064… Fixes: 5be27f1e3ec9 ("ALSA: hda/tas2781: Add tas2781 HDA driver") CC: stable(a)vger.kernel.org Signed-off-by: Gergo Koteles <soyer(a)irl.hu> --- sound/pci/hda/tas2781_hda_i2c.c | 17 +---------------- sound/soc/codecs/tas2781-comlib.c | 2 +- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index 2fb1a7037c82..e4c54b2a012c 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -717,8 +717,6 @@ static int tas2781_runtime_suspend(struct device *dev) tas_priv->tasdevice[i].cur_conf = -1; } - regcache_cache_only(tas_priv->regmap, true); - regcache_mark_dirty(tas_priv->regmap); mutex_unlock(&tas_priv->codec_lock); @@ -730,20 +728,11 @@ static int tas2781_runtime_resume(struct device *dev) struct tasdevice_priv *tas_priv = dev_get_drvdata(dev); unsigned long calib_data_sz = tas_priv->ndev * TASDEVICE_SPEAKER_CALIBRATION_SIZE; - int ret; dev_dbg(tas_priv->dev, "Runtime Resume\n"); mutex_lock(&tas_priv->codec_lock); - regcache_cache_only(tas_priv->regmap, false); - ret = regcache_sync(tas_priv->regmap); - if (ret) { - dev_err(tas_priv->dev, - "Failed to restore register cache: %d\n", ret); - goto out; - } - tasdevice_prmg_load(tas_priv, tas_priv->cur_prog); /* If calibrated data occurs error, dsp will still works with default @@ -752,10 +741,9 @@ static int tas2781_runtime_resume(struct device *dev) if (tas_priv->cali_data.total_sz > calib_data_sz) tas2781_apply_calib(tas_priv); -out: mutex_unlock(&tas_priv->codec_lock); - return ret; + return 0; } static int tas2781_system_suspend(struct device *dev) @@ -770,10 +758,7 @@ static int tas2781_system_suspend(struct device *dev) return ret; /* Shutdown chip before system suspend */ - regcache_cache_only(tas_priv->regmap, false); tasdevice_tuning_switch(tas_priv, 1); - regcache_cache_only(tas_priv->regmap, true); - regcache_mark_dirty(tas_priv->regmap); /* * Reset GPIO may be shared, so cannot reset here. diff --git a/sound/soc/codecs/tas2781-comlib.c b/sound/soc/codecs/tas2781-comlib.c index ffb26e4a7e2f..933cd008e9f5 100644 --- a/sound/soc/codecs/tas2781-comlib.c +++ b/sound/soc/codecs/tas2781-comlib.c @@ -39,7 +39,7 @@ static const struct regmap_range_cfg tasdevice_ranges[] = { static const struct regmap_config tasdevice_regmap = { .reg_bits = 8, .val_bits = 8, - .cache_type = REGCACHE_RBTREE, + .cache_type = REGCACHE_NONE, .ranges = tasdevice_ranges, .num_ranges = ARRAY_SIZE(tasdevice_ranges), .max_register = 256 * 128, base-commit: 916d051730ae48aef8b588fd096fefca4bc0590a -- 2.43.0

3 2

[PATCH 1/2] ALSA: hda/tas2781: move set_drv_data outside tasdevice_init
by Gergo Koteles 02 Jan '24

02 Jan '24

allow driver specific driver data in tas2781-hda-i2c and tas2781-i2c Fixes: ef3bcde75d06 ("ASoC: tas2781: Add tas2781 driver") CC: stable(a)vger.kernel.org Signed-off-by: Gergo Koteles <soyer(a)irl.hu> --- sound/pci/hda/tas2781_hda_i2c.c | 2 ++ sound/soc/codecs/tas2781-comlib.c | 2 -- sound/soc/codecs/tas2781-i2c.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index e4c54b2a012c..769604375745 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -659,6 +659,8 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt) if (!tas_priv) return -ENOMEM; + dev_set_drvdata(&clt->dev, tas_priv); + tas_priv->irq_info.irq = clt->irq; ret = tas2781_read_acpi(tas_priv, device_name); if (ret) diff --git a/sound/soc/codecs/tas2781-comlib.c b/sound/soc/codecs/tas2781-comlib.c index 933cd008e9f5..00e35169ae49 100644 --- a/sound/soc/codecs/tas2781-comlib.c +++ b/sound/soc/codecs/tas2781-comlib.c @@ -316,8 +316,6 @@ int tasdevice_init(struct tasdevice_priv *tas_priv) tas_priv->tasdevice[i].cur_conf = -1; } - dev_set_drvdata(tas_priv->dev, tas_priv); - mutex_init(&tas_priv->codec_lock); out: diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index 55cd5e3c23a5..917b1c15f71d 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -689,6 +689,8 @@ static int tasdevice_i2c_probe(struct i2c_client *i2c) if (!tas_priv) return -ENOMEM; + dev_set_drvdata(&i2c->dev, tas_priv); + if (ACPI_HANDLE(&i2c->dev)) { acpi_id = acpi_match_device(i2c->dev.driver->acpi_match_table, &i2c->dev); base-commit: 916d051730ae48aef8b588fd096fefca4bc0590a prerequisite-patch-id: da39452ca686d78e5accad1c2c4aa22a5f5a6a65 -- 2.43.0

2 2

[PATCH] ASoC: fsl_rpmsg: Fix error handler with pm_runtime_enable
by Chancel Liu 02 Jan '24

02 Jan '24

There is error message when defer probe happens: fsl_rpmsg rpmsg_audio: Unbalanced pm_runtime_enable! Fix the error handler with pm_runtime_enable. Fixes: b73d9e6225e8 ("ASoC: fsl_rpmsg: Add CPU DAI driver for audio base on rpmsg") Signed-off-by: Chancel Liu <chancel.liu(a)nxp.com> --- sound/soc/fsl/fsl_rpmsg.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_rpmsg.c b/sound/soc/fsl/fsl_rpmsg.c index 5c5c04ce9db7..00852f174a69 100644 --- a/sound/soc/fsl/fsl_rpmsg.c +++ b/sound/soc/fsl/fsl_rpmsg.c @@ -238,7 +238,7 @@ static int fsl_rpmsg_probe(struct platform_device *pdev) ret = devm_snd_soc_register_component(&pdev->dev, &fsl_component, &fsl_rpmsg_dai, 1); if (ret) - return ret; + goto err_pm_disable; rpmsg->card_pdev = platform_device_register_data(&pdev->dev, "imx-audio-rpmsg", @@ -248,16 +248,22 @@ static int fsl_rpmsg_probe(struct platform_device *pdev) if (IS_ERR(rpmsg->card_pdev)) { dev_err(&pdev->dev, "failed to register rpmsg card\n"); ret = PTR_ERR(rpmsg->card_pdev); - return ret; + goto err_pm_disable; } return 0; + +err_pm_disable: + pm_runtime_disable(&pdev->dev); + return ret; } static void fsl_rpmsg_remove(struct platform_device *pdev) { struct fsl_rpmsg *rpmsg = platform_get_drvdata(pdev); + pm_runtime_disable(&pdev->dev); + if (rpmsg->card_pdev) platform_device_unregister(rpmsg->card_pdev); } -- 2.42.0

2 1