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

[PATCH] ASoC: core: Always store of_node when getting DAI link component
by Mark Brown 30 Jun '23

30 Jun '23

The generic snd_soc_dai_get_dlc() contains a default translation function for DAI names which has factored out common code in a number of card drivers, resolving the dai_name and of_node either using a driver provided translation function or with a generic implementation. Unfortunately the of_node can't be set by the translation function since it currently doesn't have an interface to do that but snd_soc_dai_get_dlc() only initialises the of_node in the case where there is no translation function. This breaks the Meson support after conversion to use the generic helpers since the DPCM cards for it check which component of the SoC is connected to each link by checking the compatible for the component and the Meson components provide a custom operation so don't use the generic code. Fix this and potentially other cards by unconditionally storing the node in the dai_link_component, there shouldn't be a binding specific of_node selected since that's how we determine the translation function. Fixes: 2e1dbea1f8a3 ("ASoC: meson: use snd_soc_{of_}get_dlc()") Fixes: 3c8b5861850c ("ASoC: soc-core.c: add index on snd_soc_of_get_dai_name()") Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f06a20773a34..11bc5250ffd0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3262,6 +3262,8 @@ int snd_soc_get_dlc(const struct of_phandle_args *args, struct snd_soc_dai_link_ struct snd_soc_component *pos; int ret = -EPROBE_DEFER; + dlc->of_node = args->np; + mutex_lock(&client_mutex); for_each_component(pos) { struct device_node *component_of_node = soc_component_to_node(pos); @@ -3300,7 +3302,6 @@ int snd_soc_get_dlc(const struct of_phandle_args *args, struct snd_soc_dai_link_ id--; } - dlc->of_node = args->np; dlc->dai_name = dai->driver->name; if (!dlc->dai_name) dlc->dai_name = pos->name; --- base-commit: 154756319cc6f8b8b86241da02da6a8fcc6abd1f change-id: 20230623-asoc-fix-meson-probe-94ecd113bebb Best regards, -- Mark Brown,,, <broonie(a)kernel.org>

2 5

[tiwai-sound:topic/midi20-gadget 56/56] f_midi2.c:undefined reference to `snd_ump_endpoint_new'
by kernel test robot 30 Jun '23

30 Jun '23

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/midi20-gadget head: ed28b6939ebadd073e731ccf0f2c6ce4ab102ffd commit: ed28b6939ebadd073e731ccf0f2c6ce4ab102ffd [56/56] usb: gadget: add support for USB MIDI 2.0 function driver (WIP) config: x86_64-buildonly-randconfig-r001-20230629 (https://download.01.org/0day-ci/archive/20230630/202306300642.o48bLzoB-lkp@…) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce: (https://download.01.org/0day-ci/archive/20230630/202306300642.o48bLzoB-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202306300642.o48bLzoB-lkp@intel.com/ All errors (new ones prefixed by >>): ld: drivers/usb/gadget/function/f_midi2.o: in function `f_midi2_create.constprop.0': >> f_midi2.c:(.text+0x27f2): undefined reference to `snd_ump_endpoint_new' >> ld: f_midi2.c:(.text+0x29a5): undefined reference to `snd_ump_block_new' ld: drivers/usb/gadget/function/f_midi2.o: in function `process_ump_transmit': >> f_midi2.c:(.text+0x4a69): undefined reference to `snd_ump_transmit' ld: drivers/usb/gadget/function/f_midi2.o: in function `f_midi2_ep_out_complete': >> f_midi2.c:(.text+0x5af1): undefined reference to `snd_ump_receive_ump_val' >> ld: f_midi2.c:(.text+0x5bef): undefined reference to `snd_ump_receive' -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[tiwai-sound:topic/midi20-gadget 56/56] ld.lld: error: undefined symbol: snd_ump_transmit
by kernel test robot 30 Jun '23

30 Jun '23

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/midi20-gadget head: ed28b6939ebadd073e731ccf0f2c6ce4ab102ffd commit: ed28b6939ebadd073e731ccf0f2c6ce4ab102ffd [56/56] usb: gadget: add support for USB MIDI 2.0 function driver (WIP) config: i386-randconfig-r023-20230629 (https://download.01.org/0day-ci/archive/20230630/202306300550.yyh6cWzj-lkp@…) compiler: clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a) reproduce: (https://download.01.org/0day-ci/archive/20230630/202306300550.yyh6cWzj-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202306300550.yyh6cWzj-lkp@intel.com/ All errors (new ones prefixed by >>): >> ld.lld: error: undefined symbol: snd_ump_transmit >>> referenced by f_midi2.c:644 (drivers/usb/gadget/function/f_midi2.c:644) >>> drivers/usb/gadget/function/f_midi2.o:(process_ump_transmit) in archive vmlinux.a -- >> ld.lld: error: undefined symbol: snd_ump_endpoint_new >>> referenced by f_midi2.c:946 (drivers/usb/gadget/function/f_midi2.c:946) >>> drivers/usb/gadget/function/f_midi2.o:(f_midi2_bind) in archive vmlinux.a -- >> ld.lld: error: undefined symbol: snd_ump_block_new >>> referenced by f_midi2.c:957 (drivers/usb/gadget/function/f_midi2.c:957) >>> drivers/usb/gadget/function/f_midi2.o:(f_midi2_bind) in archive vmlinux.a -- >> ld.lld: error: undefined symbol: snd_ump_receive >>> referenced by f_midi2.c:623 (drivers/usb/gadget/function/f_midi2.c:623) >>> drivers/usb/gadget/function/f_midi2.o:(f_midi2_ep_out_complete) in archive vmlinux.a -- >> ld.lld: error: undefined symbol: snd_ump_receive_ump_val >>> referenced by f_midi2.c:599 (drivers/usb/gadget/function/f_midi2.c:599) >>> drivers/usb/gadget/function/f_midi2.o:(f_midi2_ep_out_complete) in archive vmlinux.a -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

configure: Add large file support via CFLAGS
by GitHub pull_request - opened 30 Jun '23

30 Jun '23

alsa-project/alsa-utils pull request #223 was opened from kendase3: Currently scanelf (pax-utils) detects missing LFS support in the following files/calls: __open_2,fstat,mmap,open,scandir,stat,alphasort,lstat /usr/sbin/alsactl fopen /usr/lib/alsa-topology/libalsatplg_module_nhlt.so fopen /usr/bin/alsaucm fopen /usr/bin/aplaymidi __open_2,open /usr/bin/alsatplg fstat,open,__open_2 /usr/bin/axfer fopen /usr/bin/arecordmidi fopen,__open_2 /usr/bin/speaker-test creat,__open_2,lseek /usr/bin/amidi Note that this may cause problems on systems with a 32-bit kernel, but I've tested playing audio on a more recent 32-bit system with a 64-bit kernel. Let me know if you'd prefer a different approach! Notably the existing AC_SYS_LARGEFILE in configure.ac was not having any effect in my environment. I'm building on a 64-bit host for a 32-bit target. Request URL : https://github.com/alsa-project/alsa-utils/pull/223 Patch URL : https://github.com/alsa-project/alsa-utils/pull/223.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[tiwai-sound:topic/midi20-gadget 56/56] ERROR: modpost: "snd_ump_block_new" [drivers/usb/gadget/function/usb_f_midi2.ko] undefined!
by kernel test robot 29 Jun '23

29 Jun '23

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/midi20-gadget head: ed28b6939ebadd073e731ccf0f2c6ce4ab102ffd commit: ed28b6939ebadd073e731ccf0f2c6ce4ab102ffd [56/56] usb: gadget: add support for USB MIDI 2.0 function driver (WIP) config: arm-randconfig-r046-20230629 (https://download.01.org/0day-ci/archive/20230630/202306300438.HICMJktb-lkp@…) compiler: arm-linux-gnueabi-gcc (GCC) 12.3.0 reproduce: (https://download.01.org/0day-ci/archive/20230630/202306300438.HICMJktb-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202306300438.HICMJktb-lkp@intel.com/ All error/warnings (new ones prefixed by >>, old ones prefixed by <<): >> drivers/usb/gadget/function/f_midi2.c:483:6: warning: no previous prototype for 'reply_ump_stream_fb_info' [-Wmissing-prototypes] 483 | void reply_ump_stream_fb_info(struct f_midi2 *midi2, int blk) | ^~~~~~~~~~~~~~~~~~~~~~~~ -- >> ERROR: modpost: "snd_ump_block_new" [drivers/usb/gadget/function/usb_f_midi2.ko] undefined! >> ERROR: modpost: "snd_ump_receive_ump_val" [drivers/usb/gadget/function/usb_f_midi2.ko] undefined! >> ERROR: modpost: "snd_ump_transmit" [drivers/usb/gadget/function/usb_f_midi2.ko] undefined! >> ERROR: modpost: "snd_ump_receive" [drivers/usb/gadget/function/usb_f_midi2.ko] undefined! >> ERROR: modpost: "snd_ump_endpoint_new" [drivers/usb/gadget/function/usb_f_midi2.ko] undefined! -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[tiwai-sound:topic/midi20-gadget 56/56] drivers/usb/gadget/function/f_midi2.c:483:6: warning: no previous prototype for function 'reply_ump_stream_fb_info'
by kernel test robot 29 Jun '23

29 Jun '23

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/midi20-gadget head: ed28b6939ebadd073e731ccf0f2c6ce4ab102ffd commit: ed28b6939ebadd073e731ccf0f2c6ce4ab102ffd [56/56] usb: gadget: add support for USB MIDI 2.0 function driver (WIP) config: i386-randconfig-r023-20230629 (https://download.01.org/0day-ci/archive/20230630/202306300419.dOOgnkIH-lkp@…) compiler: clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a) reproduce: (https://download.01.org/0day-ci/archive/20230630/202306300419.dOOgnkIH-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202306300419.dOOgnkIH-lkp@intel.com/ All warnings (new ones prefixed by >>): >> drivers/usb/gadget/function/f_midi2.c:483:6: warning: no previous prototype for function 'reply_ump_stream_fb_info' [-Wmissing-prototypes] void reply_ump_stream_fb_info(struct f_midi2 *midi2, int blk) ^ drivers/usb/gadget/function/f_midi2.c:483:1: note: declare 'static' if the function is not intended to be used outside of this translation unit void reply_ump_stream_fb_info(struct f_midi2 *midi2, int blk) ^ static 1 warning generated. vim +/reply_ump_stream_fb_info +483 drivers/usb/gadget/function/f_midi2.c 481 482 /* exported for shell */ > 483 void reply_ump_stream_fb_info(struct f_midi2 *midi2, int blk) 484 { 485 u32 buf[4]; 486 487 memset(buf, 0, sizeof(buf)); 488 buf[0] = ump_stream_compose(UMP_STREAM_MSG_STATUS_FB_INFO, 0); 489 buf[0] |= (midi2->blks[blk].active << 15) | (blk << 8); 490 buf[0] |= midi2->blks[blk].dir << 4; // UI-hint 491 buf[1] |= 0 << 2; // MIDI 1.0 port? No 492 buf[0] |= midi2->blks[blk].dir; // direction 493 buf[1] |= (midi2->blks[blk].start_group << 24) | // start group 494 (midi2->blks[blk].num_groups << 16); // # groups spanned 495 buf[1] |= 0x01 << 8; // MIDI-CI support version 496 buf[1] |= 0; // Sysex8 streams; not supported 497 498 reply_ep_in(midi2, buf, sizeof(buf)); 499 } 500 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[tiwai-sound:topic/midi20-gadget 56/56] drivers/usb/gadget/function/f_midi2.c:483:6: warning: no previous prototype for 'reply_ump_stream_fb_info'
by kernel test robot 29 Jun '23

29 Jun '23

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/midi20-gadget head: ed28b6939ebadd073e731ccf0f2c6ce4ab102ffd commit: ed28b6939ebadd073e731ccf0f2c6ce4ab102ffd [56/56] usb: gadget: add support for USB MIDI 2.0 function driver (WIP) config: arc-randconfig-r005-20230629 (https://download.01.org/0day-ci/archive/20230630/202306300411.zojb9GzL-lkp@…) compiler: arceb-elf-gcc (GCC) 12.3.0 reproduce: (https://download.01.org/0day-ci/archive/20230630/202306300411.zojb9GzL-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202306300411.zojb9GzL-lkp@intel.com/ All warnings (new ones prefixed by >>): >> drivers/usb/gadget/function/f_midi2.c:483:6: warning: no previous prototype for 'reply_ump_stream_fb_info' [-Wmissing-prototypes] 483 | void reply_ump_stream_fb_info(struct f_midi2 *midi2, int blk) | ^~~~~~~~~~~~~~~~~~~~~~~~ vim +/reply_ump_stream_fb_info +483 drivers/usb/gadget/function/f_midi2.c 481 482 /* exported for shell */ > 483 void reply_ump_stream_fb_info(struct f_midi2 *midi2, int blk) 484 { 485 u32 buf[4]; 486 487 memset(buf, 0, sizeof(buf)); 488 buf[0] = ump_stream_compose(UMP_STREAM_MSG_STATUS_FB_INFO, 0); 489 buf[0] |= (midi2->blks[blk].active << 15) | (blk << 8); 490 buf[0] |= midi2->blks[blk].dir << 4; // UI-hint 491 buf[1] |= 0 << 2; // MIDI 1.0 port? No 492 buf[0] |= midi2->blks[blk].dir; // direction 493 buf[1] |= (midi2->blks[blk].start_group << 24) | // start group 494 (midi2->blks[blk].num_groups << 16); // # groups spanned 495 buf[1] |= 0x01 << 8; // MIDI-CI support version 496 buf[1] |= 0; // Sysex8 streams; not supported 497 498 reply_ep_in(midi2, buf, sizeof(buf)); 499 } 500 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH AUTOSEL 4.14 1/4] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()
by Sasha Levin 29 Jun '23

29 Jun '23

From: Mark Brown <broonie(a)kernel.org> [ Upstream commit 97eea946b93961fffd29448dcda7398d0d51c4b2 ] The bounds checks in snd_soc_put_volsw_sx() are only being applied to the first channel, meaning it is possible to write out of bounds values to the second channel in stereo controls. Add appropriate checks. Signed-off-by: Mark Brown <broonie(a)kernel.org> Link: https://lore.kernel.org/r/20220511134137.169575-2-broonie@kernel.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 81c9ecfa7c7f9..63c0e61b17541 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -465,6 +465,12 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, if (snd_soc_volsw_is_stereo(mc)) { val_mask = mask << rshift; val2 = (ucontrol->value.integer.value[1] + min) & mask; + + if (mc->platform_max && val2 > mc->platform_max) + return -EINVAL; + if (val2 > max) + return -EINVAL; + val2 = val2 << rshift; err = snd_soc_component_update_bits(component, reg2, val_mask, -- 2.39.2

1 0

[PATCH AUTOSEL 4.19 1/5] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()
by Sasha Levin 29 Jun '23

29 Jun '23

From: Mark Brown <broonie(a)kernel.org> [ Upstream commit 97eea946b93961fffd29448dcda7398d0d51c4b2 ] The bounds checks in snd_soc_put_volsw_sx() are only being applied to the first channel, meaning it is possible to write out of bounds values to the second channel in stereo controls. Add appropriate checks. Signed-off-by: Mark Brown <broonie(a)kernel.org> Link: https://lore.kernel.org/r/20220511134137.169575-2-broonie@kernel.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 453b61b42dd9e..00e6a6e46fe52 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -460,6 +460,12 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, if (snd_soc_volsw_is_stereo(mc)) { val_mask = mask << rshift; val2 = (ucontrol->value.integer.value[1] + min) & mask; + + if (mc->platform_max && val2 > mc->platform_max) + return -EINVAL; + if (val2 > max) + return -EINVAL; + val2 = val2 << rshift; err = snd_soc_component_update_bits(component, reg2, val_mask, -- 2.39.2

1 0

[PATCH AUTOSEL 5.4 1/5] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()
by Sasha Levin 29 Jun '23

29 Jun '23

From: Mark Brown <broonie(a)kernel.org> [ Upstream commit 97eea946b93961fffd29448dcda7398d0d51c4b2 ] The bounds checks in snd_soc_put_volsw_sx() are only being applied to the first channel, meaning it is possible to write out of bounds values to the second channel in stereo controls. Add appropriate checks. Signed-off-by: Mark Brown <broonie(a)kernel.org> Link: https://lore.kernel.org/r/20220511134137.169575-2-broonie@kernel.org Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 453b61b42dd9e..00e6a6e46fe52 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -460,6 +460,12 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, if (snd_soc_volsw_is_stereo(mc)) { val_mask = mask << rshift; val2 = (ucontrol->value.integer.value[1] + min) & mask; + + if (mc->platform_max && val2 > mc->platform_max) + return -EINVAL; + if (val2 > max) + return -EINVAL; + val2 = val2 << rshift; err = snd_soc_component_update_bits(component, reg2, val_mask, -- 2.39.2

1 0