August 2025 - Sound-open-firmware - mailman.alsa-project.org

Re: [PATCH v4 2/3] ALSA: compress_offload: Add SNDRV_COMPRESS_TSTAMP64 ioctl
by Vinod Koul 21 Aug '25

21 Aug '25

On 18-08-25, 15:05, Charles Keepax wrote: > On Tue, Aug 05, 2025 at 07:59:42AM +0200, Takashi Iwai wrote: > > On Tue, 05 Aug 2025 06:47:59 +0200, > > Vinod Koul wrote: > > > On 01-08-25, 10:27, Joris Verhaegen wrote: > > > > ret = snd_compr_update_tstamp(stream, &tstamp64); > > > > if (ret == 0) { > > > > - snd_compr_tstamp32_from_64(&tstamp32, &tstamp64); > > > > - ret = copy_to_user((struct snd_compr_tstamp __user *)arg, > > > > - &tstamp32, sizeof(tstamp32)) ? > > > > + if (is_32bit) { > > > > + snd_compr_tstamp32_from_64(&tstamp32, &tstamp64); > > > > + copy_from = &tstamp32; > > > > + copy_size = sizeof(tstamp32); > > > > + } > > > > > > Most of the applications and people would be 32bit right now and we > > > expect this to progressively change, but then this imposes a penalty as > > > default path is 64 bit, since we expect this ioctl to be called very > > > frequently, should we do this optimization for 64bit here? > > > > Through a quick glance over the patch, I don't think you'll hit the > > significant performance loss. It's merely a few bytes of extra copies > > before copy_to_user(), after all. But, of course, it'd be more > > convincing if anyone can test and give the actual numbers. That would be better > I am inclined to agree the impact should be very minimal and the > only alternative is a more complex implementation. I would vote > for leaving this as is. But yes, we can for now, go ahead. It is internal kernel flow can be adapted anytime :-) -- ~Vinod

2 1

[PATCH] ASoC: SOF: ipc4-pcm: Fix incorrect comparison with number of tdm_slots
by Richard Fitzgerald 19 Aug '25

19 Aug '25

In ipc4_ssp_dai_config_pcm_params_match() when comparing params_channels() against hw_config->tdm_slots the comparison should be a <= not a ==. The number of TDM slots must be enough for the number of required channels. But it can be greater. There are various reason why a I2S/TDM link has more TDM slots than a particular audio stream needs. The original comparison would fail on systems that had more TDM slots. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> Fixes: 8a07944a77e9 ("ASoC: SOF: ipc4-pcm: Look for best matching hw_config for SSP") --- sound/soc/sof/ipc4-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/ipc4-pcm.c b/sound/soc/sof/ipc4-pcm.c index 374dc10d10fd..86f7377fb92f 100644 --- a/sound/soc/sof/ipc4-pcm.c +++ b/sound/soc/sof/ipc4-pcm.c @@ -639,14 +639,14 @@ static int ipc4_ssp_dai_config_pcm_params_match(struct snd_sof_dev *sdev, if (params_rate(params) == le32_to_cpu(hw_config->fsync_rate) && params_width(params) == le32_to_cpu(hw_config->tdm_slot_width) && - params_channels(params) == le32_to_cpu(hw_config->tdm_slots)) { + params_channels(params) <= le32_to_cpu(hw_config->tdm_slots)) { current_config = le32_to_cpu(hw_config->id); partial_match = false; /* best match found */ break; } else if (current_config < 0 && params_rate(params) == le32_to_cpu(hw_config->fsync_rate) && - params_channels(params) == le32_to_cpu(hw_config->tdm_slots)) { + params_channels(params) <= le32_to_cpu(hw_config->tdm_slots)) { current_config = le32_to_cpu(hw_config->id); partial_match = true; /* keep looking for better match */ -- 2.39.5

1 0

Re: [PATCH v2] ASoC: SOF: imx: Remove error print for devm_add_action_or_reset()
by Mark Brown 12 Aug '25

12 Aug '25

On Tue, 05 Aug 2025 11:33:32 +0200, Waqar Hameed wrote: > When `devm_add_action_or_reset()` fails, it is due to a failed memory > allocation and will thus return `-ENOMEM`. `dev_err_probe()` doesn't do > anything when error is `-ENOMEM`. Therefore, remove the useless call to > `dev_err_probe()` when `devm_add_action_or_reset()` fails, and just > return the value instead. > > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: imx: Remove error print for devm_add_action_or_reset() commit: 9d6a51651faa577e5d2be9d67915b7621c5c589a All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

[PATCH] ASoC: SOF: Intel: hda-sdw-bpt: fix SND_SOF_SOF_HDA_SDW_BPT dependencies
by Arnd Bergmann 06 Aug '25

06 Aug '25

From: Arnd Bergmann <arnd(a)arndb.de> The hda-sdw-bpt code links against the soundwire driver, but that fails when trying to link from built-in code into loadable module: x86_64-linux-ld: vmlinux.o: in function `intel_ace2x_bpt_close_stream.isra.0': intel_ace2x.c:(.text+0x137a531): undefined reference to `hda_sdw_bpt_close' x86_64-linux-ld: vmlinux.o: in function `intel_ace2x_bpt_send_async': intel_ace2x.c:(.text+0x137aa45): undefined reference to `hda_sdw_bpt_open' x86_64-linux-ld: intel_ace2x.c:(.text+0x137ab67): undefined reference to `hda_sdw_bpt_close' x86_64-linux-ld: intel_ace2x.c:(.text+0x137ac30): undefined reference to `hda_sdw_bpt_send_async' x86_64-linux-ld: vmlinux.o: in function `intel_ace2x_bpt_wait': intel_ace2x.c:(.text+0x137aced): undefined reference to `hda_sdw_bpt_wait' Ensure that both SOUNDWIRE_INTEL and SND_SOF_SOF_HDA_SDW_BPT are selected at the same time by SND_SOC_SOF_INTEL_LNL, and that this happens even if SND_SOC_SOF_INTEL_SOUNDWIRE is a loadable module but SND_SOC_SOF_INTEL_LNL is built-in. This follows the same logic as commit c5a61db9bf89 ("ASoC: SOF: fix intel-soundwire link failure"). Fixes: 5d5cb86fb46e ("ASoC: SOF: Intel: hda-sdw-bpt: add helpers for SoundWire BPT DMA") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/sof/intel/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index 7e92aa2f7e39..9722ae43e87c 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -272,9 +272,10 @@ config SND_SOC_SOF_METEORLAKE config SND_SOC_SOF_INTEL_LNL tristate + select SOUNDWIRE_INTEL if SND_SOC_SOF_INTEL_SOUNDWIRE != n select SND_SOC_SOF_HDA_GENERIC select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE - select SND_SOF_SOF_HDA_SDW_BPT if SND_SOC_SOF_INTEL_SOUNDWIRE + select SND_SOF_SOF_HDA_SDW_BPT if SND_SOC_SOF_INTEL_SOUNDWIRE != n select SND_SOC_SOF_IPC4 select SND_SOC_SOF_INTEL_MTL -- 2.39.5

3 2

Re: [PATCH v2] ASoC: SOF: imx: Remove error print for devm_add_action_or_reset()
by Daniel Baluta 06 Aug '25

06 Aug '25

On Tue, Aug 5, 2025 at 12:33 PM Waqar Hameed <waqar.hameed(a)axis.com> wrote: > > When `devm_add_action_or_reset()` fails, it is due to a failed memory > allocation and will thus return `-ENOMEM`. `dev_err_probe()` doesn't do > anything when error is `-ENOMEM`. Therefore, remove the useless call to > `dev_err_probe()` when `devm_add_action_or_reset()` fails, and just > return the value instead. > > Signed-off-by: Waqar Hameed <waqar.hameed(a)axis.com> Reviewed-by: Daniel Baluta <daniel.baluta(a)nxp.com>

1 0

Re: [PATCH v4 2/3] ALSA: compress_offload: Add SNDRV_COMPRESS_TSTAMP64 ioctl
by Vinod Koul 05 Aug '25

05 Aug '25

On 01-08-25, 10:27, Joris Verhaegen wrote: > The previous patch introduced the internal infrastructure for handling > 64-bit timestamps. This patch exposes this capability to user-space. > > Define the new ioctl command SNDRV_COMPRESS_TSTAMP64, which allows > applications to fetch the overflow-safe struct snd_compr_tstamp64. > > The ioctl dispatch table is updated to handle the new command by > calling a new snd_compr_tstamp64 handler, while the legacy path is > renamed to snd_compr_tstamp32 for clarity. > > This patch bumps the SNDRV_COMPRESS_VERSION to 0.4.0. > > Reviewed-by: Miller Liang <millerliang(a)google.com> > Tested-by: Joris Verhaegen <verhaegen(a)google.com> > Signed-off-by: Joris Verhaegen <verhaegen(a)google.com> > --- > include/uapi/sound/compress_offload.h | 5 +++-- > sound/core/compress_offload.c | 19 +++++++++++++------ > 2 files changed, 16 insertions(+), 8 deletions(-) > > diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h > index abd0ea3f86ee..70b8921601f9 100644 > --- a/include/uapi/sound/compress_offload.h > +++ b/include/uapi/sound/compress_offload.h > @@ -13,8 +13,7 @@ > #include <sound/asound.h> > #include <sound/compress_params.h> > > - > -#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 3, 0) > +#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 4, 0) > /** > * struct snd_compressed_buffer - compressed buffer > * @fragment_size: size of buffer fragment in bytes > @@ -208,6 +207,7 @@ struct snd_compr_task_status { > * Note: only codec params can be changed runtime and stream params cant be > * SNDRV_COMPRESS_GET_PARAMS: Query codec params > * SNDRV_COMPRESS_TSTAMP: get the current timestamp value > + * SNDRV_COMPRESS_TSTAMP64: get the current timestamp value in 64 bit format > * SNDRV_COMPRESS_AVAIL: get the current buffer avail value. > * This also queries the tstamp properties > * SNDRV_COMPRESS_PAUSE: Pause the running stream > @@ -230,6 +230,7 @@ struct snd_compr_task_status { > struct snd_compr_metadata) > #define SNDRV_COMPRESS_TSTAMP _IOR('C', 0x20, struct snd_compr_tstamp) > #define SNDRV_COMPRESS_AVAIL _IOR('C', 0x21, struct snd_compr_avail) > +#define SNDRV_COMPRESS_TSTAMP64 _IOR('C', 0x22, struct snd_compr_tstamp64) > #define SNDRV_COMPRESS_PAUSE _IO('C', 0x30) > #define SNDRV_COMPRESS_RESUME _IO('C', 0x31) > #define SNDRV_COMPRESS_START _IO('C', 0x32) > diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c > index d3164aa07158..445220fdb6a0 100644 > --- a/sound/core/compress_offload.c > +++ b/sound/core/compress_offload.c > @@ -736,18 +736,23 @@ snd_compr_set_metadata(struct snd_compr_stream *stream, unsigned long arg) > return retval; > } > > -static inline int > -snd_compr_tstamp(struct snd_compr_stream *stream, unsigned long arg) > +static inline int snd_compr_tstamp(struct snd_compr_stream *stream, > + unsigned long arg, bool is_32bit) > { > struct snd_compr_tstamp64 tstamp64 = { 0 }; > struct snd_compr_tstamp tstamp32 = { 0 }; > + const void *copy_from = &tstamp64; > + size_t copy_size = sizeof(tstamp64); > int ret; > > ret = snd_compr_update_tstamp(stream, &tstamp64); > if (ret == 0) { > - snd_compr_tstamp32_from_64(&tstamp32, &tstamp64); > - ret = copy_to_user((struct snd_compr_tstamp __user *)arg, > - &tstamp32, sizeof(tstamp32)) ? > + if (is_32bit) { > + snd_compr_tstamp32_from_64(&tstamp32, &tstamp64); > + copy_from = &tstamp32; > + copy_size = sizeof(tstamp32); > + } Most of the applications and people would be 32bit right now and we expect this to progressively change, but then this imposes a penalty as default path is 64 bit, since we expect this ioctl to be called very frequently, should we do this optimization for 64bit here? > + ret = copy_to_user((void __user *)arg, copy_from, copy_size) ? > -EFAULT : > 0; > } > @@ -1327,7 +1332,9 @@ static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg) > > switch (cmd) { > case SNDRV_COMPRESS_TSTAMP: > - return snd_compr_tstamp(stream, arg); > + return snd_compr_tstamp(stream, arg, true); > + case SNDRV_COMPRESS_TSTAMP64: > + return snd_compr_tstamp(stream, arg, false); > case SNDRV_COMPRESS_AVAIL: > return snd_compr_ioctl_avail(stream, arg); > case SNDRV_COMPRESS_PAUSE: > -- > 2.50.1.565.gc32cd1483b-goog -- ~Vinod

2 1

Re: [PATCH v4 3/3] ALSA: compress_offload: Add SNDRV_COMPRESS_AVAIL64 ioctl
by Vinod Koul 05 Aug '25

05 Aug '25

On 01-08-25, 10:27, Joris Verhaegen wrote: > The previous patch introduced a 64-bit timestamp ioctl > (SNDRV_COMPRESS_TSTAMP64). To provide a consistent API, this patch > adds a corresponding 64-bit version of the SNDRV_COMPRESS_AVAIL ioctl. > > A new struct snd_compr_avail64 is added to the UAPI, which includes > the 64-bit timestamp. The existing ioctl implementation is refactored > to handle both the 32-bit and 64-bit variants. > > Reviewed-by: Miller Liang <millerliang(a)google.com> > Tested-by: Joris Verhaegen <verhaegen(a)google.com> > Signed-off-by: Joris Verhaegen <verhaegen(a)google.com> > --- > include/uapi/sound/compress_offload.h | 11 +++++++ > sound/core/compress_offload.c | 45 +++++++++++++++++---------- > 2 files changed, 40 insertions(+), 16 deletions(-) > > diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h > index 70b8921601f9..26f756cc2e62 100644 > --- a/include/uapi/sound/compress_offload.h > +++ b/include/uapi/sound/compress_offload.h > @@ -84,6 +84,16 @@ struct snd_compr_avail { > struct snd_compr_tstamp tstamp; > } __attribute__((packed, aligned(4))); > > +/** > + * struct snd_compr_avail64 - avail descriptor with tstamp in 64 bit format > + * @avail: Number of bytes available in ring buffer for writing/reading > + * @tstamp: timestamp information > + */ > +struct snd_compr_avail64 { > + __u64 avail; > + struct snd_compr_tstamp64 tstamp; > +} __attribute__((packed, aligned(4))); > + > enum snd_compr_direction { > SND_COMPRESS_PLAYBACK = 0, > SND_COMPRESS_CAPTURE, > @@ -231,6 +241,7 @@ struct snd_compr_task_status { > #define SNDRV_COMPRESS_TSTAMP _IOR('C', 0x20, struct snd_compr_tstamp) > #define SNDRV_COMPRESS_AVAIL _IOR('C', 0x21, struct snd_compr_avail) > #define SNDRV_COMPRESS_TSTAMP64 _IOR('C', 0x22, struct snd_compr_tstamp64) > +#define SNDRV_COMPRESS_AVAIL64 _IOR('C', 0x23, struct snd_compr_avail64) > #define SNDRV_COMPRESS_PAUSE _IO('C', 0x30) > #define SNDRV_COMPRESS_RESUME _IO('C', 0x31) > #define SNDRV_COMPRESS_START _IO('C', 0x32) > diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c > index 445220fdb6a0..4d3cf49c0c47 100644 > --- a/sound/core/compress_offload.c > +++ b/sound/core/compress_offload.c > @@ -203,13 +203,10 @@ static int snd_compr_update_tstamp(struct snd_compr_stream *stream, > } > > static size_t snd_compr_calc_avail(struct snd_compr_stream *stream, > - struct snd_compr_avail *avail) > + struct snd_compr_avail64 *avail) > { > - struct snd_compr_tstamp64 tstamp64 = { 0 }; > - > memset(avail, 0, sizeof(*avail)); > - snd_compr_update_tstamp(stream, &tstamp64); > - snd_compr_tstamp32_from_64(&avail->tstamp, &tstamp64); > + snd_compr_update_tstamp(stream, &avail->tstamp); > /* Still need to return avail even if tstamp can't be filled in */ > > if (stream->runtime->total_bytes_available == 0 && > @@ -233,32 +230,47 @@ static size_t snd_compr_calc_avail(struct snd_compr_stream *stream, > } > > avail->avail = stream->runtime->total_bytes_available - > - stream->runtime->total_bytes_transferred; > + stream->runtime->total_bytes_transferred; Lets not do formatting changes in current patch please > if (stream->direction == SND_COMPRESS_PLAYBACK) > avail->avail = stream->runtime->buffer_size - avail->avail; > > - pr_debug("ret avail as %llu\n", avail->avail); > + pr_debug("ret avail as %zu\n", (size_t)avail->avail); > return avail->avail; > } > > static inline size_t snd_compr_get_avail(struct snd_compr_stream *stream) > { > - struct snd_compr_avail avail; > + struct snd_compr_avail64 avail; > > return snd_compr_calc_avail(stream, &avail); > } > > -static int > -snd_compr_ioctl_avail(struct snd_compr_stream *stream, unsigned long arg) > +static void snd_compr_avail32_from_64(struct snd_compr_avail *avail32, > + const struct snd_compr_avail64 *avail64) > { > - struct snd_compr_avail ioctl_avail; > + avail32->avail = avail64->avail; > + snd_compr_tstamp32_from_64(&avail32->tstamp, &avail64->tstamp); > +} > + > +static int snd_compr_ioctl_avail(struct snd_compr_stream *stream, > + unsigned long arg, bool is_32bit) > +{ > + struct snd_compr_avail64 ioctl_avail64; > + struct snd_compr_avail ioctl_avail32; > size_t avail; > + const void *copy_from = &ioctl_avail64; > + size_t copy_size = sizeof(ioctl_avail64); > > if (stream->direction == SND_COMPRESS_ACCEL) > return -EBADFD; > > - avail = snd_compr_calc_avail(stream, &ioctl_avail); > - ioctl_avail.avail = avail; > + avail = snd_compr_calc_avail(stream, &ioctl_avail64); > + ioctl_avail64.avail = avail; > + if (is_32bit) { > + snd_compr_avail32_from_64(&ioctl_avail32, &ioctl_avail64); > + copy_from = &ioctl_avail32; > + copy_size = sizeof(ioctl_avail32); > + } Same comment as previous patch > > switch (stream->runtime->state) { > case SNDRV_PCM_STATE_OPEN: > @@ -269,8 +281,7 @@ snd_compr_ioctl_avail(struct snd_compr_stream *stream, unsigned long arg) > break; > } > > - if (copy_to_user((__u64 __user *)arg, > - &ioctl_avail, sizeof(ioctl_avail))) > + if (copy_to_user((__u64 __user *)arg, copy_from, copy_size)) > return -EFAULT; > return 0; > } > @@ -1336,7 +1347,9 @@ static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg) > case SNDRV_COMPRESS_TSTAMP64: > return snd_compr_tstamp(stream, arg, false); > case SNDRV_COMPRESS_AVAIL: > - return snd_compr_ioctl_avail(stream, arg); > + return snd_compr_ioctl_avail(stream, arg, true); > + case SNDRV_COMPRESS_AVAIL64: > + return snd_compr_ioctl_avail(stream, arg, false); > case SNDRV_COMPRESS_PAUSE: > return snd_compr_pause(stream); > case SNDRV_COMPRESS_RESUME: > -- > 2.50.1.565.gc32cd1483b-goog -- ~Vinod

1 0

🌟 Możliwość Otrzymania Darowizny – 1 000 000 USD 🌟
by brigentkin000＠gmail.com 04 Aug '25

04 Aug '25

Nazywam się Susanne Klatten i jestem filantropką zaangażowaną w niesienie realnej pomocy poprzez przemyślane i skuteczne inicjatywy charytatywne. Z przyjemnością ogłaszam globalną inicjatywę dobroczynną, w ramach której dziesięć osób na całym świecie zostało wybranych do otrzymania darowizny w wysokości 1 000 000,00 USD każda. Ten ekskluzywny program filantropijny ma na celu: ✅ Wzmocnienie pozycji jednostek ✅ Zapewnienie stabilności finansowej ✅ Wsparcie w rozwoju osobistym i życiowym Jeśli uważasz, że możesz być jednym z potencjalnych beneficjentów lub chcesz uzyskać więcej informacji na temat procesu ubiegania się o darowiznę, zapraszamy do kontaktu: 📩 guillaumepousaz001(a)proton.me Z niecierpliwością czekamy na Twoją wiadomość i jesteśmy gotowi wesprzeć Cię na każdym etapie tej wyjątkowej szansy. Z wyrazami szacunku, Susanne Klatten Filantropka

1 0

[PATCH AUTOSEL 6.12 53/69] ASoC: SOF: topology: Parse the dapm_widget_tokens in case of DSPless mode
by Sasha Levin 04 Aug '25

04 Aug '25

From: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> [ Upstream commit 6b3cb7f4341cbf62d41ccf6ea906dbe66be8aa3d ] Parsing the dapm_widget_tokens is also needed for DSPless mode as it is setting the snd_soc_dapm_widget.no_wname_in_kcontrol_name flag for the kcontrol creation from DAPM widgets. Without that flag set, the following warnings might appear because of long control names: ALSA: Control name 'eqiir.2.1 Post Mixer Analog Playback IIR Eq bytes' truncated to 'eqiir.2.1 Post Mixer Analog Playback IIR Eq' ALSA: Control name 'eqfir.2.1 Post Mixer Analog Playback FIR Eq bytes' truncated to 'eqfir.2.1 Post Mixer Analog Playback FIR Eq' ALSA: Control name 'drc.2.1 Post Mixer Analog Playback DRC bytes' truncated to 'drc.2.1 Post Mixer Analog Playback DRC byte' ALSA: Control name 'drc.2.1 Post Mixer Analog Playback DRC switch' truncated to 'drc.2.1 Post Mixer Analog Playback DRC swit' ALSA: Control name 'gain.15.1 Pre Mixer Deepbuffer HDA Analog Volume' truncated to 'gain.15.1 Pre Mixer Deepbuffer HDA Analog V' Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Liam Girdwood <liam.r.girdwood(a)intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Link: https://patch.msgid.link/20250619102640.12068-1-peter.ujfalusi@linux.intel.… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- LLM Generated explanations, may be completely bogus: **Backport Status: YES** This commit should be backported to stable kernel trees for the following reasons: 1. **Bug Fix**: This commit fixes a functional bug in DSPless mode where control names are being truncated due to excessive length. The warnings shown in the commit message indicate real issues that affect user-visible behavior: - "Control name 'eqiir.2.1 Post Mixer Analog Playback IIR Eq bytes' truncated..." - Multiple similar truncation warnings for various audio controls 2. **Small and Contained Fix**: The code change is minimal and localized: - Adds only ~10 lines of code to parse `dapm_widget_tokens` in the `sof_dspless_widget_ready()` function - Simply moves existing token parsing logic that was already present in the regular SOF mode (line 1438) to also execute in DSPless mode - No architectural changes or new features introduced 3. **Low Risk**: The change has minimal regression risk: - Only affects DSPless mode operation, not the standard DSP mode - Reuses existing, tested parsing code (`sof_parse_tokens` with `dapm_widget_tokens`) - The token being parsed (`SOF_TKN_COMP_NO_WNAME_IN_KCONTROL_NAME`) sets a flag that prevents widget names from being included in control names, thus avoiding the truncation 4. **Clear Root Cause**: The issue occurs because without parsing these tokens, the `no_wname_in_kcontrol_name` flag in `snd_soc_dapm_widget` (line 542 in soc-dapm.h) isn't set, causing ALSA to create overly long control names that exceed the 44-character limit and get truncated. 5. **Part of DSPless Mode Support**: DSPless mode is an important feature that allows audio to work without DSP firmware, and this fixes a user-visible issue (truncated control names) in that mode. The git history shows multiple DSPless-related fixes have been backported before (e.g., commit ef0128afa165). The commit follows stable tree rules by fixing an important bug with minimal changes and low risk of regression. sound/soc/sof/topology.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index f9708b8fd73b..0104257df930 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -2364,14 +2364,25 @@ static int sof_dspless_widget_ready(struct snd_soc_component *scomp, int index, struct snd_soc_dapm_widget *w, struct snd_soc_tplg_dapm_widget *tw) { + struct snd_soc_tplg_private *priv = &tw->priv; + int ret; + + /* for snd_soc_dapm_widget.no_wname_in_kcontrol_name */ + ret = sof_parse_tokens(scomp, w, dapm_widget_tokens, + ARRAY_SIZE(dapm_widget_tokens), + priv->array, le32_to_cpu(priv->size)); + if (ret < 0) { + dev_err(scomp->dev, "failed to parse dapm widget tokens for %s\n", + w->name); + return ret; + } + if (WIDGET_IS_DAI(w->id)) { static const struct sof_topology_token dai_tokens[] = { {SOF_TKN_DAI_TYPE, SND_SOC_TPLG_TUPLE_TYPE_STRING, get_token_dai_type, 0}}; struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp); - struct snd_soc_tplg_private *priv = &tw->priv; struct snd_sof_widget *swidget; struct snd_sof_dai *sdai; - int ret; swidget = kzalloc(sizeof(*swidget), GFP_KERNEL); if (!swidget) -- 2.39.5

1 0

[PATCH AUTOSEL 6.15 63/80] ASoC: SOF: topology: Parse the dapm_widget_tokens in case of DSPless mode
by Sasha Levin 04 Aug '25

04 Aug '25

From: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> [ Upstream commit 6b3cb7f4341cbf62d41ccf6ea906dbe66be8aa3d ] Parsing the dapm_widget_tokens is also needed for DSPless mode as it is setting the snd_soc_dapm_widget.no_wname_in_kcontrol_name flag for the kcontrol creation from DAPM widgets. Without that flag set, the following warnings might appear because of long control names: ALSA: Control name 'eqiir.2.1 Post Mixer Analog Playback IIR Eq bytes' truncated to 'eqiir.2.1 Post Mixer Analog Playback IIR Eq' ALSA: Control name 'eqfir.2.1 Post Mixer Analog Playback FIR Eq bytes' truncated to 'eqfir.2.1 Post Mixer Analog Playback FIR Eq' ALSA: Control name 'drc.2.1 Post Mixer Analog Playback DRC bytes' truncated to 'drc.2.1 Post Mixer Analog Playback DRC byte' ALSA: Control name 'drc.2.1 Post Mixer Analog Playback DRC switch' truncated to 'drc.2.1 Post Mixer Analog Playback DRC swit' ALSA: Control name 'gain.15.1 Pre Mixer Deepbuffer HDA Analog Volume' truncated to 'gain.15.1 Pre Mixer Deepbuffer HDA Analog V' Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Liam Girdwood <liam.r.girdwood(a)intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Link: https://patch.msgid.link/20250619102640.12068-1-peter.ujfalusi@linux.intel.… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- LLM Generated explanations, may be completely bogus: **Backport Status: YES** This commit should be backported to stable kernel trees for the following reasons: 1. **Bug Fix**: This commit fixes a functional bug in DSPless mode where control names are being truncated due to excessive length. The warnings shown in the commit message indicate real issues that affect user-visible behavior: - "Control name 'eqiir.2.1 Post Mixer Analog Playback IIR Eq bytes' truncated..." - Multiple similar truncation warnings for various audio controls 2. **Small and Contained Fix**: The code change is minimal and localized: - Adds only ~10 lines of code to parse `dapm_widget_tokens` in the `sof_dspless_widget_ready()` function - Simply moves existing token parsing logic that was already present in the regular SOF mode (line 1438) to also execute in DSPless mode - No architectural changes or new features introduced 3. **Low Risk**: The change has minimal regression risk: - Only affects DSPless mode operation, not the standard DSP mode - Reuses existing, tested parsing code (`sof_parse_tokens` with `dapm_widget_tokens`) - The token being parsed (`SOF_TKN_COMP_NO_WNAME_IN_KCONTROL_NAME`) sets a flag that prevents widget names from being included in control names, thus avoiding the truncation 4. **Clear Root Cause**: The issue occurs because without parsing these tokens, the `no_wname_in_kcontrol_name` flag in `snd_soc_dapm_widget` (line 542 in soc-dapm.h) isn't set, causing ALSA to create overly long control names that exceed the 44-character limit and get truncated. 5. **Part of DSPless Mode Support**: DSPless mode is an important feature that allows audio to work without DSP firmware, and this fixes a user-visible issue (truncated control names) in that mode. The git history shows multiple DSPless-related fixes have been backported before (e.g., commit ef0128afa165). The commit follows stable tree rules by fixing an important bug with minimal changes and low risk of regression. sound/soc/sof/topology.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 14aa8ecc4bc4..554808d2dc29 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -2368,14 +2368,25 @@ static int sof_dspless_widget_ready(struct snd_soc_component *scomp, int index, struct snd_soc_dapm_widget *w, struct snd_soc_tplg_dapm_widget *tw) { + struct snd_soc_tplg_private *priv = &tw->priv; + int ret; + + /* for snd_soc_dapm_widget.no_wname_in_kcontrol_name */ + ret = sof_parse_tokens(scomp, w, dapm_widget_tokens, + ARRAY_SIZE(dapm_widget_tokens), + priv->array, le32_to_cpu(priv->size)); + if (ret < 0) { + dev_err(scomp->dev, "failed to parse dapm widget tokens for %s\n", + w->name); + return ret; + } + if (WIDGET_IS_DAI(w->id)) { static const struct sof_topology_token dai_tokens[] = { {SOF_TKN_DAI_TYPE, SND_SOC_TPLG_TUPLE_TYPE_STRING, get_token_dai_type, 0}}; struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp); - struct snd_soc_tplg_private *priv = &tw->priv; struct snd_sof_widget *swidget; struct snd_sof_dai *sdai; - int ret; swidget = kzalloc(sizeof(*swidget), GFP_KERNEL); if (!swidget) -- 2.39.5

1 0