August 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] sound: fix a memory leak bug
by Wenwen Wang 08 Aug '19

08 Aug '19

In sound_insert_unit(), the controlling structure 's' is allocated through kmalloc(). Then it is added to the sound driver list by invoking __sound_insert_unit(). Later on, if __register_chrdev() fails, 's' is removed from the list through __sound_remove_unit(). If 'index' is not less than 0, -EBUSY is returned to indicate the error. However, 's' is not deallocated on this execution path, leading to a memory leak bug. To fix the above issue, free 's' before -EBUSY is returned. Signed-off-by: Wenwen Wang <wenwen(a)cs.uga.edu> --- sound/sound_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/sound_core.c b/sound/sound_core.c index b730d97..90d118c 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c @@ -275,7 +275,8 @@ static int sound_insert_unit(struct sound_unit **list, const struct file_operati goto retry; } spin_unlock(&sound_loader_lock); - return -EBUSY; + r = -EBUSY; + goto fail; } } -- 2.7.4

2 1

[alsa-devel] [asoc:for-5.4 175/179] sound/soc/intel/haswell/sst-haswell-ipc.c:2018:16: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t {aka unsigned int}'
by kbuild test robot 08 Aug '19

08 Aug '19

tree: https://kernel.googlesource.com/pub/scm/linux/kernel/git/broonie/sound.git for-5.4 head: a860fac420971c5a90d4f78959b44ead793aee4f commit: abf31feea26c0f412a191c83f408311a0de7435c [175/179] ASoC: Intel: Update request-reply IPC model config: i386-allmodconfig (attached as .config) compiler: gcc-7 (Debian 7.4.0-10) 7.4.0 reproduce: git checkout abf31feea26c0f412a191c83f408311a0de7435c # save the attached .config to linux build tree make ARCH=i386 If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All warnings (new ones prefixed by >>): In file included from include/linux/printk.h:332:0, from include/linux/kernel.h:15, from sound/soc/intel/haswell/sst-haswell-ipc.c:9: sound/soc/intel/haswell/sst-haswell-ipc.c: In function 'sst_hsw_module_set_param': >> sound/soc/intel/haswell/sst-haswell-ipc.c:2018:16: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t {aka unsigned int}' [-Wformat=] dev_dbg(dev, "transfer parameter size : %lu\n", ^ include/linux/dynamic_debug.h:125:15: note: in definition of macro '__dynamic_func_call' func(&id, ##__VA_ARGS__); \ ^~~~~~~~~~~ include/linux/dynamic_debug.h:157:2: note: in expansion of macro '_dynamic_func_call' _dynamic_func_call(fmt,__dynamic_dev_dbg, \ ^~~~~~~~~~~~~~~~~~ include/linux/device.h:1503:2: note: in expansion of macro 'dynamic_dev_dbg' dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__) ^~~~~~~~~~~~~~~ include/linux/device.h:1503:23: note: in expansion of macro 'dev_fmt' dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__) ^~~~~~~ >> sound/soc/intel/haswell/sst-haswell-ipc.c:2018:3: note: in expansion of macro 'dev_dbg' dev_dbg(dev, "transfer parameter size : %lu\n", ^~~~~~~ sound/soc/intel/haswell/sst-haswell-ipc.c:2022:16: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t {aka unsigned int}' [-Wformat=] dev_dbg(dev, "transfer parameter aligned size : %lu\n", ^ include/linux/dynamic_debug.h:125:15: note: in definition of macro '__dynamic_func_call' func(&id, ##__VA_ARGS__); \ ^~~~~~~~~~~ include/linux/dynamic_debug.h:157:2: note: in expansion of macro '_dynamic_func_call' _dynamic_func_call(fmt,__dynamic_dev_dbg, \ ^~~~~~~~~~~~~~~~~~ include/linux/device.h:1503:2: note: in expansion of macro 'dynamic_dev_dbg' dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__) ^~~~~~~~~~~~~~~ include/linux/device.h:1503:23: note: in expansion of macro 'dev_fmt' dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__) ^~~~~~~ sound/soc/intel/haswell/sst-haswell-ipc.c:2022:3: note: in expansion of macro 'dev_dbg' dev_dbg(dev, "transfer parameter aligned size : %lu\n", ^~~~~~~ vim +2018 sound/soc/intel/haswell/sst-haswell-ipc.c 1993 1994 int sst_hsw_module_set_param(struct sst_hsw *hsw, 1995 u32 module_id, u32 instance_id, u32 parameter_id, 1996 u32 param_size, char *param) 1997 { 1998 int ret; 1999 struct sst_ipc_message request = {0}; 2000 u32 payload_size = 0; 2001 struct sst_hsw_transfer_parameter *parameter; 2002 struct device *dev = hsw->dev; 2003 2004 request.header = IPC_GLB_TYPE(IPC_GLB_MODULE_OPERATION) | 2005 IPC_MODULE_OPERATION(IPC_MODULE_SET_PARAMETER) | 2006 IPC_MODULE_ID(module_id); 2007 dev_dbg(dev, "sst_hsw_module_set_param header=%x\n", 2008 (u32)request.header); 2009 2010 payload_size = param_size + 2011 sizeof(struct sst_hsw_transfer_parameter) - 2012 sizeof(struct sst_hsw_transfer_list); 2013 dev_dbg(dev, "parameter size : %d\n", param_size); 2014 dev_dbg(dev, "payload size : %d\n", payload_size); 2015 2016 if (payload_size <= SST_HSW_IPC_MAX_SHORT_PARAMETER_SIZE) { 2017 /* short parameter, mailbox can contain data */ > 2018 dev_dbg(dev, "transfer parameter size : %lu\n", 2019 request.size); 2020 2021 request.size = ALIGN(payload_size, 4); 2022 dev_dbg(dev, "transfer parameter aligned size : %lu\n", 2023 request.size); 2024 2025 parameter = kzalloc(request.size, GFP_KERNEL); 2026 if (parameter == NULL) 2027 return -ENOMEM; 2028 2029 memcpy(parameter->data, param, param_size); 2030 } else { 2031 dev_warn(dev, "transfer parameter size too large!"); 2032 return 0; 2033 } 2034 2035 parameter->parameter_id = parameter_id; 2036 parameter->data_size = param_size; 2037 request.data = parameter; 2038 2039 ret = sst_ipc_tx_message_wait(&hsw->ipc, request, NULL); 2040 if (ret < 0) 2041 dev_err(dev, "ipc: module set parameter failed - %d\n", ret); 2042 2043 kfree(parameter); 2044 2045 return ret; 2046 } 2047 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] Alsa-Plugin 1.0.25 License
by karina filer 08 Aug '19

08 Aug '19

Hi Team, Greetings !! I am facing difficulty to understand the Alsa-Plugin Licensing, Could you please help me to make understand?, Is it under GPL 2.0 or LGPL 2.1 because after extracting the folder I can see 2 copying file one for GPL and other for LGPL. https://repology.org/project/alsa-plugins/packages Regards K. Filer

4 6

[alsa-devel] multi pcm plugin issue
by Giuliano Zannetti - ART S.p.A. 08 Aug '19

08 Aug '19

Hi, I have a performance related problem using the multi PCM plugin. --------------------------------------------------------------------- THE ISSUE --------------------------------------------------------------------- The following scenario triggers the issue. The CPU load is up to 90%. plug - - > upmix - - > multi - - > forward_dmix - - > loopback_dmix pcm.giuliano_plug { type plug slave.pcm giuliano_upmix slave.channels 2 } pcm.giuliano_upmix { type route slave.pcm giuliano_multi slave.channels 4 ttable.0.0 1 ttable.0.1 1 ttable.1.2 1 ttable.1.3 1 } pcm.giuliano_multi { type multi slaves { slave0 { pcm forward_dmix channels 2 } slave1 { pcm loopback_dmix channels 2 } } bindings { 0 {slave slave0 channel 0} 1 {slave slave0 channel 1} 2 {slave slave1 channel 0} 3 {slave slave1 channel 1} } master 0 } pcm.forward_dmix { type dmix ipc_key 1000 ipc_key_add_uid 1 ipc_perm 0600 slave.period_time 10000 slave.period_size 480 slave.buffer_size 1920 slave.rate 48000 slave.pcm "hw:0,0" } pcm.loopback_dmix { type dmix ipc_key 1001 ipc_key_add_uid 1 ipc_perm 0600 slave.period_time 10000 slave.period_size 480 slave.buffer_size 1920 slave.rate 48000 slave.pcm loopback_out } pcm.loopback_out { type hw card Loopback device 0 subdevice 0 } pcm.loopback_dsnoop { type dsnoop ipc_key 1002 ipc_key_add_uid 1 ipc_perm 0600 slave.period_time 10000 slave.period_size 480 slave.buffer_size 1920 slave.rate 48000 slave.pcm loopback_in } pcm.loopback_in { type hw card Loopback device 1 subdevice 0 } The following scenario does not trigger the issue. The CPU load is at most 2%. plug - - > upmix - - > downmix - - > forward_dmix pcm.giuliano_plug { type plug slave.pcm giuliano_upmix slave.channels 2 } pcm.giuliano_upmix { type route slave.pcm giuliano_downmix slave.channels 4 ttable.0.0 1 ttable.0.1 1 ttable.1.2 1 ttable.1.3 1 } pcm.giuliano_downmix { type route slave.pcm forward_dmix slave.channels 2 ttable.0.0 1 ttable.1.1 1 ttable.2.0 1 ttable.3.1 1 } --------------------------------------------------------------------- DEBUG PRINTS IN FUNCTION snd_pcm_write_areas IN FILE pcm.c --------------------------------------------------------------------- For each while iteration the log prints the available frames (avail) and the frames to be written (size). In the multi scenario the several while iterations decrease the performances and the CPU load is high. In the normal scenario i see that at most two iterations of the while are needed. In other words, in the multi scenario the avail frames are not enough to stop the loop. You can see below the prints: avail < size for 28 iterations. Note that this behaviour does not occurs only at startup, but every time during the playback. snd_pcm_sframes_t snd_pcm_write_areas(snd_pcm_t *pcm, const snd_pcm_channel_area_t *areas, snd_pcm_uframes_t offset, snd_pcm_uframes_t size, snd_pcm_xfer_areas_func_t func) { snd_pcm_uframes_t xfer = 0; snd_pcm_sframes_t err = 0; snd_pcm_state_t state; if (size == 0) return 0; int giuliano_i = 0; __snd_pcm_lock(pcm); /* forced lock */ while (size > 0) { snd_pcm_uframes_t frames; snd_pcm_sframes_t avail; _again: state = __snd_pcm_state(pcm); switch (state) { case SND_PCM_STATE_PREPARED: case SND_PCM_STATE_PAUSED: break; case SND_PCM_STATE_RUNNING: err = __snd_pcm_hwsync(pcm); if (err < 0) goto _end; break; default: err = pcm_state_to_error(state); if (!err) err = -EBADFD; goto _end; } avail = __snd_pcm_avail_update(pcm); fprintf( stderr, "giuliano | pcm.c | snd_pcm_write_areas | (%d) avail=%ld, size=%ld\n", giuliano_i, avail, size ); giuliano_i ++; if (avail < 0) { err = avail; goto _end; } if (state == SND_PCM_STATE_RUNNING && size > (snd_pcm_uframes_t)avail) { if (snd_pcm_may_wait_for_avail_min(pcm, avail)) { if (pcm->mode & SND_PCM_NONBLOCK) { err = -EAGAIN; goto _end; } err = snd_pcm_wait_nocheck(pcm, -1); if (err < 0) break; goto _again; } /* the snd_pcm_may_wait_for_avail_min may check against the * updated hw.ptr (slaves), get the avail again here */ avail = __snd_pcm_avail_update(pcm); if (avail < 0) { err = avail; goto _end; } } frames = size; if (frames > (snd_pcm_uframes_t) avail) frames = avail; if (! frames) break; err = func(pcm, areas, offset, frames); if (err < 0) break; frames = err; if (state == SND_PCM_STATE_PREPARED) { snd_pcm_sframes_t hw_avail = pcm->buffer_size - avail; hw_avail += frames; /* some plugins might automatically start the stream */ state = __snd_pcm_state(pcm); if (state == SND_PCM_STATE_PREPARED && hw_avail >= (snd_pcm_sframes_t) pcm->start_threshold) { err = __snd_pcm_start(pcm); if (err < 0) goto _end; } } offset += frames; size -= frames; xfer += frames; } _end: __snd_pcm_unlock(pcm); return xfer > 0 ? (snd_pcm_sframes_t) xfer : snd_pcm_check_error(pcm, err); } --------------------------------------------------------------------- DEBUG PRINTS OUTPUT --------------------------------------------------------------------- ## Multi scenario ## giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=1920 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=1920 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=1920, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=1440 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=1440 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=1440, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=960 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=960, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=480, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (2) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (3) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (4) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (5) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (6) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (7) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (8) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (9) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (10) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (11) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (12) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (13) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (14) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (15) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (16) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (17) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (18) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (19) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (20) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (21) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (22) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (23) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (24) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (25) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (26) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (27) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=1440 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=576 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=1440 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=576 giuliano | pcm.c | snd_pcm_write_areas | (28) avail=576, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=96 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=96, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=96 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 96 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=96 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=96, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=96 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 96 ## Normal scenario ## giuliano | pcm.c | snd_pcm_write_areas | (0) avail=1920, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=1440, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=960, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 --------------------------------------------------------------------- DEBUG PRINTS IN FUNCTION snd_pcm_wait_nocheck IN FILE pcm.c --------------------------------------------------------------------- As you can see in the debug prints above i have enabled the error message in the function snd_pcm_wait_nocheck. That message lead me to think that the issue is a poll related one, may be? int snd_pcm_wait_nocheck(snd_pcm_t *pcm, int timeout) { struct pollfd *pfd; unsigned short revents = 0; int npfds, err, err_poll; npfds = __snd_pcm_poll_descriptors_count(pcm); if (npfds <= 0 || npfds >= 16) { SNDERR("Invalid poll_fds %d\n", npfds); return -EIO; } pfd = alloca(sizeof(*pfd) * npfds); err = __snd_pcm_poll_descriptors(pcm, pfd, npfds); if (err < 0) return err; if (err != npfds) { SNDMSG("invalid poll descriptors %d\n", err); return -EIO; } do { __snd_pcm_unlock(pcm); err_poll = poll(pfd, npfds, timeout); __snd_pcm_lock(pcm); if (err_poll < 0) { if (errno == EINTR && !PCMINABORT(pcm)) continue; return -errno; } if (! err_poll) break; err = __snd_pcm_poll_revents(pcm, pfd, npfds, &revents); if (err < 0) return err; if (revents & (POLLERR | POLLNVAL)) { /* check more precisely */ err = pcm_state_to_error(__snd_pcm_state(pcm)); return err < 0 ? err : -EIO; } } while (!(revents & (POLLIN | POLLOUT))); #if 1 /* very useful code to test poll related problems */ { snd_pcm_sframes_t avail_update; __snd_pcm_hwsync(pcm); avail_update = __snd_pcm_avail_update(pcm); if (avail_update < (snd_pcm_sframes_t)pcm->avail_min) { printf("*** snd_pcm_wait() FATAL ERROR!!!\n"); printf("avail_min = %li, avail_update = %li\n", pcm->avail_min, avail_update); } } #endif return err_poll > 0 ? 1 : 0; } #endif --------------------------------------------------------------------- DEBUG PRINTS IN FUNCTION __snd_pcm_avail_update IN pcm_multi.c --------------------------------------------------------------------- As you can see in the prints above, i put some debugs logs in the function __snd_pcm_avail_update. I can read there the number of avail frames for each slave of the multi. I see also that the minimum numbers of frames is taken among the slaves. static snd_pcm_sframes_t snd_pcm_multi_avail_update(snd_pcm_t *pcm) { snd_pcm_multi_t *multi = pcm->private_data; snd_pcm_sframes_t ret = LONG_MAX; snd_pcm_sframes_t giuliano_temp = 0; unsigned int i; for (i = 0; i < multi->slaves_count; ++i) { snd_pcm_sframes_t avail; avail = snd_pcm_avail_update(multi->slaves[i].pcm); fprintf( stderr, "giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=%d, avail=%d\n", i, avail ); if (avail < 0) return avail; if (ret > avail) ret = avail; } snd_pcm_multi_hwptr_update(pcm); return ret; } I hope that my debug prints are useful to find the issue. Thanks Giuliano Zannetti

1 0

[alsa-devel] (no subject)
by Giuliano Zannetti - ART S.p.A. 08 Aug '19

08 Aug '19

Hi, I have a performance related problem using the multi PCM plugin. --------------------------------------------------------------------- THE ISSUE --------------------------------------------------------------------- The following scenario triggers the issue. The CPU load is up to 90%. plug - - > upmix - - > multi - - > forward_dmix - - > loopback_dmix pcm.giuliano_plug { type plug slave.pcm giuliano_upmix slave.channels 2 } pcm.giuliano_upmix { type route slave.pcm giuliano_multi slave.channels 4 ttable.0.0 1 ttable.0.1 1 ttable.1.2 1 ttable.1.3 1 } pcm.giuliano_multi { type multi slaves { slave0 { pcm forward_dmix channels 2 } slave1 { pcm loopback_dmix channels 2 } } bindings { 0 {slave slave0 channel 0} 1 {slave slave0 channel 1} 2 {slave slave1 channel 0} 3 {slave slave1 channel 1} } master 0 } pcm.forward_dmix { type dmix ipc_key 1000 ipc_key_add_uid 1 ipc_perm 0600 slave.period_time 10000 slave.period_size 480 slave.buffer_size 1920 slave.rate 48000 slave.pcm "hw:0,0" } pcm.loopback_dmix { type dmix ipc_key 1001 ipc_key_add_uid 1 ipc_perm 0600 slave.period_time 10000 slave.period_size 480 slave.buffer_size 1920 slave.rate 48000 slave.pcm loopback_out } pcm.loopback_out { type hw card Loopback device 0 subdevice 0 } pcm.loopback_dsnoop { type dsnoop ipc_key 1002 ipc_key_add_uid 1 ipc_perm 0600 slave.period_time 10000 slave.period_size 480 slave.buffer_size 1920 slave.rate 48000 slave.pcm loopback_in } pcm.loopback_in { type hw card Loopback device 1 subdevice 0 } The following scenario does not trigger the issue. The CPU load is at most 2%. plug - - > upmix - - > downmix - - > forward_dmix pcm.giuliano_plug { type plug slave.pcm giuliano_upmix slave.channels 2 } pcm.giuliano_upmix { type route slave.pcm giuliano_downmix slave.channels 4 ttable.0.0 1 ttable.0.1 1 ttable.1.2 1 ttable.1.3 1 } pcm.giuliano_downmix { type route slave.pcm forward_dmix slave.channels 2 ttable.0.0 1 ttable.1.1 1 ttable.2.0 1 ttable.3.1 1 } --------------------------------------------------------------------- DEBUG PRINTS IN FUNCTION snd_pcm_write_areas IN FILE pcm.c --------------------------------------------------------------------- For each while iteration the log prints the available frames (avail) and the frames to be written (size). In the multi scenario the several while iterations decrease the performances and the CPU load is high. In the normal scenario i see that at most two iterations of the while are needed. In other words, in the multi scenario the avail frames are not enough to stop the loop. You can see below the prints: avail < size for 28 iterations. Note that this behaviour does not occurs only at startup, but every time during the playback. snd_pcm_sframes_t snd_pcm_write_areas(snd_pcm_t *pcm, const snd_pcm_channel_area_t *areas, snd_pcm_uframes_t offset, snd_pcm_uframes_t size, snd_pcm_xfer_areas_func_t func) { snd_pcm_uframes_t xfer = 0; snd_pcm_sframes_t err = 0; snd_pcm_state_t state; if (size == 0) return 0; int giuliano_i = 0; __snd_pcm_lock(pcm); /* forced lock */ while (size > 0) { snd_pcm_uframes_t frames; snd_pcm_sframes_t avail; _again: state = __snd_pcm_state(pcm); switch (state) { case SND_PCM_STATE_PREPARED: case SND_PCM_STATE_PAUSED: break; case SND_PCM_STATE_RUNNING: err = __snd_pcm_hwsync(pcm); if (err < 0) goto _end; break; default: err = pcm_state_to_error(state); if (!err) err = -EBADFD; goto _end; } avail = __snd_pcm_avail_update(pcm); fprintf( stderr, "giuliano | pcm.c | snd_pcm_write_areas | (%d) avail=%ld, size=%ld\n", giuliano_i, avail, size ); giuliano_i ++; if (avail < 0) { err = avail; goto _end; } if (state == SND_PCM_STATE_RUNNING && size > (snd_pcm_uframes_t)avail) { if (snd_pcm_may_wait_for_avail_min(pcm, avail)) { if (pcm->mode & SND_PCM_NONBLOCK) { err = -EAGAIN; goto _end; } err = snd_pcm_wait_nocheck(pcm, -1); if (err < 0) break; goto _again; } /* the snd_pcm_may_wait_for_avail_min may check against the * updated hw.ptr (slaves), get the avail again here */ avail = __snd_pcm_avail_update(pcm); if (avail < 0) { err = avail; goto _end; } } frames = size; if (frames > (snd_pcm_uframes_t) avail) frames = avail; if (! frames) break; err = func(pcm, areas, offset, frames); if (err < 0) break; frames = err; if (state == SND_PCM_STATE_PREPARED) { snd_pcm_sframes_t hw_avail = pcm->buffer_size - avail; hw_avail += frames; /* some plugins might automatically start the stream */ state = __snd_pcm_state(pcm); if (state == SND_PCM_STATE_PREPARED && hw_avail >= (snd_pcm_sframes_t) pcm->start_threshold) { err = __snd_pcm_start(pcm); if (err < 0) goto _end; } } offset += frames; size -= frames; xfer += frames; } _end: __snd_pcm_unlock(pcm); return xfer > 0 ? (snd_pcm_sframes_t) xfer : snd_pcm_check_error(pcm, err); } --------------------------------------------------------------------- DEBUG PRINTS OUTPUT --------------------------------------------------------------------- ## Multi scenario ## giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=1920 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=1920 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=1920, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=1440 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=1440 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=1440, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=960 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=960, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=480, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (2) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (3) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (4) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (5) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (6) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (7) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (8) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (9) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (10) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (11) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (12) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (13) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (14) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 giuliano | pcm.c | snd_pcm_write_areas | (15) avail=0, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=0 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 0 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (16) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (17) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (18) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (19) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (20) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (21) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (22) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (23) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (24) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (25) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (26) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 384 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=384 giuliano | pcm.c | snd_pcm_write_areas | (27) avail=384, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=1440 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=576 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=1440 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=576 giuliano | pcm.c | snd_pcm_write_areas | (28) avail=576, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=96 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=96, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=96 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 96 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=96 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=96, size=480 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=0, avail=960 giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=1, avail=96 *** snd_pcm_wait() FATAL ERROR!!! avail_min = 480, avail_update = 96 ## Normal scenario ## giuliano | pcm.c | snd_pcm_write_areas | (0) avail=1920, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=1440, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=960, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 giuliano | pcm.c | snd_pcm_write_areas | (0) avail=0, size=480 giuliano | pcm.c | snd_pcm_write_areas | (1) avail=480, size=480 --------------------------------------------------------------------- DEBUG PRINTS IN FUNCTION snd_pcm_wait_nocheck IN FILE pcm.c --------------------------------------------------------------------- As you can see in the debug prints above i have enabled the error message in the function snd_pcm_wait_nocheck. That message lead me to think that the issue is a poll related one, may be? int snd_pcm_wait_nocheck(snd_pcm_t *pcm, int timeout) { struct pollfd *pfd; unsigned short revents = 0; int npfds, err, err_poll; npfds = __snd_pcm_poll_descriptors_count(pcm); if (npfds <= 0 || npfds >= 16) { SNDERR("Invalid poll_fds %d\n", npfds); return -EIO; } pfd = alloca(sizeof(*pfd) * npfds); err = __snd_pcm_poll_descriptors(pcm, pfd, npfds); if (err < 0) return err; if (err != npfds) { SNDMSG("invalid poll descriptors %d\n", err); return -EIO; } do { __snd_pcm_unlock(pcm); err_poll = poll(pfd, npfds, timeout); __snd_pcm_lock(pcm); if (err_poll < 0) { if (errno == EINTR && !PCMINABORT(pcm)) continue; return -errno; } if (! err_poll) break; err = __snd_pcm_poll_revents(pcm, pfd, npfds, &revents); if (err < 0) return err; if (revents & (POLLERR | POLLNVAL)) { /* check more precisely */ err = pcm_state_to_error(__snd_pcm_state(pcm)); return err < 0 ? err : -EIO; } } while (!(revents & (POLLIN | POLLOUT))); #if 1 /* very useful code to test poll related problems */ { snd_pcm_sframes_t avail_update; __snd_pcm_hwsync(pcm); avail_update = __snd_pcm_avail_update(pcm); if (avail_update < (snd_pcm_sframes_t)pcm->avail_min) { printf("*** snd_pcm_wait() FATAL ERROR!!!\n"); printf("avail_min = %li, avail_update = %li\n", pcm->avail_min, avail_update); } } #endif return err_poll > 0 ? 1 : 0; } #endif --------------------------------------------------------------------- DEBUG PRINTS IN FUNCTION __snd_pcm_avail_update IN pcm_multi.c --------------------------------------------------------------------- As you can see in the prints above, i put some debugs logs in the function __snd_pcm_avail_update. I can read there the number of avail frames for each slave of the multi. I see also that the minimum numbers of frames is taken among the slaves. static snd_pcm_sframes_t snd_pcm_multi_avail_update(snd_pcm_t *pcm) { snd_pcm_multi_t *multi = pcm->private_data; snd_pcm_sframes_t ret = LONG_MAX; snd_pcm_sframes_t giuliano_temp = 0; unsigned int i; for (i = 0; i < multi->slaves_count; ++i) { snd_pcm_sframes_t avail; avail = snd_pcm_avail_update(multi->slaves[i].pcm); fprintf( stderr, "giuliano | pcm_multi.c | snd_pcm_multi_avail_update | slave=%d, avail=%d\n", i, avail ); if (avail < 0) return avail; if (ret > avail) ret = avail; } snd_pcm_multi_hwptr_update(pcm); return ret; } I hope that my debug prints are useful to find the issue. Thanks Giuliano Zannetti

1 0

[alsa-devel] [PATCH] ASoC: SOF: topology: use set_get_data in process load
by Pierre-Louis Bossart 07 Aug '19

07 Aug '19

From: Jaska Uimonen <jaska.uimonen(a)intel.com> Currently when loading sof process components there's a check if binary control data is associated with it. If found the data is extracted to be part of component loading and initialization. If binary data exceeds the ipc max size, loading fails with error as large message support is only implemented in set_get_data method. So make the process loading use set_get_data to enable large parameters in component initialization. Also refactor the process component loading function as it digs out 3 times almost identical information of related controls. This is redundant, looks ugly and makes it difficult to understand the mechanism. So make a function out of fetching the control data and use it in process loading. Signed-off-by: Jaska Uimonen <jaska.uimonen(a)intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/topology.c | 204 +++++++++++++++++++++++++-------------- 1 file changed, 130 insertions(+), 74 deletions(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 12b7d900b9c2..30b5638622dd 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -42,6 +42,13 @@ /* size of tplg abi in byte */ #define SOF_TPLG_ABI_SIZE 3 +struct sof_widget_data { + int ctrl_type; + int ipc_cmd; + struct sof_abi_hdr *pdata; + struct snd_sof_control *control; +}; + /* send pcm params ipc */ static int ipc_pcm_params(struct snd_sof_widget *swidget, int dir) { @@ -1742,51 +1749,32 @@ static int sof_widget_load_siggen(struct snd_soc_component *scomp, int index, return ret; } -static int sof_process_load(struct snd_soc_component *scomp, int index, - struct snd_sof_widget *swidget, - struct snd_soc_tplg_dapm_widget *tw, - struct sof_ipc_comp_reply *r, - int type) +static size_t sof_get_control_data(struct snd_sof_dev *sdev, + struct snd_soc_dapm_widget *widget, + struct sof_widget_data *wdata) { - struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp); - struct snd_soc_tplg_private *private = &tw->priv; - struct snd_soc_dapm_widget *widget = swidget->widget; const struct snd_kcontrol_new *kc; - struct soc_bytes_ext *sbe; struct soc_mixer_control *sm; + struct soc_bytes_ext *sbe; struct soc_enum *se; - struct snd_sof_control *scontrol = NULL; - struct sof_abi_hdr *pdata = NULL; - struct sof_ipc_comp_process *process; - size_t ipc_size, ipc_data_size = 0; - int ret, i, offset = 0; - - if (type == SOF_COMP_NONE) { - dev_err(sdev->dev, "error: invalid process comp type %d\n", - type); - return -EINVAL; - } + size_t size = 0; + int i; - /* - * get possible component controls - get size of all pdata, - * then memcpy with headers - */ for (i = 0; i < widget->num_kcontrols; i++) { - kc = &widget->kcontrol_news[i]; switch (widget->dobj.widget.kcontrol_type) { case SND_SOC_TPLG_TYPE_MIXER: sm = (struct soc_mixer_control *)kc->private_value; - scontrol = sm->dobj.private; + wdata[i].control = sm->dobj.private; break; case SND_SOC_TPLG_TYPE_BYTES: sbe = (struct soc_bytes_ext *)kc->private_value; - scontrol = sbe->dobj.private; + wdata[i].control = sbe->dobj.private; break; case SND_SOC_TPLG_TYPE_ENUM: se = (struct soc_enum *)kc->private_value; - scontrol = se->dobj.private; + wdata[i].control = se->dobj.private; break; default: dev_err(sdev->dev, "error: unknown kcontrol type %d in widget %s\n", @@ -1795,31 +1783,98 @@ static int sof_process_load(struct snd_soc_component *scomp, int index, return -EINVAL; } - if (!scontrol) { + if (!wdata[i].control) { dev_err(sdev->dev, "error: no scontrol for widget %s\n", widget->name); return -EINVAL; } - /* don't include if no private data */ - pdata = scontrol->control_data->data; - if (!pdata) - continue; + wdata[i].pdata = wdata[i].control->control_data->data; + if (!wdata[i].pdata) + return -EINVAL; /* make sure data is valid - data can be updated at runtime */ - if (pdata->magic != SOF_ABI_MAGIC) - continue; + if (wdata[i].pdata->magic != SOF_ABI_MAGIC) + return -EINVAL; + + size += wdata[i].pdata->size; - ipc_data_size += pdata->size; + /* get data type */ + switch (wdata[i].control->cmd) { + case SOF_CTRL_CMD_VOLUME: + case SOF_CTRL_CMD_ENUM: + case SOF_CTRL_CMD_SWITCH: + wdata[i].ipc_cmd = SOF_IPC_COMP_SET_VALUE; + wdata[i].ctrl_type = SOF_CTRL_TYPE_VALUE_CHAN_SET; + break; + case SOF_CTRL_CMD_BINARY: + wdata[i].ipc_cmd = SOF_IPC_COMP_SET_DATA; + wdata[i].ctrl_type = SOF_CTRL_TYPE_DATA_SET; + break; + default: + break; + } + } + + return size; +} + +static int sof_process_load(struct snd_soc_component *scomp, int index, + struct snd_sof_widget *swidget, + struct snd_soc_tplg_dapm_widget *tw, + struct sof_ipc_comp_reply *r, + int type) +{ + struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp); + struct snd_soc_dapm_widget *widget = swidget->widget; + struct snd_soc_tplg_private *private = &tw->priv; + struct sof_ipc_comp_process *process = NULL; + struct sof_widget_data *wdata = NULL; + size_t ipc_data_size = 0; + size_t ipc_size; + int offset = 0; + int ret = 0; + int i; + + if (type == SOF_COMP_NONE) { + dev_err(sdev->dev, "error: invalid process comp type %d\n", + type); + return -EINVAL; + } + + /* allocate struct for widget control data sizes and types */ + if (widget->num_kcontrols) { + wdata = kcalloc(widget->num_kcontrols, + sizeof(*wdata), + GFP_KERNEL); + + if (!wdata) + return -ENOMEM; + + /* get possible component controls and get size of all pdata */ + ipc_data_size = sof_get_control_data(sdev, widget, wdata); + + if (ipc_data_size <= 0) { + kfree(wdata); + return ipc_data_size; + } } ipc_size = sizeof(struct sof_ipc_comp_process) + le32_to_cpu(private->size) + ipc_data_size; + /* we are exceeding max ipc size, config needs to be sent separately */ + if (ipc_size > SOF_IPC_MSG_MAX_SIZE) { + ipc_size -= ipc_data_size; + ipc_data_size = 0; + } + process = kzalloc(ipc_size, GFP_KERNEL); - if (!process) + if (!process) { + kfree(wdata); return -ENOMEM; + } /* configure iir IPC message */ process->comp.hdr.size = ipc_size; @@ -1835,7 +1890,9 @@ static int sof_process_load(struct snd_soc_component *scomp, int index, if (ret != 0) { dev_err(sdev->dev, "error: parse process.cfg tokens failed %d\n", le32_to_cpu(private->size)); - goto err; + kfree(wdata); + kfree(process); + return ret; } sof_dbg_comp_config(scomp, &process->config); @@ -1845,40 +1902,13 @@ static int sof_process_load(struct snd_soc_component *scomp, int index, * get possible component controls - get size of all pdata, * then memcpy with headers */ - for (i = 0; i < widget->num_kcontrols; i++) { - kc = &widget->kcontrol_news[i]; - - switch (widget->dobj.widget.kcontrol_type) { - case SND_SOC_TPLG_TYPE_MIXER: - sm = (struct soc_mixer_control *)kc->private_value; - scontrol = sm->dobj.private; - break; - case SND_SOC_TPLG_TYPE_BYTES: - sbe = (struct soc_bytes_ext *)kc->private_value; - scontrol = sbe->dobj.private; - break; - case SND_SOC_TPLG_TYPE_ENUM: - se = (struct soc_enum *)kc->private_value; - scontrol = se->dobj.private; - break; - default: - dev_err(sdev->dev, "error: unknown kcontrol type %d in widget %s\n", - widget->dobj.widget.kcontrol_type, - widget->name); - return -EINVAL; + if (ipc_data_size) { + for (i = 0; i < widget->num_kcontrols; i++) { + memcpy(&process->data + offset, + wdata[i].pdata->data, + wdata[i].pdata->size); + offset += wdata[i].pdata->size; } - - /* don't include if no private data */ - pdata = scontrol->control_data->data; - if (!pdata) - continue; - - /* make sure data is valid - data can be updated at runtime */ - if (pdata->magic != SOF_ABI_MAGIC) - continue; - - memcpy(&process->data + offset, pdata->data, pdata->size); - offset += pdata->size; } process->size = ipc_data_size; @@ -1886,10 +1916,36 @@ static int sof_process_load(struct snd_soc_component *scomp, int index, ret = sof_ipc_tx_message(sdev->ipc, process->comp.hdr.cmd, process, ipc_size, r, sizeof(*r)); - if (ret >= 0) + + if (ret < 0) { + dev_err(sdev->dev, "error: create process failed\n"); + kfree(wdata); + kfree(process); return ret; -err: - kfree(process); + } + + /* we sent the data in single message so return */ + if (ipc_data_size) { + kfree(wdata); + return ret; + } + + /* send control data with large message supported method */ + for (i = 0; i < widget->num_kcontrols; i++) { + wdata[i].control->readback_offset = 0; + ret = snd_sof_ipc_set_get_comp_data(sdev->ipc, wdata[i].control, + wdata[i].ipc_cmd, + wdata[i].ctrl_type, + wdata[i].control->cmd, + true); + if (ret != 0) { + dev_err(sdev->dev, "error: send control failed\n"); + kfree(process); + break; + } + } + + kfree(wdata); return ret; } -- 2.20.1

3 3

[alsa-devel] [PATCH] ASoC: hdmi-codec: reorder channel allocation list
by Jonas Karlman 07 Aug '19

07 Aug '19

Wrong channel allocation is selected by hdmi_codec_get_ch_alloc_table_idx(). E.g when ELD reports FL|FR|LFE|FC|RL|RR or FL|FR|LFE|FC|RL|RR|RC|RLC|RRC ca_id 0x01 with speaker mask FL|FR|LFE gets selected instead of ca_id 0x03 with speaker mask FL|FR|LFE|FC for 4 channels and ca_id 0x04 with speaker mask FL|FR|RC gets selected instead of ca_id 0x0b with speaker mask FL|FR|LFE|FC|RL|RR for 6 channels Fix this by reorder the channel allocation list with most specific speaker mask at the top. Signed-off-by: Jonas Karlman <jonas(a)kwiboo.se> --- sound/soc/codecs/hdmi-codec.c | 115 ++++++++++++++++------------------ 1 file changed, 53 insertions(+), 62 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 0bf1c8cad108..9b5a0a419f86 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -188,84 +188,75 @@ static const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = { /* * hdmi_codec_channel_alloc: speaker configuration available for CEA * - * This is an ordered list that must match with hdmi_codec_8ch_chmaps struct + * This is an ordered list where ca_id must exist in hdmi_codec_8ch_chmaps * The preceding ones have better chances to be selected by * hdmi_codec_get_ch_alloc_table_idx(). */ static const struct hdmi_codec_cea_spk_alloc hdmi_codec_channel_alloc[] = { { .ca_id = 0x00, .n_ch = 2, - .mask = FL | FR}, - /* 2.1 */ - { .ca_id = 0x01, .n_ch = 4, - .mask = FL | FR | LFE}, - /* Dolby Surround */ + .mask = FL | FR }, + { .ca_id = 0x03, .n_ch = 4, + .mask = FL | FR | LFE | FC }, { .ca_id = 0x02, .n_ch = 4, .mask = FL | FR | FC }, - /* surround51 */ + { .ca_id = 0x01, .n_ch = 4, + .mask = FL | FR | LFE }, { .ca_id = 0x0b, .n_ch = 6, - .mask = FL | FR | LFE | FC | RL | RR}, - /* surround40 */ - { .ca_id = 0x08, .n_ch = 6, - .mask = FL | FR | RL | RR }, - /* surround41 */ - { .ca_id = 0x09, .n_ch = 6, - .mask = FL | FR | LFE | RL | RR }, - /* surround50 */ + .mask = FL | FR | LFE | FC | RL | RR }, { .ca_id = 0x0a, .n_ch = 6, .mask = FL | FR | FC | RL | RR }, - /* 6.1 */ - { .ca_id = 0x0f, .n_ch = 8, - .mask = FL | FR | LFE | FC | RL | RR | RC }, - /* surround71 */ + { .ca_id = 0x09, .n_ch = 6, + .mask = FL | FR | LFE | RL | RR }, + { .ca_id = 0x08, .n_ch = 6, + .mask = FL | FR | RL | RR }, + { .ca_id = 0x07, .n_ch = 6, + .mask = FL | FR | LFE | FC | RC }, + { .ca_id = 0x06, .n_ch = 6, + .mask = FL | FR | FC | RC }, + { .ca_id = 0x05, .n_ch = 6, + .mask = FL | FR | LFE | RC }, + { .ca_id = 0x04, .n_ch = 6, + .mask = FL | FR | RC }, { .ca_id = 0x13, .n_ch = 8, .mask = FL | FR | LFE | FC | RL | RR | RLC | RRC }, - /* others */ - { .ca_id = 0x03, .n_ch = 8, - .mask = FL | FR | LFE | FC }, - { .ca_id = 0x04, .n_ch = 8, - .mask = FL | FR | RC}, - { .ca_id = 0x05, .n_ch = 8, - .mask = FL | FR | LFE | RC }, - { .ca_id = 0x06, .n_ch = 8, - .mask = FL | FR | FC | RC }, - { .ca_id = 0x07, .n_ch = 8, - .mask = FL | FR | LFE | FC | RC }, - { .ca_id = 0x0c, .n_ch = 8, - .mask = FL | FR | RC | RL | RR }, - { .ca_id = 0x0d, .n_ch = 8, - .mask = FL | FR | LFE | RL | RR | RC }, - { .ca_id = 0x0e, .n_ch = 8, - .mask = FL | FR | FC | RL | RR | RC }, - { .ca_id = 0x10, .n_ch = 8, - .mask = FL | FR | RL | RR | RLC | RRC }, - { .ca_id = 0x11, .n_ch = 8, - .mask = FL | FR | LFE | RL | RR | RLC | RRC }, + { .ca_id = 0x1f, .n_ch = 8, + .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC }, { .ca_id = 0x12, .n_ch = 8, .mask = FL | FR | FC | RL | RR | RLC | RRC }, - { .ca_id = 0x14, .n_ch = 8, - .mask = FL | FR | FLC | FRC }, - { .ca_id = 0x15, .n_ch = 8, - .mask = FL | FR | LFE | FLC | FRC }, - { .ca_id = 0x16, .n_ch = 8, - .mask = FL | FR | FC | FLC | FRC }, - { .ca_id = 0x17, .n_ch = 8, - .mask = FL | FR | LFE | FC | FLC | FRC }, - { .ca_id = 0x18, .n_ch = 8, - .mask = FL | FR | RC | FLC | FRC }, - { .ca_id = 0x19, .n_ch = 8, - .mask = FL | FR | LFE | RC | FLC | FRC }, - { .ca_id = 0x1a, .n_ch = 8, - .mask = FL | FR | RC | FC | FLC | FRC }, - { .ca_id = 0x1b, .n_ch = 8, - .mask = FL | FR | LFE | RC | FC | FLC | FRC }, - { .ca_id = 0x1c, .n_ch = 8, - .mask = FL | FR | RL | RR | FLC | FRC }, - { .ca_id = 0x1d, .n_ch = 8, - .mask = FL | FR | LFE | RL | RR | FLC | FRC }, { .ca_id = 0x1e, .n_ch = 8, .mask = FL | FR | FC | RL | RR | FLC | FRC }, - { .ca_id = 0x1f, .n_ch = 8, - .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC }, + { .ca_id = 0x11, .n_ch = 8, + .mask = FL | FR | LFE | RL | RR | RLC | RRC }, + { .ca_id = 0x1d, .n_ch = 8, + .mask = FL | FR | LFE | RL | RR | FLC | FRC }, + { .ca_id = 0x10, .n_ch = 8, + .mask = FL | FR | RL | RR | RLC | RRC }, + { .ca_id = 0x1c, .n_ch = 8, + .mask = FL | FR | RL | RR | FLC | FRC }, + { .ca_id = 0x0f, .n_ch = 8, + .mask = FL | FR | LFE | FC | RL | RR | RC }, + { .ca_id = 0x1b, .n_ch = 8, + .mask = FL | FR | LFE | RC | FC | FLC | FRC }, + { .ca_id = 0x0e, .n_ch = 8, + .mask = FL | FR | FC | RL | RR | RC }, + { .ca_id = 0x1a, .n_ch = 8, + .mask = FL | FR | RC | FC | FLC | FRC }, + { .ca_id = 0x0d, .n_ch = 8, + .mask = FL | FR | LFE | RL | RR | RC }, + { .ca_id = 0x19, .n_ch = 8, + .mask = FL | FR | LFE | RC | FLC | FRC }, + { .ca_id = 0x0c, .n_ch = 8, + .mask = FL | FR | RC | RL | RR }, + { .ca_id = 0x18, .n_ch = 8, + .mask = FL | FR | RC | FLC | FRC }, + { .ca_id = 0x17, .n_ch = 8, + .mask = FL | FR | LFE | FC | FLC | FRC }, + { .ca_id = 0x16, .n_ch = 8, + .mask = FL | FR | FC | FLC | FRC }, + { .ca_id = 0x15, .n_ch = 8, + .mask = FL | FR | LFE | FLC | FRC }, + { .ca_id = 0x14, .n_ch = 8, + .mask = FL | FR | FLC | FRC }, }; struct hdmi_codec_priv { -- 2.17.1

1 0

[alsa-devel] [PATCH] ASoC: SOF: Intel: hda: Initialize HDA controller after i915 init
by Ranjani Sridharan 07 Aug '19

07 Aug '19

On some platforms, sound card registration fails when a HDMI monitor is not connected. This is caused by a recent commit that switched the order in which the HDA controller and the i915 are initialized. Initializing the i915 before initializing the HDA controller fixes the problem. Fixes: be1b577d01787c ("ASoC: SOF: Intel: hda: fix the hda init chip" Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/intel/hda.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 79cce20666b6..724a494702fa 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -335,10 +335,23 @@ static int hda_init_caps(struct snd_sof_dev *sdev) if (bus->ppcap) dev_dbg(sdev->dev, "PP capability, will probe DSP later.\n"); +#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) + /* init i915 and HDMI codecs */ + ret = hda_codec_i915_init(sdev); + if (ret < 0) { + dev_err(sdev->dev, "error: init i915 and HDMI codec failed\n"); + return ret; + } +#endif + + /* Init HDA controller after i915 init */ ret = hda_dsp_ctrl_init_chip(sdev, true); if (ret < 0) { dev_err(bus->dev, "error: init chip failed with ret: %d\n", ret); +#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) + hda_codec_i915_exit(sdev); +#endif return ret; } @@ -346,13 +359,6 @@ static int hda_init_caps(struct snd_sof_dev *sdev) if (bus->mlcap) snd_hdac_ext_bus_get_ml_capabilities(bus); - /* init i915 and HDMI codecs */ - ret = hda_codec_i915_init(sdev); - if (ret < 0) { - dev_err(sdev->dev, "error: no HDMI audio devices found\n"); - return ret; - } - /* codec detection */ if (!bus->codec_mask) { dev_info(bus->dev, "no hda codecs found!\n"); -- 2.17.1

3 2

[alsa-devel] [PATCH] ASoC: rsnd: don't call clk_get_rate() under atomic context
by Kuninori Morimoto 07 Aug '19

07 Aug '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ADG is using clk_get_rate() under atomic context, thus, we might have scheduling issue. To avoid this issue, we need to get/keep clk rate under non atomic context. We need to handle ADG as special device at Renesas Sound driver. From SW point of view, we want to impletent it as rsnd_mod_ops :: prepare, but it makes code just complicate. To avoid complicated code/patch, this patch adds new clk_rate[] array, and keep clk IN rate when rsnd_adg_clk_enable() was called. Reported-by: Leon Kong <Leon.KONG(a)cn.bosch.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Tested-by: Leon Kong <Leon.KONG(a)cn.bosch.com> --- sound/soc/sh/rcar/adg.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index fce4e05..b9aacf3 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -30,6 +30,7 @@ struct rsnd_adg { struct clk *clkout[CLKOUTMAX]; struct clk_onecell_data onecell; struct rsnd_mod mod; + int clk_rate[CLKMAX]; u32 flags; u32 ckr; u32 rbga; @@ -114,9 +115,9 @@ static void __rsnd_adg_get_timesel_ratio(struct rsnd_priv *priv, unsigned int val, en; unsigned int min, diff; unsigned int sel_rate[] = { - clk_get_rate(adg->clk[CLKA]), /* 0000: CLKA */ - clk_get_rate(adg->clk[CLKB]), /* 0001: CLKB */ - clk_get_rate(adg->clk[CLKC]), /* 0010: CLKC */ + adg->clk_rate[CLKA], /* 0000: CLKA */ + adg->clk_rate[CLKB], /* 0001: CLKB */ + adg->clk_rate[CLKC], /* 0010: CLKC */ adg->rbga_rate_for_441khz, /* 0011: RBGA */ adg->rbgb_rate_for_48khz, /* 0100: RBGB */ }; @@ -302,7 +303,7 @@ int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate) * AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC/AUDIO_CLKI. */ for_each_rsnd_clk(clk, adg, i) { - if (rate == clk_get_rate(clk)) + if (rate == adg->clk_rate[i]) return sel_table[i]; } @@ -369,10 +370,18 @@ void rsnd_adg_clk_control(struct rsnd_priv *priv, int enable) for_each_rsnd_clk(clk, adg, i) { ret = 0; - if (enable) + if (enable) { ret = clk_prepare_enable(clk); - else + + /* + * We shouldn't use clk_get_rate() under + * atomic context. Let's keep it when + * rsnd_adg_clk_enable() was called + */ + adg->clk_rate[i] = clk_get_rate(adg->clk[i]); + } else { clk_disable_unprepare(clk); + } if (ret < 0) dev_warn(dev, "can't use clk %d\n", i); -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: SOF: Intel: hda: fix MSI handling
by Pierre-Louis Bossart 07 Aug '19

07 Aug '19

The addition of a kernel module parameter to optionally disable MSI had the side effect of permanently disabling it. The return value of pci_alloc_irq_vectors() is the number of allocated vectors or a negative number on error, so testing with the ! operator is not quite right. It was one optimization too far. Restore previous behavior to use MSI by default, unless the user selects not to do so or the allocation of irq_vectors fails. Fixes: 672ff5e3596ee ('ASoC: SOF: Intel: hda: add a parameter to disable MSI') Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/intel/hda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 724a494702fa..c7de5065b961 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -543,7 +543,7 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) * if it fails, use legacy interrupt mode * TODO: support msi multiple vectors */ - if (hda_use_msi && !pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI)) { + if (hda_use_msi && pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) > 0) { dev_info(sdev->dev, "use msi interrupt mode\n"); hdev->irq = pci_irq_vector(pci, 0); /* ipc irq number is the same of hda irq */ -- 2.20.1

2 1