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

[PATCH] ALSA: scarlett2: Add Focusrite Clarett+ 2Pre and 4Pre support
by Geoffrey D. Bennett 07 Oct '23

07 Oct '23

The Focusrite Clarett+ series uses the same protocol as the Scarlett Gen 2 and Gen 3 series. This patch adds support for the Clarett+ 2Pre and Clarett+ 4Pre similarly to the existing 8Pre support by adding appropriate entries to the scarlett2 driver. The Clarett 2Pre USB and 4Pre USB presumably use the same protocol as well, so support for them can easily be added if someone can test. Signed-off-by: Geoffrey D. Bennett <g(a)b4.vu> --- sound/usb/mixer_quirks.c | 2 + sound/usb/mixer_scarlett_gen2.c | 97 ++++++++++++++++++++++++++++++++- 2 files changed, 98 insertions(+), 1 deletion(-) diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 9911859d2750..0db94ead1b93 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -3421,6 +3421,8 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) case USB_ID(0x1235, 0x8214): /* Focusrite Scarlett 18i8 3rd Gen */ case USB_ID(0x1235, 0x8215): /* Focusrite Scarlett 18i20 3rd Gen */ case USB_ID(0x1235, 0x8208): /* Focusrite Clarett 8Pre USB */ + case USB_ID(0x1235, 0x820a): /* Focusrite Clarett+ 2Pre */ + case USB_ID(0x1235, 0x820b): /* Focusrite Clarett+ 4Pre */ case USB_ID(0x1235, 0x820c): /* Focusrite Clarett+ 8Pre */ err = snd_scarlett_gen2_init(mixer); break; diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c index 481a80e160de..57e7fdff6905 100644 --- a/sound/usb/mixer_scarlett_gen2.c +++ b/sound/usb/mixer_scarlett_gen2.c @@ -6,7 +6,7 @@ * - 6i6/18i8/18i20 Gen 2 * - Solo/2i2/4i4/8i6/18i8/18i20 Gen 3 * - Clarett 8Pre USB - * - Clarett+ 8Pre + * - Clarett+ 2Pre/4Pre/8Pre * * Copyright (c) 2018-2023 by Geoffrey D. Bennett <g at b4.vu> * Copyright (c) 2020-2021 by Vladimir Sadovnikov <sadko4u(a)gmail.com> @@ -60,6 +60,10 @@ * Support for Clarett USB 8Pre added in Sep 2023 (thanks to Philippe * Perrot for confirmation). * + * Support for Clarett+ 4Pre and 2Pre added in Sep 2023 (thanks to + * Gregory Rozzo for donating a 4Pre, and David Sherwood and Patrice + * Peterson for usbmon output). + * * This ALSA mixer gives access to (model-dependent): * - input, output, mixer-matrix muxes * - mixer-matrix gain stages @@ -832,6 +836,95 @@ static const struct scarlett2_device_info s18i20_gen3_info = { } }, }; +static const struct scarlett2_device_info clarett_2pre_info = { + .config_set = SCARLETT2_CONFIG_SET_CLARETT, + .line_out_hw_vol = 1, + .level_input_count = 2, + .air_input_count = 2, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + "Headphones L", + "Headphones R", + }, + + .port_count = { + [SCARLETT2_PORT_TYPE_NONE] = { 1, 0 }, + [SCARLETT2_PORT_TYPE_ANALOGUE] = { 2, 4 }, + [SCARLETT2_PORT_TYPE_SPDIF] = { 2, 0 }, + [SCARLETT2_PORT_TYPE_ADAT] = { 8, 0 }, + [SCARLETT2_PORT_TYPE_MIX] = { 10, 18 }, + [SCARLETT2_PORT_TYPE_PCM] = { 4, 12 }, + }, + + .mux_assignment = { { + { SCARLETT2_PORT_TYPE_PCM, 0, 12 }, + { SCARLETT2_PORT_TYPE_ANALOGUE, 0, 4 }, + { SCARLETT2_PORT_TYPE_MIX, 0, 18 }, + { SCARLETT2_PORT_TYPE_NONE, 0, 8 }, + { 0, 0, 0 }, + }, { + { SCARLETT2_PORT_TYPE_PCM, 0, 8 }, + { SCARLETT2_PORT_TYPE_ANALOGUE, 0, 4 }, + { SCARLETT2_PORT_TYPE_MIX, 0, 18 }, + { SCARLETT2_PORT_TYPE_NONE, 0, 8 }, + { 0, 0, 0 }, + }, { + { SCARLETT2_PORT_TYPE_PCM, 0, 2 }, + { SCARLETT2_PORT_TYPE_ANALOGUE, 0, 4 }, + { SCARLETT2_PORT_TYPE_NONE, 0, 26 }, + { 0, 0, 0 }, + } }, +}; + +static const struct scarlett2_device_info clarett_4pre_info = { + .config_set = SCARLETT2_CONFIG_SET_CLARETT, + .line_out_hw_vol = 1, + .level_input_count = 2, + .air_input_count = 4, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + "Headphones 1 L", + "Headphones 1 R", + "Headphones 2 L", + "Headphones 2 R", + }, + + .port_count = { + [SCARLETT2_PORT_TYPE_NONE] = { 1, 0 }, + [SCARLETT2_PORT_TYPE_ANALOGUE] = { 8, 6 }, + [SCARLETT2_PORT_TYPE_SPDIF] = { 2, 2 }, + [SCARLETT2_PORT_TYPE_ADAT] = { 8, 0 }, + [SCARLETT2_PORT_TYPE_MIX] = { 10, 18 }, + [SCARLETT2_PORT_TYPE_PCM] = { 8, 18 }, + }, + + .mux_assignment = { { + { SCARLETT2_PORT_TYPE_PCM, 0, 18 }, + { SCARLETT2_PORT_TYPE_ANALOGUE, 0, 6 }, + { SCARLETT2_PORT_TYPE_SPDIF, 0, 2 }, + { SCARLETT2_PORT_TYPE_MIX, 0, 18 }, + { SCARLETT2_PORT_TYPE_NONE, 0, 8 }, + { 0, 0, 0 }, + }, { + { SCARLETT2_PORT_TYPE_PCM, 0, 14 }, + { SCARLETT2_PORT_TYPE_ANALOGUE, 0, 6 }, + { SCARLETT2_PORT_TYPE_SPDIF, 0, 2 }, + { SCARLETT2_PORT_TYPE_MIX, 0, 18 }, + { SCARLETT2_PORT_TYPE_NONE, 0, 8 }, + { 0, 0, 0 }, + }, { + { SCARLETT2_PORT_TYPE_PCM, 0, 12 }, + { SCARLETT2_PORT_TYPE_ANALOGUE, 0, 6 }, + { SCARLETT2_PORT_TYPE_SPDIF, 0, 2 }, + { SCARLETT2_PORT_TYPE_NONE, 0, 24 }, + { 0, 0, 0 }, + } }, +}; + static const struct scarlett2_device_info clarett_8pre_info = { .config_set = SCARLETT2_CONFIG_SET_CLARETT, .line_out_hw_vol = 1, @@ -907,6 +1000,8 @@ static const struct scarlett2_device_entry scarlett2_devices[] = { /* Supported Clarett USB/Clarett+ devices */ { USB_ID(0x1235, 0x8208), &clarett_8pre_info, "Clarett USB" }, + { USB_ID(0x1235, 0x820a), &clarett_2pre_info, "Clarett+" }, + { USB_ID(0x1235, 0x820b), &clarett_4pre_info, "Clarett+" }, { USB_ID(0x1235, 0x820c), &clarett_8pre_info, "Clarett+" }, /* End of list */ -- 2.41.0

2 2

[PATCH 1/2] ALSA: aloop: Add support for the non-interleaved access mode
by Ivan Orlov 06 Oct '23

06 Oct '23

The current version of the loopback driver supports interleaved access mode only. This patch introduces support for the non-interleaved access mode. When in the interleaved mode, the 'copy_play_buf' function copies data from the playback to the capture buffer using one memcpy call. This call copies samples for multiple, interleaved channels. In the non-interleaved mode we have multiple channel buffers, so we have to perform multiple memcpy calls to copy samples channel after channel. Add new function called 'copy_play_buf_part_n', which copies a part of each channel buffer from playback to capture. Modify the 'copy_play_buf' to use the corresponding memory copy function(just memcpy / copy_play_buf_part_n) depending on the access mode. Signed-off-by: Ivan Orlov <ivan.orlov0322(a)gmail.com> --- sound/drivers/aloop.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c index a38e602b4fc6..ab116b1fed96 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c @@ -158,6 +158,9 @@ struct loopback_pcm { unsigned long last_jiffies; /* If jiffies timer is used */ struct timer_list timer; + + /* size of per channel buffer in case of non-interleaved access */ + unsigned int channel_buf_n; }; static struct platform_device *devices[SNDRV_CARDS]; @@ -335,7 +338,8 @@ static int loopback_check_format(struct loopback_cable *cable, int stream) substream->runtime; check = runtime->format != cruntime->format || runtime->rate != cruntime->rate || - runtime->channels != cruntime->channels; + runtime->channels != cruntime->channels || + runtime->access != cruntime->access; if (!check) return 0; if (stream == SNDRV_PCM_STREAM_CAPTURE) { @@ -472,6 +476,7 @@ static int loopback_prepare(struct snd_pcm_substream *substream) dpcm->buf_pos = 0; dpcm->pcm_buffer_size = frames_to_bytes(runtime, runtime->buffer_size); + dpcm->channel_buf_n = dpcm->pcm_buffer_size / runtime->channels; if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { /* clear capture buffer */ dpcm->silent_size = dpcm->pcm_buffer_size; @@ -522,6 +527,22 @@ static void clear_capture_buf(struct loopback_pcm *dpcm, unsigned int bytes) } } +static void copy_play_buf_part_n(struct loopback_pcm *play, struct loopback_pcm *capt, + unsigned int size, unsigned int src_off, unsigned int dst_off) +{ + unsigned int channels = capt->substream->runtime->channels; + unsigned int size_p_ch = size / channels; + unsigned int src_off_ch = src_off / channels; + unsigned int dst_off_ch = dst_off / channels; + int i; + + for (i = 0; i < channels; i++) { + memcpy(capt->substream->runtime->dma_area + capt->channel_buf_n * i + dst_off_ch, + play->substream->runtime->dma_area + play->channel_buf_n * i + src_off_ch, + size_p_ch); + } +} + static void copy_play_buf(struct loopback_pcm *play, struct loopback_pcm *capt, unsigned int bytes) @@ -556,7 +577,11 @@ static void copy_play_buf(struct loopback_pcm *play, size = play->pcm_buffer_size - src_off; if (dst_off + size > capt->pcm_buffer_size) size = capt->pcm_buffer_size - dst_off; - memcpy(dst + dst_off, src + src_off, size); + if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED || + runtime->access == SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED) + copy_play_buf_part_n(play, capt, size, src_off, dst_off); + else + memcpy(dst + dst_off, src + src_off, size); capt->silent_size = 0; bytes -= size; if (!bytes) @@ -878,7 +903,7 @@ static const struct snd_pcm_hardware loopback_pcm_hardware = { .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | - SNDRV_PCM_INFO_RESUME), + SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_NONINTERLEAVED), .formats = (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_3BE | -- 2.34.1

3 6

[PATCH 0/4] ASoC: cs35l56: Update hibernate/wake sequences and enable hibernation
by Richard Fitzgerald 06 Oct '23

06 Oct '23

Update the hibernate and wake command sequences to meet the latest datasheet specification and enable hibernation for I2C and SPI control interfaces. Richard Fitzgerald (1): ASoC: cs35l56: Enable low-power hibernation mode on SPI Simon Trimmer (3): ASoC: cs35l56: Change hibernate sequence to use allow auto hibernate ASoC: cs35l56: Wake transactions need to be issued twice ASoC: cs35l56: Enable low-power hibernation mode on i2c include/sound/cs35l56.h | 1 + sound/soc/codecs/cs35l56-i2c.c | 1 + sound/soc/codecs/cs35l56-shared.c | 66 +++++++++++++++++++------------ sound/soc/codecs/cs35l56-spi.c | 1 + 4 files changed, 43 insertions(+), 26 deletions(-) -- 2.30.2

2 5

[PATCH 0/2] ASoC: SOF: ipc4: Take priority into cosideration when sorting pipelines
by Peter Ujfalusi 06 Oct '23

06 Oct '23

Hi, Add pipeline priority support for IPC4: Add support for parsing pipeline priorities from the topology. This will be used to break the tie between pipelines to set the trigger order when multiple pipelines are triggered simultaneously. Regards, Peter --- Rander Wang (2): ASoC: SOF: IPC4: get pipeline priority from topology ASoC: SOF: IPC4: sort pipeline based on priority sound/soc/sof/ipc4-pcm.c | 55 +++++++++++++++++++++++++++++------ sound/soc/sof/ipc4-topology.c | 5 ++-- 2 files changed, 48 insertions(+), 12 deletions(-) -- 2.42.0

2 3

[PATCH 0/3] ALSA: hda: Stream setup fixes
by Cezary Rojewski 06 Oct '23

06 Oct '23

Follow up to the recent hdac_stream-related series of mine [1]. Addresses three topics: - false-positive timeout (-110) messages that appear during firmware loading procedure - null-ptr-deref when assigning stub substream of COUPLED type. 'Stub' as precisely those kind of substreams are utilized for code-loading procedure - hstream->fifo_size initialization, superfluous '+1' The two fixes lead the way, there is no dependency of patch 3/3 on either of them. [1]: https://lore.kernel.org/alsa-devel/20230926080623.43927-1-cezary.rojewski@i… Cezary Rojewski (3): ALSA: hda: Fix possible null-ptr-deref when assigning a stream ALSA: hda: Fix stream fifo_size initialization ALSA: hda: Add code_loading parameter to stream setup include/sound/hdaudio.h | 2 +- include/sound/hdaudio_ext.h | 4 ++-- sound/hda/ext/hdac_ext_stream.c | 12 +++++++----- sound/hda/hdac_stream.c | 27 ++++++++++++++++----------- sound/pci/hda/hda_controller.c | 2 +- sound/pci/hda/hda_intel.c | 2 +- sound/soc/intel/avs/pcm.c | 2 +- sound/soc/intel/avs/probes.c | 2 +- sound/soc/intel/skylake/skl-pcm.c | 2 +- 9 files changed, 31 insertions(+), 24 deletions(-) -- 2.25.1

3 5

[GIT PULL] ASoC fixes for v6.6-rc5
by Mark Brown 06 Oct '23

06 Oct '23

The following changes since commit 31bb7bd9ffee50d09ec931998b823a86132ab807: ASoC: SOF: core: Only call sof_ops_free() on remove if the probe was successful (2023-09-15 17:14:22 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.6-rc5 for you to fetch changes up to 1426b9ba7c453755d182ebf7e7f2367ba249dcf4: ASoC: dt-bindings: fsl,micfil: Document #sound-dai-cells (2023-10-04 13:58:54 +0100) ---------------------------------------------------------------- ASoC: More fixes for v6.6 Some additional fixes for v6.6, some fairly unremarkable driver specific ones and a couple of minor core fixes for error handling and improved logging. ---------------------------------------------------------------- Alex Bee (1): dt-bindings: ASoC: rockchip: Add compatible for RK3128 spdif Amadeusz Sławiński (2): ASoC: core: Print component name when printing log ASoC: core: Do not call link_exit() on uninitialized rtd objects Antoine Gennart (1): ASoC: tlv320adc3xxx: BUG: Correct micbias setting Balamurugan C (2): ASoC: Intel: soc-acpi: Add entry for sof_es8336 in MTL match table. ASoC: Intel: soc-acpi: Add entry for HDMI_In capture support in MTL match table Fabio Estevam (1): ASoC: dt-bindings: fsl,micfil: Document #sound-dai-cells Kuninori Morimoto (2): ASoC: simple-card-utils: fixup simple_util_startup() error handling ASoC: simple-card: fixup asoc_simple_probe() error handling Mark Brown (1): ASoC: Intel: soc-acpi: Adding Es83x6 codec entry and Matthias Reichl (1): ASoC: hdmi-codec: Fix broken channel map reporting Miquel Raynal (1): ASoC: soc-generic-dmaengine-pcm: Fix function name in comment Pierre-Louis Bossart (2): ASoC: Intel: soc-acpi: fix Dell SKU 0B34 ASoC: Intel: sof_sdw: add support for SKU 0B14 Shengjiu Wang (2): ASoC: fsl_sai: Don't disable bitclock for i.MX8MP ASoC: fsl-asoc-card: use integer type for fll_id and pll_id Sven Frotscher (1): ASoC: amd: yc: Fix non-functional mic on Lenovo 82YM Vijendar Mukunda (1): ASoC: SOF: amd: fix for firmware reload failure after playback Zhang Shurong (1): ASoC: rt5682: Fix regulator enable/disable sequence .../devicetree/bindings/sound/fsl,micfil.yaml | 3 +++ .../devicetree/bindings/sound/rockchip-spdif.yaml | 1 + include/sound/soc.h | 2 ++ sound/soc/amd/yc/acp6x-mach.c | 7 ++++++ sound/soc/codecs/hdmi-codec.c | 5 ++++- sound/soc/codecs/rt5682-i2c.c | 10 ++++----- sound/soc/codecs/tlv320adc3xxx.c | 4 ++-- sound/soc/fsl/fsl-asoc-card.c | 12 +++++++---- sound/soc/fsl/fsl_sai.c | 9 ++++++-- sound/soc/generic/simple-card-utils.c | 3 ++- sound/soc/generic/simple-card.c | 6 ++++-- sound/soc/intel/boards/sof_es8336.c | 10 +++++++++ sound/soc/intel/boards/sof_sdw.c | 10 +++++++++ sound/soc/intel/common/soc-acpi-intel-adl-match.c | 12 +++++------ sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 25 ++++++++++++++++++++++ sound/soc/soc-core.c | 24 +++++++++++++++------ sound/soc/soc-generic-dmaengine-pcm.c | 4 ++-- sound/soc/sof/amd/pci-rmb.c | 1 - 18 files changed, 115 insertions(+), 33 deletions(-)

2 1

[PATCH] ASoC: amd: yc: Fix non-functional mic on Lenovo Yoga Slim 7 Pro 14ARH7 82UU
by Markus Meier 06 Oct '23

06 Oct '23

Hi, I own a Lenovo Yoga Slim 7 Pro 14ARH7 where the microphone is not showing up. I added the system to the quirk table and the mic is working correctly (but with very low volume) now. Here's an except from dmidecode: System Information Manufacturer: LENOVO Product Name: 82UU Version: Yoga Slim 7 Pro 14ARH7 SKU Number: LENOVO_MT_82UU_BU_idea_FM_Yoga Slim 7 Pro 14ARH7 Family: Yoga Slim 7 Pro 14ARH7 Please add this patch to the kernel and add it to the stable kernels too. I guess the microphone should have worked before. Seems to be a regression introduced by c008323fe361bd62a43d9fb29737dacd5c067fb7 Thank you very much Markus

3 4

[PATCH v3 0/4] ALSA: hda: Abstract and update HOST-stream setup procedure
by Cezary Rojewski 06 Oct '23

06 Oct '23

The patchset targets two intertwined topics: The driver shall poll SDxFIFOS to ensure a valid value is set by the controller after programming SDxFMT. Due to amount of users and limited-number of configuration available in our CI when compared to overall possibilities on the market, the check is non-blocking. Second topic relates to stream setup procedure. The procedure differs between HDAudio controller device revisions. Right now those differences are handled directly by a platform driver. Existing top-level 'if (pci->device == APL)' could be replaced by a abstraction in lower parts of the code instead. With that done, the two users are updated accordingly. In avs-driver case, this updates the flow to the recommended one. Changes in v3: - fixed issues pointed out by scripts/kernel-doc Changes in v2: - fixed ->host_setup assignment in patch 02/04 Cezary Rojewski (4): ALSA: hda: Poll SDxFIFOS after programming SDxFMT ALSA: hda: Introduce HOST stream setup mechanism ASoC: Intel: avs: Use helper to setup HOST stream ASoC: Intel: Skylake: Use helper to setup HOST stream include/sound/hda_register.h | 2 ++ include/sound/hdaudio.h | 3 +++ include/sound/hdaudio_ext.h | 3 +++ sound/hda/ext/hdac_ext_stream.c | 41 +++++++++++++++++++++++++++++++ sound/hda/hdac_stream.c | 8 ++++++ sound/soc/intel/avs/pcm.c | 2 +- sound/soc/intel/skylake/skl-pcm.c | 14 +---------- 7 files changed, 59 insertions(+), 14 deletions(-) -- 2.25.1

2 8

Intel RVP board change model
by Kailang 06 Oct '23

06 Oct '23

Hi Takashi, Intel RVP board has lose headset Mic issue via reboot state. Attach patch will solve it. BR, Kailang

2 1

[PATCH] ALSA: usb-audio: Fix microphone sound on Opencomm2 Headset
by Whale Chang 06 Oct '23

06 Oct '23

From: WhaleChang <whalechang(a)google.com> When a Opencomm2 Headset is connected to a Bluetooth USB dongle, the audio playback functions properly, but the microphone does not work. In the dmesg logs, there are messages indicating that the init_pitch function fails when the capture process begins. The microphone only functions when the ep pitch control is not set. Toggling the pitch control off bypasses the init_piatch function and allows the microphone to work. Signed-off-by: WhaleChang <whalechang(a)google.com> --- sound/usb/quirks.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 598659d761cc..d4bbef70d2f7 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1994,7 +1994,11 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip, /* mic works only when ep packet size is set to wMaxPacketSize */ fp->attributes |= UAC_EP_CS_ATTR_FILL_MAX; break; - + case USB_ID(0x3511, 0x2b1e): /* Opencomm2 UC USB Bluetooth dongle */ + /* mic works only when ep pitch control is not set */ + if (stream == SNDRV_PCM_STREAM_CAPTURE) + fp->attributes &= ~UAC_EP_CS_ATTR_PITCH_CONTROL; + break; } } -- 2.42.0.609.gbb76f46606-goog

1 0