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

[alsa-devel] [PATCH][alsa-lib] topology: fix unused-const-variable warning
by Takashi Sakamoto 02 Jan '17

02 Jan '17

Last year, unused static const variable was added, then compiler generates a below warning. dapm.c:43:30: warning: ‘widget_control_map’ defined but not used [-Wunused-const-variable=] static const struct map_elem widget_control_map[] = { ^~~~~~~~~~~~~~~~~~ This commit removes it. Fixes: 01a0e1a1c219 ("topology: Add DAPM object parser") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- src/topology/dapm.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/topology/dapm.c b/src/topology/dapm.c index e830751..8c585a7 100644 --- a/src/topology/dapm.c +++ b/src/topology/dapm.c @@ -39,14 +39,6 @@ static const struct map_elem widget_map[] = { {"dai_link", SND_SOC_TPLG_DAPM_DAI_LINK}, }; -/* mapping of widget kcontrol text names to types */ -static const struct map_elem widget_control_map[] = { - {"volsw", SND_SOC_TPLG_DAPM_CTL_VOLSW}, - {"enum_double", SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE}, - {"enum_virt", SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT}, - {"enum_value", SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE}, -}; - static int lookup_widget(const char *w) { unsigned int i; -- 2.9.3

4 8

[alsa-devel] [PATCH][alsa-lib] topology: fix sign-compare warning introduced to set_link_hw_config() and tplg_add_link_object()
by Takashi Sakamoto 02 Jan '17

02 Jan '17

Some functions recently introduced to this library include comparison between variables with different types, then compiler generates below warnings. pcm.c: In function ‘set_link_hw_config’: pcm.c:1179:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (i = 0; i < cfg->tx_channels; i++) ^ pcm.c:1183:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (i = 0; i < cfg->rx_channels; i++) ^ pcm.c: In function ‘tplg_add_link_object’: pcm.c:1223:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (i = 0; i < link->num_streams; i++) ^ pcm.c:1231:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (i = 0; i < link->num_hw_configs; i++) This commit suppresses them. Fixes: 6b4d775b9752 ("topology: Parse HW configurations of physical DAI links defined by C API") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- src/topology/pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/topology/pcm.c b/src/topology/pcm.c index 8f8a703..1de8655 100644 --- a/src/topology/pcm.c +++ b/src/topology/pcm.c @@ -1147,7 +1147,7 @@ int tplg_add_pcm_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t) static int set_link_hw_config(struct snd_soc_tplg_hw_config *cfg, struct snd_tplg_hw_config_template *tpl) { - int i; + unsigned int i; cfg->size = sizeof(*cfg); cfg->id = tpl->id; @@ -1190,7 +1190,7 @@ int tplg_add_link_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t) struct snd_tplg_link_template *link_tpl = t->link; struct snd_soc_tplg_link_config *link, *_link; struct tplg_elem *elem; - int i; + unsigned int i; if (t->type != SND_TPLG_TYPE_LINK && t->type != SND_TPLG_TYPE_BE && t->type != SND_TPLG_TYPE_CC) -- 2.9.3

3 3

[alsa-devel] [PATCH 0/2 v2] alsa-lib: dynamically adapt the avail_min on the slave
by Jiada Wang 02 Jan '17

02 Jan '17

When configuring avail_min to multiple of slave period size it can happen that user waits one slave period longer than needed for available data. Root cause is implicit grabbing of slave samples in avail_update operation. On next entering poll, the slave will wait for the avail_min threshold reached again, as he is not aware that there are already pending samples in the above layer which are not yet provided to user. Solution is to dynamically adapt the avail_min on the slave. Andreas Pape (2): plugin: dynamically update avail_min on slave rate: dynamic update avail_min on slave src/pcm/pcm_plugin.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++- src/pcm/pcm_plugin.h | 3 +++ src/pcm/pcm_rate.c | 2 +- 3 files changed, 67 insertions(+), 2 deletions(-) -- 2.9.3

2 3

[alsa-devel] [PATCH 3/6] alsa-lib: pcm:dshare enable silence
by sutar.mounesh＠gmail.com 02 Jan '17

02 Jan '17

From: Alexander Jahn <ajahn(a)de.adit-jv.com> This issue depends on system load - if the process using dshare is scheduled fast enough, then there is no noise. A delay of e.g >~2ms produces hearable noise. Reproduction with instrumented aplay(sleep every 100th period for a given time): During the sleep time of 2000000us (2s) the hardware plays old samples in a loop before xrun is detected and recovered after the sleep. This is resolved by placing it in silence, in case of dshare plugin. Signed-off-by: Alexander Jahn <ajahn(a)de.adit-jv.com> Signed-off-by: Andreas Pape <apape(a)de.adit-jv.com> diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 4234d66..779845c 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -1240,7 +1240,7 @@ int snd_pcm_direct_initialize_slave(snd_pcm_direct_t *dmix, snd_pcm_t *spcm, str return ret; } - if (dmix->type != SND_PCM_TYPE_DMIX) + if ((dmix->type != SND_PCM_TYPE_DMIX)&&(dmix->type != SND_PCM_TYPE_DSHARE)) goto __skip_silencing; ret = snd_pcm_sw_params_set_silence_threshold(spcm, &sw_params, 0); -- 1.7.9.5

2 1

[alsa-devel] [PATCH 2/6] alsa-lib: Fix for sync issue on xrun recover
by sutar.mounesh＠gmail.com 02 Jan '17

02 Jan '17

From: Andreas Pape <apape(a)de.adit-jv.com> If using very short periods, DSHARE/DSNOOP/DMIX may report underruns while in status 'prepared'. This prohibits correct recovery. Now slave xrun conditions for DSHARE/DSNOOP/DMIX are being handled properly. Signed-off-by: Andreas Pape <apape(a)de.adit-jv.com> Signed-off-by: Joshua Frkuska <joshua_frkuska(a)mentor.com> diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 8f42b19..4234d66 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -572,6 +572,9 @@ int snd_pcm_direct_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned in } switch (snd_pcm_state(dmix->spcm)) { case SND_PCM_STATE_XRUN: + /*recover slave and update client state to xrun before returning POLLERR*/ + snd_pcm_direct_slave_recover(dmix); + snd_pcm_direct_client_chk_xrun(dmix, pcm); case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_SETUP: events |= POLLERR; @@ -965,6 +968,83 @@ static void save_slave_setting(snd_pcm_direct_t *dmix, snd_pcm_t *spcm) #undef COPY_SLAVE +#define direct_sem_down_chk_ret(d, id) {\ + int semerr = snd_pcm_direct_semaphore_down(d, DIRECT_IPC_SEM_CLIENT); \ + if (semerr) {\ + SNDERR("SEMDOWN FAILED with err %d", semerr);\ + return semerr;\ + }\ +} + +#define direct_sem_up_chk_ret(d, id) {\ + int semerr = snd_pcm_direct_semaphore_up(d, DIRECT_IPC_SEM_CLIENT); \ + if (semerr) {\ + SNDERR("SEMUP FAILED with err %d", semerr);\ + return semerr;\ + }\ +} + +/* + * Recover slave on XRUN. + * Even if direct plugins disable xrun detection, there might be an xrun raised directly by some drivers. + * The first client recovers slave pcm. + * Each client needs to execute sw xrun handling afterwards + */ +int snd_pcm_direct_slave_recover(snd_pcm_direct_t *direct) +{ + int ret = 0; + + direct_sem_down_chk_ret(direct, DIRECT_IPC_SEM_CLIENT); + if (snd_pcm_state(direct->spcm) != SND_PCM_STATE_XRUN) { + /*ignore... someone else already did recovery*/ + direct_sem_up_chk_ret(direct, DIRECT_IPC_SEM_CLIENT); + return ret; + } + + ret = snd_pcm_prepare(direct->spcm); + if (ret < 0) { + SNDERR("recover: unable to prepare slave"); + direct_sem_up_chk_ret(direct, DIRECT_IPC_SEM_CLIENT); + return ret; + } + + if (direct->type == SND_PCM_TYPE_DSHARE) { + const snd_pcm_channel_area_t *dst_areas; + dst_areas = snd_pcm_mmap_areas(direct->spcm); + snd_pcm_areas_silence(dst_areas, 0, direct->spcm->channels, direct->spcm->buffer_size, direct->spcm->format); + } + + ret = snd_pcm_start(direct->spcm); + if (ret < 0) { + SNDERR("recover: unable to start slave"); + direct_sem_up_chk_ret(direct, DIRECT_IPC_SEM_CLIENT); + return ret; + } + direct->shmptr->recoveries++; + direct_sem_up_chk_ret(direct, DIRECT_IPC_SEM_CLIENT); + return 0; +} + +/* + * enter xrun state, if slave xrun occured + * @return: 0 - no xrun >0: xrun happened + */ +int snd_pcm_direct_client_chk_xrun(snd_pcm_direct_t *direct, snd_pcm_t *pcm) +{ + if (direct->shmptr->recoveries != direct->recoveries) { + /* no matter how many xruns we missed - so don't increment but just update to actual counter*/ + direct->recoveries = direct->shmptr->recoveries; + pcm->fast_ops->drop(pcm); + /*trigger_tstamp update is missing in drop callbacks*/ + gettimestamp(&direct->trigger_tstamp, pcm->tstamp_type); + /*no timer clear: if slave already entered xrun again the event is lost...*/ + /*snd_pcm_direct_clear_timer_queue(direct);*/ + direct->state = SND_PCM_STATE_XRUN; + return 1; + } + return 0; +} + /* * this function initializes hardware and starts playback operation with * no stop threshold (it operates all time without xrun checking) @@ -1380,6 +1460,7 @@ int snd_pcm_direct_open_secondary_client(snd_pcm_t **spcmp, snd_pcm_direct_t *dm dmix->slave_buffer_size = spcm->buffer_size; dmix->slave_period_size = dmix->shmptr->s.period_size; dmix->slave_boundary = spcm->boundary; + dmix->recoveries = dmix->shmptr->recoveries; ret = snd_pcm_mmap(spcm); if (ret < 0) { diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h index 91e816c..569d2be 100644 --- a/src/pcm/pcm_direct.h +++ b/src/pcm/pcm_direct.h @@ -66,6 +66,7 @@ typedef struct { char socket_name[256]; /* name of communication socket */ snd_pcm_type_t type; /* PCM type (currently only hw) */ int use_server; + unsigned int recoveries; /* no of executed recoveries on slave*/ struct { unsigned int format; snd_interval_t rate; @@ -157,6 +158,7 @@ struct snd_pcm_direct { int var_periodsize; /* allow variable period size if max_periods is != -1*/ unsigned int channels; /* client's channels */ unsigned int *bindings; + unsigned int recoveries; /* mirror of executed recoveries on slave */ union { struct { int shmid_sum; /* IPC global sum ring buffer memory identification */ @@ -318,7 +320,8 @@ int snd_pcm_direct_open_secondary_client(snd_pcm_t **spcmp, snd_pcm_direct_t *dm snd_pcm_chmap_query_t **snd_pcm_direct_query_chmaps(snd_pcm_t *pcm); snd_pcm_chmap_t *snd_pcm_direct_get_chmap(snd_pcm_t *pcm); int snd_pcm_direct_set_chmap(snd_pcm_t *pcm, const snd_pcm_chmap_t *map); - +int snd_pcm_direct_slave_recover(snd_pcm_direct_t *direct); +int snd_pcm_direct_client_chk_xrun(snd_pcm_direct_t *direct, snd_pcm_t *pcm); int snd_timer_async(snd_timer_t *timer, int sig, pid_t pid); struct timespec snd_pcm_hw_fast_tstamp(snd_pcm_t *pcm); diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 0ab7323..5c3eb2d 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -396,6 +396,7 @@ static int snd_pcm_dmix_sync_ptr0(snd_pcm_t *pcm, snd_pcm_uframes_t slave_hw_ptr snd_pcm_direct_t *dmix = pcm->private_data; snd_pcm_uframes_t old_slave_hw_ptr, avail; snd_pcm_sframes_t diff; + int err; old_slave_hw_ptr = dmix->slave_hw_ptr; dmix->slave_hw_ptr = *dmix->spcm->hw.ptr; @@ -434,15 +435,21 @@ static int snd_pcm_dmix_sync_ptr0(snd_pcm_t *pcm, snd_pcm_uframes_t slave_hw_ptr static int snd_pcm_dmix_sync_ptr(snd_pcm_t *pcm) { snd_pcm_direct_t *dmix = pcm->private_data; + int err; switch (snd_pcm_state(dmix->spcm)) { case SND_PCM_STATE_DISCONNECTED: dmix->state = SND_PCM_STATE_DISCONNECTED; return -ENODEV; + case SND_PCM_STATE_XRUN: + if ((err = snd_pcm_direct_slave_recover(dmix)) <0) + return err; + break; default: break; } - + if (snd_pcm_direct_client_chk_xrun(dmix, pcm)) + return -EPIPE; if (dmix->slowptr) snd_pcm_hwsync(dmix->spcm); @@ -828,12 +835,16 @@ static snd_pcm_sframes_t snd_pcm_dmix_mmap_commit(snd_pcm_t *pcm, switch (snd_pcm_state(dmix->spcm)) { case SND_PCM_STATE_XRUN: - return -EPIPE; + if ((err = snd_pcm_direct_slave_recover(dmix)) < 0) + return err; + break; case SND_PCM_STATE_SUSPENDED: return -ESTRPIPE; default: break; } + if (snd_pcm_direct_client_chk_xrun(dmix, pcm)) + return -EPIPE; if (! size) return 0; snd_pcm_mmap_appl_forward(pcm, size); @@ -841,8 +852,10 @@ static snd_pcm_sframes_t snd_pcm_dmix_mmap_commit(snd_pcm_t *pcm, if ((err = snd_pcm_dmix_start_timer(pcm, dmix)) < 0) return err; } else if (dmix->state == SND_PCM_STATE_RUNNING || - dmix->state == SND_PCM_STATE_DRAINING) - snd_pcm_dmix_sync_ptr(pcm); + dmix->state == SND_PCM_STATE_DRAINING) { + if (( err = snd_pcm_dmix_sync_ptr(pcm)) < 0) + return err; + } if (dmix->state == SND_PCM_STATE_RUNNING || dmix->state == SND_PCM_STATE_DRAINING) { /* ok, we commit the changes after the validation of area */ @@ -858,10 +871,13 @@ static snd_pcm_sframes_t snd_pcm_dmix_mmap_commit(snd_pcm_t *pcm, static snd_pcm_sframes_t snd_pcm_dmix_avail_update(snd_pcm_t *pcm) { snd_pcm_direct_t *dmix = pcm->private_data; + int err; if (dmix->state == SND_PCM_STATE_RUNNING || - dmix->state == SND_PCM_STATE_DRAINING) - snd_pcm_dmix_sync_ptr(pcm); + dmix->state == SND_PCM_STATE_DRAINING) { + if (( err = snd_pcm_dmix_sync_ptr(pcm)) < 0) + return err; + } return snd_pcm_mmap_playback_avail(pcm); } diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index a1fed5d..707e2c2 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -202,15 +202,21 @@ static int snd_pcm_dshare_sync_ptr0(snd_pcm_t *pcm, snd_pcm_uframes_t slave_hw_p static int snd_pcm_dshare_sync_ptr(snd_pcm_t *pcm) { snd_pcm_direct_t *dshare = pcm->private_data; + int err; switch (snd_pcm_state(dshare->spcm)) { case SND_PCM_STATE_DISCONNECTED: dshare->state = SNDRV_PCM_STATE_DISCONNECTED; return -ENODEV; + case SND_PCM_STATE_XRUN: + if ((err = snd_pcm_direct_slave_recover(dshare)) <0) + return err; + break; default: break; } - + if (snd_pcm_direct_client_chk_xrun(dshare, pcm)) + return -EPIPE; if (dshare->slowptr) snd_pcm_hwsync(dshare->spcm); @@ -516,12 +522,16 @@ static snd_pcm_sframes_t snd_pcm_dshare_mmap_commit(snd_pcm_t *pcm, switch (snd_pcm_state(dshare->spcm)) { case SND_PCM_STATE_XRUN: - return -EPIPE; + if ((err = snd_pcm_direct_slave_recover(dshare)) < 0) + return err; + break; case SND_PCM_STATE_SUSPENDED: return -ESTRPIPE; default: break; } + if (snd_pcm_direct_client_chk_xrun(dshare, pcm)) + return -EPIPE; if (! size) return 0; snd_pcm_mmap_appl_forward(pcm, size); @@ -529,8 +539,10 @@ static snd_pcm_sframes_t snd_pcm_dshare_mmap_commit(snd_pcm_t *pcm, if ((err = snd_pcm_dshare_start_timer(dshare)) < 0) return err; } else if (dshare->state == SND_PCM_STATE_RUNNING || - dshare->state == SND_PCM_STATE_DRAINING) - snd_pcm_dshare_sync_ptr(pcm); + dshare->state == SND_PCM_STATE_DRAINING) { + if ((err = snd_pcm_dshare_sync_ptr(pcm)) < 0) + return err; + } if (dshare->state == SND_PCM_STATE_RUNNING || dshare->state == SND_PCM_STATE_DRAINING) { /* ok, we commit the changes after the validation of area */ @@ -546,10 +558,13 @@ static snd_pcm_sframes_t snd_pcm_dshare_mmap_commit(snd_pcm_t *pcm, static snd_pcm_sframes_t snd_pcm_dshare_avail_update(snd_pcm_t *pcm) { snd_pcm_direct_t *dshare = pcm->private_data; + int err; if (dshare->state == SND_PCM_STATE_RUNNING || - dshare->state == SND_PCM_STATE_DRAINING) - snd_pcm_dshare_sync_ptr(pcm); + dshare->state == SND_PCM_STATE_DRAINING) { + if ((err = snd_pcm_dshare_sync_ptr(pcm)) < 0) + return err; + } return snd_pcm_mmap_playback_avail(pcm); } diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c index 85f0ff4..512e957 100644 --- a/src/pcm/pcm_dsnoop.c +++ b/src/pcm/pcm_dsnoop.c @@ -132,14 +132,21 @@ static int snd_pcm_dsnoop_sync_ptr(snd_pcm_t *pcm) snd_pcm_direct_t *dsnoop = pcm->private_data; snd_pcm_uframes_t slave_hw_ptr, old_slave_hw_ptr, avail; snd_pcm_sframes_t diff; + int err; switch (snd_pcm_state(dsnoop->spcm)) { case SND_PCM_STATE_DISCONNECTED: dsnoop->state = SNDRV_PCM_STATE_DISCONNECTED; return -ENODEV; + case SND_PCM_STATE_XRUN: + if ((err = snd_pcm_direct_slave_recover(dsnoop)) <0) + return err; + break; default: break; } + if (snd_pcm_direct_client_chk_xrun(dsnoop, pcm)) + return -EPIPE; if (dsnoop->slowptr) snd_pcm_hwsync(dsnoop->spcm); old_slave_hw_ptr = dsnoop->slave_hw_ptr; @@ -410,12 +417,16 @@ static snd_pcm_sframes_t snd_pcm_dsnoop_mmap_commit(snd_pcm_t *pcm, switch (snd_pcm_state(dsnoop->spcm)) { case SND_PCM_STATE_XRUN: - return -EPIPE; + if ((err = snd_pcm_direct_slave_recover(dsnoop)) <0) + return err; + break; case SND_PCM_STATE_SUSPENDED: return -ESTRPIPE; default: break; } + if (snd_pcm_direct_client_chk_xrun(dsnoop, pcm)) + return -EPIPE; if (dsnoop->state == SND_PCM_STATE_RUNNING) { err = snd_pcm_dsnoop_sync_ptr(pcm); if (err < 0) -- 1.7.9.5

2 1

[alsa-devel] [PATCH 1/6] alsa-lib:pcm: allow users to configure different period sizes.
by sutar.mounesh＠gmail.com 02 Jan '17

02 Jan '17

From: Joshua Frkuska joshua_frkuska(a)mentor.com This patch allows the effective period size to be a multiple of the slave-pcm period size. Allowing only exact multiple of original period size is achieved by borrowing code from the kernel hwrules implemention. This patch is intended to save cpu workload when for example, the slave operates with very small periods but a user does not need that small periods. This feature is enabled by default and can be disabled by adding config option 'var_periodsize 0'. Signed-off-by: Alexander Jahn <ajahn(a)de.adit-jv.com> Signed-off-by: Andreas Pape <apape(a)de.adit-jv.com> diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 6434983..8f42b19 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -660,6 +660,28 @@ static int hw_param_interval_refine_minmax(snd_pcm_hw_params_t *params, return hw_param_interval_refine_one(params, var, &t); } +/* this code is used 'as-is' from the alsa kernel code */ +static int snd_interval_step(struct snd_interval *i, unsigned int min, unsigned int step) +{ + unsigned int n; + int changed = 0; + n = (i->min - min) % step; + if (n != 0 || i->openmin) { + i->min += step - n; + changed = 1; + } + n = (i->max - min) % step; + if (n != 0 || i->openmax) { + i->max -= n; + changed = 1; + } + if (snd_interval_checkempty(i)) { + i->empty = 1; + return -EINVAL; + } + return changed; +} + #undef REFINE_DEBUG int snd_pcm_direct_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) @@ -710,15 +732,16 @@ int snd_pcm_direct_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) &dshare->shmptr->hw.rate); if (err < 0) return err; - err = hw_param_interval_refine_one(params, SND_PCM_HW_PARAM_PERIOD_SIZE, - &dshare->shmptr->hw.period_size); - if (err < 0) - return err; - err = hw_param_interval_refine_one(params, SND_PCM_HW_PARAM_PERIOD_TIME, - &dshare->shmptr->hw.period_time); - if (err < 0) - return err; + if (dshare->max_periods < 0) { + err = hw_param_interval_refine_one(params, SND_PCM_HW_PARAM_PERIOD_SIZE, + &dshare->shmptr->hw.period_size); + if (err < 0) + return err; + err = hw_param_interval_refine_one(params, SND_PCM_HW_PARAM_PERIOD_TIME, + &dshare->shmptr->hw.period_time); + if (err < 0) + return err; err = hw_param_interval_refine_one(params, SND_PCM_HW_PARAM_BUFFER_SIZE, &dshare->shmptr->hw.buffer_size); if (err < 0) @@ -730,11 +753,38 @@ int snd_pcm_direct_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) } else if (params->rmask & ((1<<SND_PCM_HW_PARAM_PERIODS)| (1<<SND_PCM_HW_PARAM_BUFFER_BYTES)| (1<<SND_PCM_HW_PARAM_BUFFER_SIZE)| - (1<<SND_PCM_HW_PARAM_BUFFER_TIME))) { + (1<<SND_PCM_HW_PARAM_BUFFER_TIME)| + (1<<SND_PCM_HW_PARAM_PERIOD_TIME)| + (1<<SND_PCM_HW_PARAM_PERIOD_SIZE)| + (1<<SND_PCM_HW_PARAM_PERIOD_BYTES))) { + snd_interval_t period_size = dshare->shmptr->hw.period_size; + snd_interval_t period_time = dshare->shmptr->hw.period_time; int changed; unsigned int max_periods = dshare->max_periods; if (max_periods < 2) max_periods = dshare->slave_buffer_size / dshare->slave_period_size; + + /*make sure buffer size does not exceed slave buffer size*/ + err = hw_param_interval_refine_minmax(params, SND_PCM_HW_PARAM_BUFFER_SIZE, + 2 * dshare->slave_period_size, dshare->slave_buffer_size); + if (err < 0) + return err; + if (dshare->var_periodsize) { + /*more tolerant settings...*/ + if((dshare->shmptr->hw.buffer_size.max / 2) > period_size.max) + period_size.max = dshare->shmptr->hw.buffer_size.max / 2; + if((dshare->shmptr->hw.buffer_time.max / 2) > period_time.max) + period_time.max = dshare->shmptr->hw.buffer_time.max / 2; + } + + err = hw_param_interval_refine_one(params, SND_PCM_HW_PARAM_PERIOD_SIZE, + &period_size); + if (err < 0) + return err; + err = hw_param_interval_refine_one(params, SND_PCM_HW_PARAM_PERIOD_TIME, + &period_time); + if (err < 0) + return err; do { changed = 0; err = hw_param_interval_refine_minmax(params, SND_PCM_HW_PARAM_PERIODS, @@ -746,8 +796,16 @@ int snd_pcm_direct_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) if (err < 0) return err; changed |= err; + err = snd_interval_step(hw_param_interval(params, SND_PCM_HW_PARAM_PERIOD_SIZE), + 0, dshare->slave_period_size); + if (err < 0) + return err; + changed |= err; + if (err) + params->rmask |= (1<<SND_PCM_HW_PARAM_PERIOD_SIZE); } while (changed); } + dshare->timer_ticks = hw_param_interval(params, SND_PCM_HW_PARAM_PERIOD_SIZE)->max/dshare->slave_period_size; params->info = dshare->shmptr->s.info; #ifdef REFINE_DEBUG snd_output_puts(log, "DMIX REFINE (end):\n"); @@ -1183,6 +1241,7 @@ int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix) dmix->tread = 1; dmix->timer_need_poll = 0; + dmix->timer_ticks = 1; ret = snd_pcm_info(dmix->spcm, &info); if (ret < 0) { SNDERR("unable to info for slave pcm"); @@ -1366,7 +1425,7 @@ int snd_pcm_direct_set_timer_params(snd_pcm_direct_t *dmix) snd_timer_params_set_auto_start(&params, 1); if (dmix->type != SND_PCM_TYPE_DSNOOP) snd_timer_params_set_early_event(&params, 1); - snd_timer_params_set_ticks(&params, 1); + snd_timer_params_set_ticks(&params, dmix->timer_ticks); if (dmix->tread) { filter = (1<<SND_TIMER_EVENT_TICK) | dmix->timer_events; @@ -1656,6 +1715,7 @@ int snd_pcm_direct_parse_open_conf(snd_config_t *root, snd_config_t *conf, rec->ipc_gid = -1; rec->slowptr = 1; rec->max_periods = 0; + rec->var_periodsize = 1; /* read defaults */ if (snd_config_search(root, "defaults.pcm.dmix_max_periods", &n) >= 0) { @@ -1762,6 +1822,13 @@ int snd_pcm_direct_parse_open_conf(snd_config_t *root, snd_config_t *conf, rec->max_periods = val; continue; } + if (strcmp(id, "var_periodsize") == 0) { + err = snd_config_get_bool(n); + if (err < 0) + return err; + rec->var_periodsize = err; + continue; + } SNDERR("Unknown field %s", id); return -EINVAL; } diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h index 611ad29..91e816c 100644 --- a/src/pcm/pcm_direct.h +++ b/src/pcm/pcm_direct.h @@ -147,12 +147,14 @@ struct snd_pcm_direct { int tread: 1; int timer_need_poll: 1; unsigned int timer_events; + unsigned int timer_ticks; int server_fd; pid_t server_pid; snd_timer_t *timer; /* timer used as poll_fd */ int interleaved; /* we have interleaved buffer */ int slowptr; /* use slow but more precise ptr updates */ int max_periods; /* max periods (-1 = fixed periods, 0 = max buffer size) */ + int var_periodsize; /* allow variable period size if max_periods is != -1*/ unsigned int channels; /* client's channels */ unsigned int *bindings; union { @@ -326,6 +328,7 @@ struct snd_pcm_direct_open_conf { int ipc_gid; int slowptr; int max_periods; + int var_periodsize; snd_config_t *slave; snd_config_t *bindings; }; diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 825677f..0ab7323 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -1040,6 +1040,7 @@ int snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name, dmix->state = SND_PCM_STATE_OPEN; dmix->slowptr = opts->slowptr; dmix->max_periods = opts->max_periods; + dmix->var_periodsize = opts->var_periodsize; dmix->sync_ptr = snd_pcm_dmix_sync_ptr; retry: diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index 29cd6c6..a1fed5d 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -725,6 +725,7 @@ int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name, dshare->state = SND_PCM_STATE_OPEN; dshare->slowptr = opts->slowptr; dshare->max_periods = opts->max_periods; + dshare->var_periodsize = opts->var_periodsize; dshare->sync_ptr = snd_pcm_dshare_sync_ptr; retry: diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c index 1aedf3c..85f0ff4 100644 --- a/src/pcm/pcm_dsnoop.c +++ b/src/pcm/pcm_dsnoop.c @@ -606,6 +606,7 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name, dsnoop->state = SND_PCM_STATE_OPEN; dsnoop->slowptr = opts->slowptr; dsnoop->max_periods = opts->max_periods; + dsnoop->var_periodsize = opts->var_periodsize; dsnoop->sync_ptr = snd_pcm_dsnoop_sync_ptr; retry: -- 1.7.9.5

2 1

[alsa-devel] [PATCH 0/3] ASoC: tlv320aic3x: Pop noise reductions
by Peter Ujfalusi 02 Jan '17

02 Jan '17

Hi, When we don't have any active component between the output of the codec and the speaker/jack the codec emmits pop noise due to several factors: - RESET register is toggled by regcache_sync (patch 1) - After regcache_sync we need to wait a bit to allow the codec to settle down: the codec will be soft reseted when it is powered down, so when we power it on and run regcache_sync, we need to wait for the flushed settings to be valid. (patch 2) - The HP ouptut power-down mode can be changed to be driven weakly to VCM, this can reduce the pop noise as well, with slight increase in powere consumption. These factors were not taken care as in n810 and n900 we have external active amplifiers and they will remove any artifacts coming from the codec, but on boards w/o active external components they can reach the output. Regards, Peter --- Peter Ujfalusi (3): ASoC: tlv320aic3x: Mark the RESET register as volatile ASoC: tlv320aic3x: Add delay after power on and register sync ASoC: tlv320aic3x: Add controls for selecting HP power down modes sound/soc/codecs/tlv320aic3x.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) -- 2.11.0

3 9

[alsa-devel] snd_hda_intel/snd_hda_codec_hdmi module load/unload race
by Imre Deak 02 Jan '17

02 Jan '17

Hi, I got the trace below while trying to unload (unbind) snd_hda_intel, while its still loading the HDMI codec driver. IIUC what happens is: Task1 Task2 Task3 modprobe snd_hda_intel schedule(azx_probe_work) unbind snd_hda_intel via sysfs device_release_driver() device_lock(snd_hda_intel) azx_remove() cancel_work_sync(azx_probe_work) azx_probe_work() request_module(snd-hda-codec-hdmi) hdmi_driver_init() __driver_attach() device_lock(snd_hda_intel) Deadlock, since azx_probe_work() will never finish and the snd_hda_intel device lock will never get released. --Imre [ 246.805268] INFO: task drv_module_relo:1684 blocked for more than 120 seconds. [ 246.805834] Tainted: G W 4.9.0-CI-CI_DRM_1946+ #158 [ 246.806284] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 246.806779] drv_module_relo D 0 1684 1597 0x00000000 [ 246.807171] ffff8802703cbac0 ffff8802643926c0 000000000000479d ffff8802713b0040 [ 246.807706] ffff88027fc98118 ffffc90003cffa58 ffffffff8181d429 0000000000000046 [ 246.808217] ffffffff827d2470 0000000000000001 ffff88027fc98118 ffff88027fc98100 [ 246.808739] Call Trace: [ 246.808945] [<ffffffff8181d429>] ? __schedule+0x2c9/0xa30 [ 246.809281] [<ffffffff8181dbcb>] schedule+0x3b/0x90 [ 246.809618] [<ffffffff8182227b>] schedule_timeout+0x25b/0x4c0 [ 246.810021] [<ffffffff810d6c9f>] ? mark_held_locks+0x6f/0xa0 [ 246.810370] [<ffffffff81823987>] ? _raw_spin_unlock_irq+0x27/0x50 [ 246.810759] [<ffffffff810d6df2>] ? trace_hardirqs_on_caller+0x122/0x1b0 [ 246.811963] [<ffffffff8181e730>] wait_for_common+0xf0/0x160 [ 246.812463] [<ffffffff810af5d0>] ? wake_up_q+0x70/0x70 [ 246.812795] [<ffffffff8181e7b8>] wait_for_completion+0x18/0x20 [ 246.813389] [<ffffffff8109b9e3>] flush_work+0x203/0x2e0 [ 246.813714] [<ffffffff8109ba86>] ? flush_work+0x2a6/0x2e0 [ 246.814088] [<ffffffff81099410>] ? flush_workqueue_prep_pwqs+0x220/0x220 [ 246.814790] [<ffffffff8109d290>] __cancel_work_timer+0x110/0x1d0 [ 246.815346] [<ffffffff810d6df2>] ? trace_hardirqs_on_caller+0x122/0x1b0 [ 246.815742] [<ffffffff810d6e8d>] ? trace_hardirqs_on+0xd/0x10 [ 246.816096] [<ffffffff8109d35b>] cancel_work_sync+0xb/0x10 [ 246.816566] [<ffffffffa00d4fa4>] azx_remove+0x24/0x30 [snd_hda_intel] [ 246.816956] [<ffffffff81485864>] pci_device_remove+0x34/0xb0 [ 246.817373] [<ffffffff81584cfc>] __device_release_driver+0x9c/0x150 [ 246.817717] [<ffffffff81584dd0>] device_release_driver+0x20/0x30 [ 246.818077] [<ffffffff815836aa>] unbind_store+0x10a/0x150 [ 246.818549] [<ffffffff81582d70>] drv_attr_store+0x20/0x30 [ 246.818885] [<ffffffff812775a0>] sysfs_kf_write+0x40/0x50 [ 246.819290] [<ffffffff812768e0>] kernfs_fop_write+0x130/0x1b0 [ 246.819639] [<ffffffff811f6383>] __vfs_write+0x23/0x120 [ 246.819963] [<ffffffff810f48c0>] ? rcu_read_lock_sched_held+0x70/0x80 [ 246.820476] [<ffffffff810f4caa>] ? rcu_sync_lockdep_assert+0x2a/0x50 [ 246.820859] [<ffffffff811f9a68>] ? __sb_start_write+0xf8/0x200 [ 246.821292] [<ffffffff811f7129>] ? vfs_write+0x169/0x1b0 [ 246.821597] [<ffffffff811f7073>] vfs_write+0xb3/0x1b0 [ 246.821907] [<ffffffff810d6df2>] ? trace_hardirqs_on_caller+0x122/0x1b0 [ 246.822405] [<ffffffff811f83b4>] SyS_write+0x44/0xb0 [ 246.822684] [<ffffffff8182412e>] entry_SYSCALL_64_fastpath+0x1c/0xb1 [ 246.823064] Showing all locks held in the system: [ 246.823568] 2 locks held by kworker/u8:0/6: [ 246.823817] #0: ("events_unbound"){.+.+.+}, at: [<ffffffff8109c1f6>] process_one_work+0x166/0x6b0 [ 246.824400] #1: ((&sub_info->work)){+.+.+.}, at: [<ffffffff8109c1f6>] process_one_work+0x166/0x6b0 [ 246.824940] 2 locks held by khungtaskd/34: [ 246.825210] #0: (rcu_read_lock){......}, at: [<ffffffff811329cc>] watchdog+0x9c/0x600 [ 246.825726] #1: (tasklist_lock){.+.+..}, at: [<ffffffff810d536d>] debug_show_all_locks+0x3d/0x1a0 [ 246.826303] 2 locks held by kworker/3:1/50: [ 246.826535] #0: ("events"){++++.+}, at: [<ffffffff8109c1f6>] process_one_work+0x166/0x6b0 [ 246.827104] #1: ((&hda->probe_work)){+.+.+.}, at: [<ffffffff8109c1f6>] process_one_work+0x166/0x6b0 [ 246.827706] 5 locks held by drv_module_relo/1684: [ 246.827963] #0: (sb_writers#6){.+.+.+}, at: [<ffffffff811f7129>] vfs_write+0x169/0x1b0 [ 246.828507] #1: (&of->mutex){+.+.+.}, at: [<ffffffff812768ac>] kernfs_fop_write+0xfc/0x1b0 [ 246.829083] #2: (s_active#186){++++.+}, at: [<ffffffff812768b4>] kernfs_fop_write+0x104/0x1b0 [ 246.829663] #3: (&dev->mutex){......}, at: [<ffffffff8158369a>] unbind_store+0xfa/0x150 [ 246.830204] #4: (&dev->mutex){......}, at: [<ffffffff81584dc8>] device_release_driver+0x18/0x30 [ 246.830772] 1 lock held by modprobe/1685: [ 246.830992] #0: (&dev->mutex){......}, at: [<ffffffff8158561a>] __driver_attach+0x5a/0xe0 [ 246.831575] 2 locks held by bash/1727: [ 246.831782] #0: (&tty->ldisc_sem){++++.+}, at: [<ffffffff81822d3d>] ldsem_down_read+0x2d/0x40 [ 246.832344] #1: (&ldata->atomic_read_lock){+.+...}, at: [<ffffffff81506529>] n_tty_read+0xa9/0x880 [ 246.833050] ============================================= [ 246.833436] INFO: task modprobe:1685 blocked for more than 120 seconds. [ 246.833829] Tainted: G W 4.9.0-CI-CI_DRM_1946+ #158 [ 246.834221] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 246.834680] modprobe D 0 1685 6 0x00000000 [ 246.835029] ffff8802703c9a40 ffff8802760e4d40 00000000000091ba ffff8802559e26c0 [ 246.835522] ffff88027fd18118 ffffc900032bbb70 ffffffff8181d429 0000000000000000 [ 246.835967] ffffc900032bbb98 0000000000000292 ffff88027fd18118 ffff88027fd18100 [ 246.836462] Call Trace: [ 246.836628] [<ffffffff8181d429>] ? __schedule+0x2c9/0xa30 [ 246.836924] [<ffffffff8181dbcb>] schedule+0x3b/0x90 [ 246.837243] [<ffffffff8181e043>] schedule_preempt_disabled+0x13/0x20 [ 246.837629] [<ffffffff8181ecbc>] mutex_lock_nested+0x16c/0x400 [ 246.837946] [<ffffffff8158561a>] ? __driver_attach+0x5a/0xe0 [ 246.838298] [<ffffffff815855c0>] ? driver_probe_device+0x430/0x430 [ 246.838676] [<ffffffff8158561a>] __driver_attach+0x5a/0xe0 [ 246.839008] [<ffffffff815855c0>] ? driver_probe_device+0x430/0x430 [ 246.839354] [<ffffffff81582fc1>] bus_for_each_dev+0x61/0xa0 [ 246.839704] [<ffffffff81584b89>] driver_attach+0x19/0x20 [ 246.840029] [<ffffffff815846cb>] bus_add_driver+0x1fb/0x270 [ 246.840346] [<ffffffffa014a000>] ? 0xffffffffa014a000 [ 246.840645] [<ffffffff8158629b>] driver_register+0x5b/0xd0 [ 246.840977] [<ffffffffa048f0d5>] __hda_codec_driver_register+0x55/0x60 [snd_hda_codec] [ 246.841417] [<ffffffffa014a01e>] hdmi_driver_init+0x1e/0x20 [snd_hda_codec_hdmi] [ 246.841861] [<ffffffff81000428>] do_one_initcall+0x38/0x150 [ 246.842177] [<ffffffff810f48c0>] ? rcu_read_lock_sched_held+0x70/0x80 [ 246.842566] [<ffffffff811d7804>] ? kmem_cache_alloc_trace+0x274/0x2e0 [ 246.842951] [<ffffffff81176161>] ? do_init_module+0x22/0x1d1 [ 246.843307] [<ffffffff81176199>] do_init_module+0x5a/0x1d1 [ 246.843617] [<ffffffff8111cb15>] load_module+0x2275/0x27d0 [ 246.843951] [<ffffffff81119e60>] ? symbol_put_addr+0x60/0x60 [ 246.844306] [<ffffffff811fd7d5>] ? kernel_read_file+0x105/0x190 [ 246.844637] [<ffffffff8111d29c>] SyS_finit_module+0xbc/0xf0 [ 246.844979] [<ffffffff8182412e>] entry_SYSCALL_64_fastpath+0x1c/0xb1 [ 246.845368] Showing all locks held in the system: [ 246.845745] 2 locks held by kworker/u8:0/6: [ 246.845974] #0: ("events_unbound"){.+.+.+}, at: [<ffffffff8109c1f6>] process_one_work+0x166/0x6b0 [ 246.846553] #1: ((&sub_info->work)){+.+.+.}, at: [<ffffffff8109c1f6>] process_one_work+0x166/0x6b0 [ 246.847133] 2 locks held by khungtaskd/34: [ 246.847399] #0: (rcu_read_lock){......}, at: [<ffffffff811329cc>] watchdog+0x9c/0x600 [ 246.847913] #1: (tasklist_lock){.+.+..}, at: [<ffffffff810d536d>] debug_show_all_locks+0x3d/0x1a0 [ 246.848488] 2 locks held by kworker/3:1/50: [ 246.848747] #0: ("events"){++++.+}, at: [<ffffffff8109c1f6>] process_one_work+0x166/0x6b0 [ 246.849286] #1: ((&hda->probe_work)){+.+.+.}, at: [<ffffffff8109c1f6>] process_one_work+0x166/0x6b0 [ 246.849875] 1 lock held by in:imklog/491: [ 246.850094] #0: (&f->f_pos_lock){+.+.+.}, at: [<ffffffff8121854e>] __fdget_pos+0x3e/0x50 [ 246.850657] 5 locks held by drv_module_relo/1684: [ 246.850931] #0: (sb_writers#6){.+.+.+}, at: [<ffffffff811f7129>] vfs_write+0x169/0x1b0 [ 246.851474] #1: (&of->mutex){+.+.+.}, at: [<ffffffff812768ac>] kernfs_fop_write+0xfc/0x1b0 [ 246.852013] #2: (s_active#186){++++.+}, at: [<ffffffff812768b4>] kernfs_fop_write+0x104/0x1b0 [ 246.852577] #3: (&dev->mutex){......}, at: [<ffffffff8158369a>] unbind_store+0xfa/0x150 [ 246.853103] #4: (&dev->mutex){......}, at: [<ffffffff81584dc8>] device_release_driver+0x18/0x30 [ 246.853714] 1 lock held by modprobe/1685: [ 246.853934] #0: (&dev->mutex){......}, at: [<ffffffff8158561a>] __driver_attach+0x5a/0xe0 [ 246.854473] 2 locks held by bash/1727: [ 246.854713] #0: (&tty->ldisc_sem){++++.+}, at: [<ffffffff81822d3d>] ldsem_down_read+0x2d/0x40 [ 246.855272] #1: (&ldata->atomic_read_lock){+.+...}, at: [<ffffffff81506529>] n_tty_read+0xa9/0x880 Stack trace of kworker/50: [<ffffffff810979e3>] call_usermodehelper_exec+0x133/0x1d0 [<ffffffff81097c0f>] __request_module+0x18f/0x360 [<ffffffffa048f182>] request_codec_module+0x52/0x60 [snd_hda_codec] [<ffffffffa048f21d>] snd_hda_codec_configure+0x5d/0x170 [snd_hda_codec] [<ffffffffa0499693>] azx_codec_configure+0x23/0x40 [snd_hda_codec] [<ffffffffa00d6700>] azx_probe_work+0x5d0/0x8d0 [snd_hda_intel] [<ffffffff8109c27c>] process_one_work+0x1ec/0x6b0 [<ffffffff8109c789>] worker_thread+0x49/0x490 [<ffffffff810a2aab>] kthread+0xeb/0x110 [<ffffffff818243a7>] ret_from_fork+0x27/0x40 [<ffffffffffffffff>] 0xffffffffffffffff

3 3

[alsa-devel] [PATCH 0/5] Runtime PM support for Exynos I2S driver
by Marek Szyprowski 31 Dec '16

31 Dec '16

Exynos I2S audio controller was missing proper runtime PM implementation and this patchset addresses this issue. This patchset is a another step to add support for audio power domain on Exynos5 SoCs. Audio power domain on Exynos5 SoCs contains following hardware modules: 1. clock controller 2. pin controller 3. PL330 DMA controller 4. I2S audio controller The other patches related to enabling full support for audio power domain can be found here: 1. PL330 ADMA controller non-irqsafe runtime PM: https://www.spinics.net/lists/arm-kernel/msg550008.html 2. Runtime PM for clock controllers (Exynos Audio subsystem will be added in v4 soon): https://www.spinics.net/lists/arm-kernel/msg538122.html 3. Runtime PM support for pin controller: https://www.spinics.net/lists/linux-samsung-soc/msg56674.html Patches are based on linux-next from 2016.12.24. Tested on Odroid U3 (Exynos4412), Odroid XU3 (Exynos5422) and TM2 (Exynos5433) boards. Best regards Marek Szyprowski Samsung R&D Institute Poland Patch summary: Marek Szyprowski (5): ASoC: samsung: i2s: Remove virtual device for secondary DAI ASoC: samsung: i2s: Ensure proper runtime PM state of I2S device ASoC: samsung: i2s: Move saving and restoring regs to runtime pm operations ASoC: samsung: i2s: Let runtime PM operations to control op_clk too ASoC: samsung: i2s: Provide I2S device for registered clocks sound/soc/samsung/i2s.c | 193 +++++++++++++++++++++++------------------------- 1 file changed, 92 insertions(+), 101 deletions(-) -- 1.9.1

2 11

[alsa-devel] [PATCH 0/2] ASoC: sun4i-spdif: Changes in preparation of supporting new SoCs
by codekipper＠gmail.com 31 Dec '16

31 Dec '16

From: Marcus Cooper <codekipper(a)gmail.com> Hi All, please find attached two patches. First being a cleanup of something that shouldn't be in the code and the second adds the mechanism for supporting newer Allwiner SoCs. There was a third patch in the series and that was bringing in support of SPDIF on the Allwinner H3 but I've not been able to test it so that I hear audio. As soon as I get some hardware with a SPDIF connection I will confirm and push. BR, CK Marcus Cooper (2): ASoC: sun4i-spdif: remove legacy dapm components ASoC: sun4i-spdif: Add quirks to the spdif driver sound/soc/sunxi/sun4i-spdif.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) -- 2.11.0

3 6

[alsa-devel] [PATCH] ASoC: Intel: Skylake: Fix to fail safely if module not available in path
by Subhransu S. Prusty 31 Dec '16

31 Dec '16

From: G Kranthi <gudishax.kranthikumar(a)intel.com> If a module is not available in a pipeline, fail safely rather than causing oops. Signed-off-by: G Kranthi <gudishax.kranthikumar(a)intel.com> Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> --- sound/soc/intel/skylake/skl-pcm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 10fa10d..7e97ae6 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -254,6 +254,9 @@ static int skl_pcm_open(struct snd_pcm_substream *substream, snd_pcm_set_sync(substream); mconfig = skl_tplg_fe_get_cpr_module(dai, substream->stream); + if (!mconfig) + return -EINVAL; + skl_tplg_d0i3_get(skl, mconfig->d0i3_caps); return 0; -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: nau8825: fix invalid configuration in Pre-Scalar of FLL
by John Hsu 31 Dec '16

31 Dec '16

The clk_ref_div is not configured in the correct position of the register. The patch fixes that clk_ref_div, Pre-Scalar, is assigned the wrong value. Signed-off-by: John Hsu <KCHSU0(a)nuvoton.com> --- sound/soc/codecs/nau8825.c | 3 ++- sound/soc/codecs/nau8825.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index f69f738..e4fb017 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -2078,7 +2078,8 @@ static void nau8825_fll_apply(struct nau8825 *nau8825, NAU8825_FLL_INTEGER_MASK, fll_param->fll_int); /* FLL pre-scaler */ regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL4, - NAU8825_FLL_REF_DIV_MASK, fll_param->clk_ref_div); + NAU8825_FLL_REF_DIV_MASK, + fll_param->clk_ref_div << NAU8825_FLL_REF_DIV_SFT); /* select divided VCO input */ regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL5, NAU8825_FLL_CLK_SW_MASK, NAU8825_FLL_CLK_SW_REF); diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h index fa571ec..5732ce1 100644 --- a/sound/soc/codecs/nau8825.h +++ b/sound/soc/codecs/nau8825.h @@ -137,7 +137,8 @@ #define NAU8825_FLL_CLK_SRC_FS (0x3 << NAU8825_FLL_CLK_SRC_SFT) /* FLL4 (0x07) */ -#define NAU8825_FLL_REF_DIV_MASK (0x3 << 10) +#define NAU8825_FLL_REF_DIV_SFT 10 +#define NAU8825_FLL_REF_DIV_MASK (0x3 << NAU8825_FLL_REF_DIV_SFT) /* FLL5 (0x08) */ #define NAU8825_FLL_PDB_DAC_EN (0x1 << 15) -- 2.6.4

2 1

Re: [alsa-devel] [PATCH] ALSA: snd-usb: fix IRQ triggered NULL pointer dereference
by Takashi Iwai 30 Dec '16

30 Dec '16

On Wed, 21 Dec 2016 11:38:54 +0100, Ioan-Adrian Ratiu wrote: > > >> > Please take the time to fully analyze my patch and let's have a > >> > discussion based on it, not reject it outright and replace it with > >> > a quick and dirty delay hack. > >> > >> OK. I'll deliberately check it again so that I have no overlooks. I > >> with this thread also catch the other developers enough helpful to > >> you. (I just eventually caught your patch in LKML and not developer > >> for this category of devices.) > > > > Sorry for the late reply, as I've been (still) off and had bad net > > connections. > > > > About your fix: Sakamoto-san is right, it's no good way to fix this > > kind or problem. The easiest option right now is just to revert my > > previous fix, as it obviously introduces another regression. The > > correct fix will be taken after that. > > > > I'm going to prepare a revert patch and ask Linus to take it before > > rc1. > > I agree with reverting the initial commit decision because my problem > disappears with it. > > But can you please state a reason for why my patch is "no good way to > fix"? Being too intrusive is not a good reason. "Being too intrusive" is the exact reason why it's not good as a "regression fix" like this case. The logic you've implemented in the patch itself looks good (although the code introduces a bug, the unbalance of snd_usb_*lock_shutdown()). The only point I couldn't take it is that it's rather a fundamental change, not a quick fix for a regression. What's the worst case scenario in a regression fix? It's when a fix introduces yet another regression. It'd be much worse if the new regression is deeper. The complicated logical change has a potential risk of such. Thus an intrusive change is not always good as a "regression fix". In general, if the change were trivial, it's obviously OK to take as a regression fix -- where the logic is also trivial in most cases, too. But when the fix becomes complex, we need to rethink. Especially when the original buggy commit is small, reverting it is often better as a clear cut. Think in that way: you're addressing a deeper problem that was revealed accidentally by my previous bad fix. Writing the change as if it were merely a regression fix gives the wrong understanding to readers :) That said, I'd appreciate if you respin the fix again with a combination of my previous fix and brush up the code a bit as a whole, and document it not as a regression fix but as a complete fix of the existing races. I can write it in my side quickly, but it'd be almost in the same form as you posted, I suppose. thanks, Takashi

2 1

[alsa-devel] [PATCH] alsactl: Check existence of `alsactl` in udev rule
by Paul Menzel 30 Dec '16

30 Dec '16

From: Jordi Mallach <jordi(a)debian.org> Date: Thu, 10 Jan 2013 00:17:58 +0000 Include the line `TEST=="/usr/sbin/alsactl"` in the udev rule, to properly fix the state restoring for users with split `/usr` filesystems [1]. Upstream the patch from the Debian package [2]. [1] https://bugs.debian.org/670490 "Debian Bug report logs - #670490 alsa-utils: Restore sound volume in udev" [2] https://sources.debian.net/src/alsa-utils/1.1.2-1/debian/patches/udev_test_… Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> CC: Jordi Mallach <jordi(a)debian.org> --- Please apply with `git am saved-messages.mbox`. alsactl/90-alsa-restore.rules.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in index c0c1b23..f190b85 100644 --- a/alsactl/90-alsa-restore.rules.in +++ b/alsactl/90-alsa-restore.rules.in @@ -2,7 +2,7 @@ ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", TEST== GOTO="alsa_restore_end" LABEL="alsa_restore_go" -TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl restore $attr{device/number}" -TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl nrestore $attr{device/number}" +TEST!="@daemonswitch@", TEST=="@sbindir@/alsactl", RUN+="@sbindir@/alsactl restore $attr{device/number}" +TEST=="@daemonswitch@", TEST=="@sbindir@/alsactl", RUN+="@sbindir@/alsactl nrestore $attr{device/number}" LABEL="alsa_restore_end" -- 2.11.0

2 3

[alsa-devel] [PATCH 6/6] alsa-lib:pcm: don't return bogus buffer levels in xrun state
by sutar.mounesh＠gmail.com 30 Dec '16

30 Dec '16

From: Andreas Pape <apape(a)de.adit-jv.com> Signed-off-by: Andreas Pape <apape(a)de.adit-jv.com> diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 320c948..127b06f 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -884,6 +884,9 @@ static snd_pcm_sframes_t snd_pcm_dmix_avail_update(snd_pcm_t *pcm) if (( err = snd_pcm_dmix_sync_ptr(pcm)) < 0) return err; } + if (dmix->state == SND_PCM_STATE_XRUN) + return -EPIPE; + return snd_pcm_mmap_playback_avail(pcm); } diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index f4fa32b..5b897f5 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -570,6 +570,9 @@ static snd_pcm_sframes_t snd_pcm_dshare_avail_update(snd_pcm_t *pcm) if ((err = snd_pcm_dshare_sync_ptr(pcm)) < 0) return err; } + if (dshare->state == SND_PCM_STATE_XRUN) + return -EPIPE; + return snd_pcm_mmap_playback_avail(pcm); } diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c index 0729a5a..61579e8 100644 --- a/src/pcm/pcm_dsnoop.c +++ b/src/pcm/pcm_dsnoop.c @@ -454,6 +454,9 @@ static snd_pcm_sframes_t snd_pcm_dsnoop_avail_update(snd_pcm_t *pcm) if (err < 0) return err; } + if (dsnoop->state == SND_PCM_STATE_XRUN) + return -EPIPE; + return snd_pcm_mmap_capture_avail(pcm); } -- 1.7.9.5

1 0

[alsa-devel] [PATCH 5/6] alsa-lib:pcm: check state before enter poll on timer.
by sutar.mounesh＠gmail.com 30 Dec '16

30 Dec '16

From: Andreas Pape <apape(a)de.adit-jv.com> To avoid the chances of timeout, we need to check the enter poll in state xrun. Signed-off-by: Andreas Pape <apape(a)de.adit-jv.com> diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 779845c..2928512 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -549,6 +549,42 @@ int snd_pcm_direct_timer_stop(snd_pcm_direct_t *dmix) snd_timer_stop(dmix->timer); return 0; } +/* + * This is the only operation guaranteed to be called before entering poll(). + * Direct plugins use fd of snd_timer to poll on, these timers do NOT check state of substream in kernel by intention. + * Only the enter to xrun might be notified once (SND_TIMER_EVENT_MSTOP). + * If xrun event was not correctly handled or was ignored it will never be evaluated again afterwards. + * This will result in snd_pcm_wait() always returning timeout. + * In contrast poll() on pcm hardware checks ALSA state and will immediately return POLLERR on XRUN. + * + * To prevent timeout and applications endlessly spinning without xrun detected we add a state check + * here which may trigger the xrun sequence. + * + * return count of filled descriptors or negative error code + */ +int snd_pcm_direct_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space) +{ + if (pcm->poll_fd < 0) { + SNDMSG("poll_fd < 0"); + return -EIO; + } + if (space >= 1 && pfds) { + pfds->fd = pcm->poll_fd; + pfds->events = pcm->poll_events | POLLERR | POLLNVAL; + } else { + return 0; + } + + /*this will also evaluate slave state and enter xrun if necessary*/ + switch (snd_pcm_state(pcm)) { + case SND_PCM_STATE_XRUN: + return -EPIPE; + default: + break; + } + return 1; +} + int snd_pcm_direct_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents) { diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h index 569d2be..3a1c1c0 100644 --- a/src/pcm/pcm_direct.h +++ b/src/pcm/pcm_direct.h @@ -301,6 +301,7 @@ int snd_pcm_direct_parse_bindings(snd_pcm_direct_t *dmix, snd_config_t *cfg); int snd_pcm_direct_nonblock(snd_pcm_t *pcm, int nonblock); int snd_pcm_direct_async(snd_pcm_t *pcm, int sig, pid_t pid); +int snd_pcm_direct_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space); int snd_pcm_direct_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); int snd_pcm_direct_info(snd_pcm_t *pcm, snd_pcm_info_t * info); int snd_pcm_direct_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 5c3eb2d..320c948 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -463,17 +463,23 @@ static int snd_pcm_dmix_sync_ptr(snd_pcm_t *pcm) static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm) { snd_pcm_direct_t *dmix = pcm->private_data; + int err; snd_pcm_state_t state; state = snd_pcm_state(dmix->spcm); switch (state) { - case SND_PCM_STATE_XRUN: case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_DISCONNECTED: dmix->state = state; return state; + case SND_PCM_STATE_XRUN: + if ((err = snd_pcm_direct_slave_recover(dmix)) < 0) + return err; + break; default: break; } + snd_pcm_direct_client_chk_xrun(dmix, pcm); + if (dmix->state == STATE_RUN_PENDING) return SNDRV_PCM_STATE_RUNNING; return dmix->state; @@ -969,7 +975,7 @@ static const snd_pcm_fast_ops_t snd_pcm_dmix_fast_ops = { .avail_update = snd_pcm_dmix_avail_update, .mmap_commit = snd_pcm_dmix_mmap_commit, .htimestamp = snd_pcm_dmix_htimestamp, - .poll_descriptors = NULL, + .poll_descriptors = snd_pcm_direct_poll_descriptors, .poll_descriptors_count = NULL, .poll_revents = snd_pcm_dmix_poll_revents, }; diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index 707e2c2..f4fa32b 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -255,17 +255,22 @@ static int snd_pcm_dshare_status(snd_pcm_t *pcm, snd_pcm_status_t * status) static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm) { snd_pcm_direct_t *dshare = pcm->private_data; + int err; snd_pcm_state_t state; state = snd_pcm_state(dshare->spcm); switch (state) { - case SND_PCM_STATE_XRUN: case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_DISCONNECTED: dshare->state = state; return state; + case SND_PCM_STATE_XRUN: + if ((err = snd_pcm_direct_slave_recover(dshare)) < 0) + return err; + break; default: break; } + snd_pcm_direct_client_chk_xrun(dshare, pcm); if (dshare->state == STATE_RUN_PENDING) return SNDRV_PCM_STATE_RUNNING; return dshare->state; @@ -646,7 +651,7 @@ static const snd_pcm_fast_ops_t snd_pcm_dshare_fast_ops = { .avail_update = snd_pcm_dshare_avail_update, .mmap_commit = snd_pcm_dshare_mmap_commit, .htimestamp = snd_pcm_dshare_htimestamp, - .poll_descriptors = NULL, + .poll_descriptors = snd_pcm_direct_poll_descriptors, .poll_descriptors_count = NULL, .poll_revents = snd_pcm_direct_poll_revents, }; diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c index 512e957..0729a5a 100644 --- a/src/pcm/pcm_dsnoop.c +++ b/src/pcm/pcm_dsnoop.c @@ -208,17 +208,22 @@ static int snd_pcm_dsnoop_status(snd_pcm_t *pcm, snd_pcm_status_t * status) static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm) { snd_pcm_direct_t *dsnoop = pcm->private_data; + int err; snd_pcm_state_t state; state = snd_pcm_state(dsnoop->spcm); switch (state) { - case SND_PCM_STATE_XRUN: case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_DISCONNECTED: dsnoop->state = state; return state; + case SND_PCM_STATE_XRUN: + if ((err = snd_pcm_direct_slave_recover(dsnoop)) < 0) + return err; + break; default: break; } + snd_pcm_direct_client_chk_xrun(dsnoop, pcm); return dsnoop->state; } @@ -531,7 +536,7 @@ static const snd_pcm_fast_ops_t snd_pcm_dsnoop_fast_ops = { .avail_update = snd_pcm_dsnoop_avail_update, .mmap_commit = snd_pcm_dsnoop_mmap_commit, .htimestamp = snd_pcm_dsnoop_htimestamp, - .poll_descriptors = NULL, + .poll_descriptors = snd_pcm_direct_poll_descriptors, .poll_descriptors_count = NULL, .poll_revents = snd_pcm_direct_poll_revents, }; -- 1.7.9.5

1 0

[alsa-devel] [PATCH] Revert "ASoC: core: replace aux_comp_list to component_dev_list"
by Nikita Yushchenko 29 Dec '16

29 Dec '16

This reverts commit 1a653aa44725668590b36bbe2d7fe4736a69f055 ("ASoC: core: replace aux_comp_list to component_dev_list"). That commit tries to remove card->aux_comp_list, using flagged entries in card->component_dev_list instead. However, components are added to card->component_dev_list in soc_probe_component(). Before that commit, it traversed card->aux_comp_list and found aux devices added by soc_bind_aux_dev(). After that commit, it traverses card->component_dev_list and finds no aux devices, because soc_probe_component() was not yet called for them. Thus all aux devices are lost and any setup that needs them no longer works. Signed-off-by: Nikita Yushchenko <nikita.yoush(a)cogentembedded.com> --- include/sound/soc.h | 4 +++- sound/soc/soc-core.c | 17 +++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 2b502f6cc6d0..8172a512632a 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -809,10 +809,10 @@ struct snd_soc_component { unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */ unsigned int registered_as_component:1; - unsigned int auxiliary:1; /* for auxiliary component of the card */ unsigned int suspended:1; /* is in suspend PM state */ struct list_head list; + struct list_head list_aux; /* for auxiliary component of the card */ struct list_head card_list; struct snd_soc_dai_driver *dai_drv; @@ -1152,6 +1152,7 @@ struct snd_soc_card { */ struct snd_soc_aux_dev *aux_dev; int num_aux_devs; + struct list_head aux_comp_list; const struct snd_kcontrol_new *controls; int num_controls; @@ -1547,6 +1548,7 @@ static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card) INIT_LIST_HEAD(&card->widgets); INIT_LIST_HEAD(&card->paths); INIT_LIST_HEAD(&card->dapm_list); + INIT_LIST_HEAD(&card->aux_comp_list); INIT_LIST_HEAD(&card->component_dev_list); } diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f1901bb1466e..15657a65e4ca 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1747,8 +1747,7 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num) } component->init = aux_dev->init; - component->auxiliary = 1; - + list_add(&component->list_aux, &card->aux_comp_list); return 0; err_defer: @@ -1764,10 +1763,7 @@ static int soc_probe_aux_devices(struct snd_soc_card *card) for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { - list_for_each_entry(comp, &card->component_dev_list, card_list) { - if (!comp->auxiliary) - continue; - + list_for_each_entry(comp, &card->aux_comp_list, list_aux) { if (comp->driver->probe_order == order) { ret = soc_probe_component(card, comp); if (ret < 0) { @@ -1791,14 +1787,11 @@ static void soc_remove_aux_devices(struct snd_soc_card *card) for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { list_for_each_entry_safe(comp, _comp, - &card->component_dev_list, card_list) { - - if (!comp->auxiliary) - continue; - + &card->aux_comp_list, list_aux) { if (comp->driver->remove_order == order) { soc_remove_component(comp); - comp->auxiliary = 0; + /* remove it from the card's aux_comp_list */ + list_del(&comp->list_aux); } } } -- 2.1.4

1 0

[alsa-devel] [PATCH] ASoC: Fix binding and probing of auxiliary components
by Sylwester Nawrocki 29 Dec '16

29 Dec '16

Currently binding of auxiliary devices doesn't work as in soc_bind_aux_dev() function a bound component is not being added to any list and in soc_probe_aux_devices() we are trying to walk the component_dev_list list to probe auxiliary components but at that time this list doesn't contain any auxiliary components since they are being added to the card only in soc_probe_component(). This patch adds a list to the card where are stored bound but not probed auxiliary devices, so that all aux devices can be probed. Fixes: 1a653aa44725 "ASoC: core: replace aux_comp_list to component_dev_list" Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- I'm not sure if this is a correct approach, without this patch the amplifier component doesn't get bound to the card on the TM2 board. --- include/sound/soc.h | 3 +++ sound/soc/soc-core.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 2b502f6..b86168a 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -813,6 +813,7 @@ struct snd_soc_component { unsigned int suspended:1; /* is in suspend PM state */ struct list_head list; + struct list_head card_aux_list; /* for auxiliary bound components */ struct list_head card_list; struct snd_soc_dai_driver *dai_drv; @@ -1152,6 +1153,7 @@ struct snd_soc_card { */ struct snd_soc_aux_dev *aux_dev; int num_aux_devs; + struct list_head aux_comp_list; const struct snd_kcontrol_new *controls; int num_controls; @@ -1547,6 +1549,7 @@ static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card) INIT_LIST_HEAD(&card->widgets); INIT_LIST_HEAD(&card->paths); INIT_LIST_HEAD(&card->dapm_list); + INIT_LIST_HEAD(&card->aux_comp_list); INIT_LIST_HEAD(&card->component_dev_list); } diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f1901bb..baa1afa 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1748,6 +1748,7 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num) component->init = aux_dev->init; component->auxiliary = 1; + list_add(&component->card_aux_list, &card->aux_comp_list); return 0; @@ -1758,16 +1759,14 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num) static int soc_probe_aux_devices(struct snd_soc_card *card) { - struct snd_soc_component *comp; + struct snd_soc_component *comp, *tmp; int order; int ret; for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { - list_for_each_entry(comp, &card->component_dev_list, card_list) { - if (!comp->auxiliary) - continue; - + list_for_each_entry_safe(comp, tmp, &card->aux_comp_list, + card_aux_list) { if (comp->driver->probe_order == order) { ret = soc_probe_component(card, comp); if (ret < 0) { @@ -1776,6 +1775,7 @@ static int soc_probe_aux_devices(struct snd_soc_card *card) comp->name, ret); return ret; } + list_del(&comp->card_aux_list); } } } -- 1.9.1

1 0

[alsa-devel] Stream format conversion in SoC driver
by Giedrius Trainavičius 28 Dec '16

28 Dec '16

Hi, We are developing a soundcard for Raspberry Pi, you may find the current driver source code here: https://github.com/raspberrypi/linux/blob/rpi-4.4.y/sound/soc/bcm/pisound.c The card natively supports 24 and 32 bit PCM streams at 48kHz, 96kHz and 192kHz, symmetric capture and playback. Is it possible to have ALSA do the necessary format conversions for the PCM streams in natively unsupported formats to the closest natively supported format? What would be required to enable it? Thank you, Giedrius.

2 5

Re: [alsa-devel] [PATCH] ASoC : fsl_ssi : Correct the condition to check AC97 mode
by Andreas Schwab 28 Dec '16

28 Dec '16

On Dez 28 2016, Timur Tabi <timur(a)tabi.org> wrote: > Andreas Schwab wrote: >>> > + return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97) == >>> > + SND_SOC_DAIFMT_AC97; >> This is never true. > > I think the right parenthesis should be at the end of the expression. That would still test the wrong bitfield. And all that is obsolete anyway since commit 5b64c173cd (of Sep 2015). Andreas. -- Andreas Schwab, schwab(a)linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

1 0

[alsa-devel] [PATCH] alsactl: Remove standard output definition in systemd unit
by Paul Menzel 28 Dec '16

28 Dec '16

Date: Tue, 8 Jul 2014 07:23:06 +0000 `/lib/systemd/system/alsa-restore.service` specifies `StandardOutput=syslog`. This overrides the `DefaultStandardOutput` setting from `/etc/systemd/system.conf`, which the system administrator can use to specify how output gets logged. In particular, the sysadmin may want output to go to the journal, or to syslog, or nowhere at all [1]. This patch removes the definition entirely, so the units can use the system default. Upstream the patch from the Debian package [2]. [1] https://bugs.debian.org/741123 "systemd services should not use StandardOutput=syslog; should rely on DefaultStandardOutput" [2] https://sources.debian.net/src/alsa-utils/1.1.2-1/debian/patches/systemd_st… Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> CC: Jordi Mallach <jordi(a)debian.org> --- alsactl/alsa-restore.service.in | 1 - 1 file changed, 1 deletion(-) diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in index f3cd86b..c092c2f 100644 --- a/alsactl/alsa-restore.service.in +++ b/alsactl/alsa-restore.service.in @@ -15,4 +15,3 @@ Type=oneshot RemainAfterExit=true ExecStart=-@sbindir@/alsactl restore ExecStop=-@sbindir@/alsactl store -StandardOutput=syslog -- 2.11.0

2 1

[alsa-devel] [PATCH] alsactl: Check for state file existence in systemd unit
by Paul Menzel 28 Dec '16

28 Dec '16

Date: Sat, 19 Oct 2013 10:12:19 +0000 Check for the existence of the state file, by default `/var/lib/alsa/asound.state`, before doing anything in the systemd service unit `alsa-restore.service`. If the state file is not present, `alsactl` will fail with exit code 99. Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> CC: Jordi Mallach <jordi(a)debian.org> --- Please apply with `git am saved-messages.mbox`. alsactl/Makefile.am | 1 + alsactl/alsa-restore.service.in | 1 + 2 files changed, 2 insertions(+) diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index cac8094..b691dfa 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -40,6 +40,7 @@ endif edit = \ $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ -e 's,@mydatadir\@,$(mydatadir),g' \ + -e 's,@asoundstatedir\@,$(ASOUND_STATE_DIR),g' \ -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ < $< > $@ || rm $@ diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in index 2884098..f3cd86b 100644 --- a/alsactl/alsa-restore.service.in +++ b/alsactl/alsa-restore.service.in @@ -7,6 +7,7 @@ Description=Save/Restore Sound Card State ConditionPathExists=!@daemonswitch@ ConditionPathExistsGlob=/dev/snd/control* +ConditionPathExists=@asoundstatedir@/asound.state After=alsa-state.service [Service] -- 2.11.0

2 1

[alsa-devel] [PATCH] alsactl: Make homedir configurable
by Paul Menzel 28 Dec '16

28 Dec '16

Date: Sat, 19 Oct 2013 10:12:19 +0000 Add new configure switch to set alsactl's homedir. This is used to avoid that a directory `.pulse` is created by the init script, when PulseAudio is installed [1]. [1] https://bugs.debian.org/712980 "alsa-utils startup script creates /.pulse files ("Failed to create secure directory") when pulseaudio is installed" CC: Jordi Mallach <jordi(a)debian.org> Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- Please apply with `git am saved-messages.mbox`. alsactl/90-alsa-restore.rules.in | 4 ++-- alsactl/Makefile.am | 1 + alsactl/alsa-restore.service.in | 4 ++-- alsactl/alsa-state.service.in | 4 ++-- configure.ac | 6 ++++++ 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in index c0c1b23..95b26c4 100644 --- a/alsactl/90-alsa-restore.rules.in +++ b/alsactl/90-alsa-restore.rules.in @@ -2,7 +2,7 @@ ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", TEST== GOTO="alsa_restore_end" LABEL="alsa_restore_go" -TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl restore $attr{device/number}" -TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl nrestore $attr{device/number}" +TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl -E HOME=@alsactlhome@ restore $attr{device/number}" +TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl -E HOME=@alsactlhome@ nrestore $attr{device/number}" LABEL="alsa_restore_end" diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index cac8094..d03137b 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -40,6 +40,7 @@ endif edit = \ $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ -e 's,@mydatadir\@,$(mydatadir),g' \ + -e 's,@alsactlhome\@,$(ALSACTL_HOME_DIR),g' \ -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ < $< > $@ || rm $@ diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in index 2884098..23dece8 100644 --- a/alsactl/alsa-restore.service.in +++ b/alsactl/alsa-restore.service.in @@ -12,6 +12,6 @@ After=alsa-state.service [Service] Type=oneshot RemainAfterExit=true -ExecStart=-@sbindir@/alsactl restore -ExecStop=-@sbindir@/alsactl store +ExecStart=-@sbindir@/alsactl -E HOME=@alsactlhome@ restore +ExecStop=-@sbindir@/alsactl -E HOME=@alsactlhome@ store StandardOutput=syslog diff --git a/alsactl/alsa-state.service.in b/alsactl/alsa-state.service.in index f1321d6..28e3043 100644 --- a/alsactl/alsa-state.service.in +++ b/alsactl/alsa-state.service.in @@ -10,5 +10,5 @@ After=sysinit.target [Service] Type=simple -ExecStart=-@sbindir@/alsactl -s -n 19 -c rdaemon -ExecStop=-@sbindir@/alsactl -s kill save_and_quit +ExecStart=-@sbindir@/alsactl -E HOME=@alsactlhome@ -s -n 19 -c rdaemon +ExecStop=-@sbindir@/alsactl -E HOME=@alsactlhome@ -s kill save_and_quit diff --git a/configure.ac b/configure.ac index 69ff2ab..8cbf798 100644 --- a/configure.ac +++ b/configure.ac @@ -409,6 +409,12 @@ AC_ARG_WITH([alsactl-pidfile-dir], [ALSACTL_PIDFILE_DIR="/var/run"]) AC_SUBST(ALSACTL_PIDFILE_DIR) +AC_ARG_WITH([alsactl-home-dir], + AS_HELP_STRING([--with-alsactl-home-dir=DIR], [Directory to use as homedir for alsactl]), + [ALSACTL_HOME_DIR="$withval"], + [ALSACTL_HOME_DIR="/var/run/alsa"]) +AC_SUBST(ALSACTL_HOME_DIR) + AC_ARG_WITH([alsactl-daemonswitch], AS_HELP_STRING([--with-alsactl-daemonswitch=FILE], [File to test for the daemon mode]), [ALSACTL_DAEMONSWITCH="$withval"], -- 2.11.0

2 1

[alsa-devel] [PATCH] alsactl: Fix spelling mistakes
by Paul Menzel 28 Dec '16

28 Dec '16

Date: Sun, 8 May 2016 16:50:23 +0000 Upstream the patch from the Debian package [1]. [1] https://sources.debian.net/src/alsa-utils/1.1.2-1/debian/patches/spellfixes… CC: Elimar Riesebieter <riesebie(a)lxtec.de> Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- The renaming from `ressize` to `resize` might not be correct, if it’s the size of the variable *res*. Please tell me, if I should remove that. alsactl/alsactl.c | 2 +- alsactl/init_parse.c | 10 +++++----- alsactl/init_utils_run.c | 14 +++++++------- alsactl/state.c | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c index bcbc187..f0060e9 100644 --- a/alsactl/alsactl.c +++ b/alsactl/alsactl.c @@ -90,7 +90,7 @@ static struct arg args[] = { { FILEARG | 'e', "pid-file", "pathname for the process id (daemon mode)" }, { HEADER, NULL, "Available init options:" }, { ENVARG | 'E', "env", "set environment variable for init phase (NAME=VALUE)" }, -{ FILEARG | 'i', "initfile", "main configuation file for init phase" }, +{ FILEARG | 'i', "initfile", "main configuration file for init phase" }, { 0, NULL, " (default " DATADIR "/init/00main)" }, { 'b', "background", "run daemon in background" }, { 's', "syslog", "use syslog for messages" }, diff --git a/alsactl/init_parse.c b/alsactl/init_parse.c index e81174f..f2a598c 100644 --- a/alsactl/init_parse.c +++ b/alsactl/init_parse.c @@ -939,7 +939,7 @@ static int get_key(char **line, char **key, enum key_op *op, char **value) } /* extract possible KEY{attr} */ -static char *get_key_attribute(struct space *space, char *str, char *res, size_t ressize) +static char *get_key_attribute(struct space *space, char *str, char *res, size_t resize) { char *pos; char *attr; @@ -953,7 +953,7 @@ static char *get_key_attribute(struct space *space, char *str, char *res, size_t return NULL; } pos[0] = '\0'; - strlcpy(res, attr, ressize); + strlcpy(res, attr, resize); pos[0] = '}'; dbg("attribute='%s'", res); return res; @@ -1209,7 +1209,7 @@ found: /* possibly truncate to format-char specified length */ if (len != -1) { head[len] = '\0'; - dbg("truncate to %i chars, subtitution string becomes '%s'", len, head); + dbg("truncate to %i chars, substitution string becomes '%s'", len, head); } strlcat(string, temp, maxsize); } @@ -1242,7 +1242,7 @@ found: static int run_program1(struct space *space, const char *command0, char *result, - size_t ressize, size_t *reslen, int log) + size_t resize, size_t *reslen, int log) { if (strncmp(command0, "__ctl_search", 12) == 0) { const char *res = elemid_get(space, "do_search"); @@ -1254,7 +1254,7 @@ int run_program1(struct space *space, const char *res = elemid_get(space, "do_count"); if (res == NULL || strcmp(res, "0") == 0) return EXIT_FAILURE; - strlcpy(result, res, ressize); + strlcpy(result, res, resize); return EXIT_SUCCESS; } Perror(space, "unknown buildin command '%s'", command0); diff --git a/alsactl/init_utils_run.c b/alsactl/init_utils_run.c index dde490b..ffa0e23 100644 --- a/alsactl/init_utils_run.c +++ b/alsactl/init_utils_run.c @@ -24,12 +24,12 @@ static int run_program1(struct space *space, const char *command0, char *result, - size_t ressize, size_t *reslen, int log); + size_t resize, size_t *reslen, int log); static int run_program0(struct space *space, const char *command0, char *result, - size_t ressize, size_t *reslen, int log) + size_t resize, size_t *reslen, int log) { int retval = 0; int status; @@ -175,11 +175,11 @@ int run_program0(struct space *space, /* store result for rule processing */ if (result) { - if (respos + count < ressize) { + if (respos + count < resize) { memcpy(&result[respos], inbuf, count); respos += count; } else { - Perror(space, "ressize %ld too short", (long)ressize); + Perror(space, "resize %ld too short", (long)resize); retval = -1; } } @@ -239,9 +239,9 @@ int run_program0(struct space *space, static int run_program(struct space *space, const char *command0, char *result, - size_t ressize, size_t *reslen, int log) + size_t resize, size_t *reslen, int log) { if (command0[0] == '_' && command0[1] == '_') - return run_program1(space, command0, result, ressize, reslen, log); - return run_program0(space, command0, result, ressize, reslen, log); + return run_program1(space, command0, result, resize, reslen, log); + return run_program0(space, command0, result, resize, reslen, log); } diff --git a/alsactl/state.c b/alsactl/state.c index 3908ec4..d2d6dac 100644 --- a/alsactl/state.c +++ b/alsactl/state.c @@ -1160,7 +1160,7 @@ static int restore_config_value(snd_ctl_t *handle, snd_ctl_elem_info_t *info, case SND_CTL_ELEM_TYPE_IEC958: break; default: - cerror(doit, "Unknow control type: %d", type); + cerror(doit, "Unknown control type: %d", type); return -EINVAL; } return 0; -- 2.11.0

3 2

[alsa-devel] [PATCH] ucm: parser needs limits.h
by Gustavo Zacarias 28 Dec '16

28 Dec '16

It's using PATH_MAX which is defined there, otherwise the build fails on musl libc. Signed-off-by: Gustavo Zacarias <gustavo(a)zacarias.com.ar> --- src/ucm/parser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ucm/parser.c b/src/ucm/parser.c index c98373a..f520abc 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -32,6 +32,7 @@ #include "ucm_local.h" #include <dirent.h> +#include <limits.h> /** The name of the environment variable containing the UCM directory */ #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM" -- 2.10.2

2 1

[alsa-devel] [PATCH - alsa-lib 1/1] conf/cards: add support for pistachio-card.
by manohar.narkhede＠imgtec.com 28 Dec '16

28 Dec '16

From: Manohar Narkhede <Manohar.Narkhede(a)imgtec.com> Signed-off-by: Manohar Narkhede <Manohar.Narkhede(a)imgtec.com> diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am index 008d399..60b5309 100644 --- a/src/conf/cards/Makefile.am +++ b/src/conf/cards/Makefile.am @@ -39,6 +39,7 @@ cfg_files = aliases.conf \ Maestro3.conf \ NFORCE.conf \ PC-Speaker.conf \ + pistachio-card.conf \ PMac.conf \ PMacToonie.conf \ PS3.conf \ diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf index 4a92fb2..60f9d26 100644 --- a/src/conf/cards/aliases.conf +++ b/src/conf/cards/aliases.conf @@ -55,6 +55,7 @@ AV100 cards.CMI8788 AV200 cards.CMI8788 CMI8786 cards.CMI8788 CMI8787 cards.CMI8788 +pistachio cards.pistachio-card <confdir:pcm/default.conf> <confdir:pcm/dmix.conf> diff --git a/src/conf/cards/pistachio-card.conf b/src/conf/cards/pistachio-card.conf new file mode 100644 index 0000000..9c0318d --- /dev/null +++ b/src/conf/cards/pistachio-card.conf @@ -0,0 +1,34 @@ +# +# Configuration for the pistachio chip +# + +pistachio-card.pcm.default{ + @args [ CARD ] + @args.CARD { + type string + default "pistachio" + } + @args.DEVICE { + type integer + default 2 + } + + type asym + capture.pcm { + type multi + slaves.a.pcm "hw:0,4" + slaves.a.channels 12 + bindings.0.slave a + bindings.0.channel 4 + bindings.1.slave a + bindings.1.channel 5 + } + + playback.pcm { + type hw + card $CARD + device $DEVICE + + } + +} -- 2.1.0

3 3

[alsa-devel] [PATCH 2/2] ucm: Add ATTRIBUTE_UNUSED for unused parameters of execute_component_seq()
by mengdong.lin＠linux.intel.com 28 Dec '16

28 Dec '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> To fix the following warnings: main.c: In function ‘execute_component_seq’: main.c:489:24: warning: unused parameter ‘value_list1’ [-Wunused-parameter] struct list_head *value_list1, ^ main.c:490:24: warning: unused parameter ‘value_list2’ [-Wunused-parameter] struct list_head *value_list2, ^ main.c:491:24: warning: unused parameter ‘value_list3’ [-Wunused-parameter] struct list_head *value_list3, ^ Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> diff --git a/src/ucm/main.c b/src/ucm/main.c index 750e65d..38a5e81 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -486,9 +486,9 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr, */ static int execute_component_seq(snd_use_case_mgr_t *uc_mgr, struct component_sequence *cmpt_seq, - struct list_head *value_list1, - struct list_head *value_list2, - struct list_head *value_list3, + struct list_head *value_list1 ATTRIBUTE_UNUSED, + struct list_head *value_list2 ATTRIBUTE_UNUSED, + struct list_head *value_list3 ATTRIBUTE_UNUSED, char *cdev) { struct use_case_device *device = cmpt_seq->device; -- 2.7.4

2 1

[alsa-devel] [PATCH 1/2] ucm: Enable all warnings for automake C preprocessor
by mengdong.lin＠linux.intel.com 28 Dec '16

28 Dec '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> To display warnings for us to fix them, add '-Wall' to AM_CPPFLAGS. Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> diff --git a/src/ucm/Makefile.am b/src/ucm/Makefile.am index 9d66b24..79e57d2 100644 --- a/src/ucm/Makefile.am +++ b/src/ucm/Makefile.am @@ -7,4 +7,4 @@ noinst_HEADERS = ucm_local.h all: libucm.la -AM_CPPFLAGS=-I$(top_srcdir)/include +AM_CPPFLAGS=-I$(top_srcdir)/include -Wall -- 2.7.4

3 2

[alsa-devel] [PATCH 1/2] ALSA: hda - Apply ALC269_FIXUP_NO_SHUTUP on HDA_FIXUP_ACT_PROBE
by Gabriele Mazzotta 28 Dec '16

28 Dec '16

Setting shutup when the action is HDA_FIXUP_ACT_PRE_PROBE might not have the desired effect since it could be overridden by another more generic shutup function. Prevent this by setting the more specific shutup function on HDA_FIXUP_ACT_PROBE. Signed-off-by: Gabriele Mazzotta <gabriele.mzt(a)gmail.com> --- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index ea81c08ddc7a..d30cc49512e4 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -4400,7 +4400,7 @@ static void alc_no_shutup(struct hda_codec *codec) static void alc_fixup_no_shutup(struct hda_codec *codec, const struct hda_fixup *fix, int action) { - if (action == HDA_FIXUP_ACT_PRE_PROBE) { + if (action == HDA_FIXUP_ACT_PROBE) { struct alc_spec *spec = codec->spec; spec->shutup = alc_no_shutup; } -- 2.11.0

2 2

[alsa-devel] [PATCH] ALSA: mixart: fix a comment typo
by Geliang Tang 28 Dec '16

28 Dec '16

Fix a comment typo in mixart.h. Signed-off-by: Geliang Tang <geliangtang(a)gmail.com> --- sound/pci/mixart/mixart.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/mixart/mixart.h b/sound/pci/mixart/mixart.h index 0cc17e0..4267438 100644 --- a/sound/pci/mixart/mixart.h +++ b/sound/pci/mixart/mixart.h @@ -86,7 +86,7 @@ struct mixart_mgr { u32 msg_fifo[MSG_FIFO_SIZE]; int msg_fifo_readptr; int msg_fifo_writeptr; - atomic_t msg_processed; /* number of messages to be processed in takslet */ + atomic_t msg_processed; /* number of messages to be processed in tasklet */ struct mutex lock; /* interrupt lock */ struct mutex msg_lock; /* mailbox lock */ -- 2.9.3

2 1

[alsa-devel] [PATCH] Support both DSD LE/BE Amanero firmware versions
by Jussi Laako 28 Dec '16

28 Dec '16

Add DSD support for both little endian (DSD_U32_LE) and big endian (DSD_U32_BE) version of the Amanero firmware. Signed-off-by: Jussi Laako <jussi(a)sonarnerd.net> --- sound/usb/quirks.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index b3fd238..f5c68ea 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1359,6 +1359,21 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, if (fp->altsetting == 3) return SNDRV_PCM_FMTBIT_DSD_U32_BE; break; + + /* Amanero Combo384 USB interface with native DSD support */ + case USB_ID(0x16d0, 0x071a): + if (fp->altsetting == 2) { + switch (chip->dev->descriptor.bcdDevice) { + case 0x199: + return SNDRV_PCM_FMTBIT_DSD_U32_LE; + case 0x19b: + return SNDRV_PCM_FMTBIT_DSD_U32_BE; + default: + break; + } + } + break; + default: break; } -- 2.7.4

2 1

[alsa-devel] [PATCH] ALSA: use designated initializers
by Kees Cook 28 Dec '16

28 Dec '16

Prepare to mark sensitive kernel structures for randomization by making sure they're using designated initializers. These were identified during allyesconfig builds of x86, arm, and arm64, with most initializer fixes extracted from grsecurity. Signed-off-by: Kees Cook <keescook(a)chromium.org> --- sound/synth/emux/emux_seq.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c index a0209204ae48..55579f6b8cb2 100644 --- a/sound/synth/emux/emux_seq.c +++ b/sound/synth/emux/emux_seq.c @@ -33,13 +33,13 @@ static int snd_emux_unuse(void *private_data, struct snd_seq_port_subscribe *inf * MIDI emulation operators */ static struct snd_midi_op emux_ops = { - snd_emux_note_on, - snd_emux_note_off, - snd_emux_key_press, - snd_emux_terminate_note, - snd_emux_control, - snd_emux_nrpn, - snd_emux_sysex, + .note_on = snd_emux_note_on, + .note_off = snd_emux_note_off, + .key_press = snd_emux_key_press, + .note_terminate = snd_emux_terminate_note, + .control = snd_emux_control, + .nrpn = snd_emux_nrpn, + .sysex = snd_emux_sysex, }; -- 2.7.4 -- Kees Cook Nexus Security

3 2

Re: [alsa-devel] [PATCH] ALSA: cs5535audio: fix unused warnings on resume/suspend
by Takashi Iwai 28 Dec '16

28 Dec '16

On Sat, 17 Dec 2016 01:25:27 +0100, Jérémy Lefaure wrote: > > When CONFIG_PM_SLEEP is disabled, SIMPLE_DEV_PM_OPS does not use > snd_cs5535audio_resume and snd_cs5535audio_suspend functions: > > sound/pci/cs5535audio/cs5535audio_pm.c:77:12: warning: ‘snd_cs5535audio_resume’ defined but not used [-Wunused-function] > static int snd_cs5535audio_resume(struct device *dev) > ^~~~~~~~~~~~~~~~~~~~~~ > sound/pci/cs5535audio/cs5535audio_pm.c:58:12: warning: ‘snd_cs5535audio_suspend’ defined but not used [-Wunused-function] > static int snd_cs5535audio_suspend(struct device *dev) > ^~~~~~~~~~~~~~~~~~~~~~~ > > Adding __maybe_unused to the declaration of these functions removes the > warnings. > > Signed-off-by: Jérémy Lefaure <jeremy.lefaure(a)lse.epita.fr> Applied, thanks. Takashi > --- > sound/pci/cs5535audio/cs5535audio_pm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/pci/cs5535audio/cs5535audio_pm.c b/sound/pci/cs5535audio/cs5535audio_pm.c > index 06ac5d8da362..82bd10b68a77 100644 > --- a/sound/pci/cs5535audio/cs5535audio_pm.c > +++ b/sound/pci/cs5535audio/cs5535audio_pm.c > @@ -55,7 +55,7 @@ static void snd_cs5535audio_stop_hardware(struct cs5535audio *cs5535au) > > } > > -static int snd_cs5535audio_suspend(struct device *dev) > +static int __maybe_unused snd_cs5535audio_suspend(struct device *dev) > { > struct snd_card *card = dev_get_drvdata(dev); > struct cs5535audio *cs5535au = card->private_data; > @@ -74,7 +74,7 @@ static int snd_cs5535audio_suspend(struct device *dev) > return 0; > } > > -static int snd_cs5535audio_resume(struct device *dev) > +static int __maybe_unused snd_cs5535audio_resume(struct device *dev) > { > struct snd_card *card = dev_get_drvdata(dev); > struct cs5535audio *cs5535au = card->private_data; > -- > 2.11.0 > >

1 0

[alsa-devel] [PATCH 0/2] ASoC: Dell IoT Gateway audio support
by Shrirang Bagul 27 Dec '16

27 Dec '16

These patches add basic audio support on new Dell Edge IoT Gateways. RT5660 codec is connected to SSP2 port on Intel Atom Baytrail E3815 SoC. The machine driver is based on bytcr_rt5640. These devices have line-in and line-out jacks with line-out mute enable gpio described in ACPI tables. Shrirang Bagul (2): ASoC: rt5660: Add ACPI support ASoC: Intel: boards: Add Baytrail RT5660 machine driver sound/soc/codecs/rt5660.c | 26 ++ sound/soc/intel/Kconfig | 13 + sound/soc/intel/atom/sst/sst_acpi.c | 2 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/bytcr_rt5660.c | 573 ++++++++++++++++++++++++++++++++++ 5 files changed, 616 insertions(+) create mode 100644 sound/soc/intel/boards/bytcr_rt5660.c -- 2.9.3

3 9

[alsa-devel] [snd-usb-audio] BUG: NULL pointer dereference at 0000000000000070
by Dave Young 25 Dec '16

25 Dec '16

Hi, With recent mainline kernel, I see a BUG, it is easy to reproduce, just plugging the usb microphone, bisected the first bad commit is: 16200948d8353fe29a473a394d7d26790deae0e7 is the first bad commit commit 16200948d8353fe29a473a394d7d26790deae0e7 Author: Takashi Iwai <tiwai(a)suse.de> Date: Mon Dec 5 11:19:38 2016 +0100 ALSA: usb-audio: Fix race at stopping the stream We've got a kernel crash report showing like: Unable to handle kernel NULL pointer dereference at virtual address 00000008 pgd = a1d7c000 [snip] The BUG dmesg itself is below: [54029.102610] input: Samson Technologies Samson Meteor Mic as /devices/pci0000:00/0000:00:14.0/usb2/2-3/2-3:1.3/0003:17A0:0310.0003/input/input19 [54029.154424] hid-generic 0003:17A0:0310.0003: input: USB HID v1.00 Device [Samson Technologies Samson Meteor Mic] on usb-0000:00:14.0-3/input3 [54029.202035] usbcore: registered new interface driver snd-usb-audio [54029.242705] BUG: unable to handle kernel NULL pointer dereference at 0000000000000070 [54029.271667] IP: retire_playback_urb+0x5/0xd0 [snd_usb_audio] [54029.300462] PGD 0 [54029.300462] [54029.355691] Oops: 0000 [#1] SMP [54029.383215] Modules linked in: snd_usb_audio snd_usbmidi_lib snd_rawmidi macvtap macvlan tun ccm rfcomm fuse snd_hda_codec_hdmi cmac bnep kvm_intel kvm irqbypass i915 arc4 intel_gtt drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm snd_hda_codec_realtek snd_hda_codec_generic iwlmvm mac80211 rtsx_pci_sdmmc iwlwifi snd_hda_intel snd_hda_codec snd_hwdep snd_hda_core cfg80211 snd_seq snd_seq_device btusb btrtl thinkpad_acpi btbcm pcspkr input_leds btintel serio_raw bluetooth snd_pcm e1000e snd_timer ptp rtsx_pci snd i2c_i801 pps_core rfkill mfd_core soundcore video nfsd auth_rpcgss nfs_acl lockd grace sunrpc [54029.480514] CPU: 1 PID: 0 Comm: swapper/1 Tainted: G W 4.9.0+ #209 [54029.514169] Hardware name: LENOVO 20ARS1BJ02/20ARS1BJ02, BIOS GJET91WW (2.41 ) 09/21/2016 [54029.548395] task: ffff9c2894a18bc0 task.stack: ffffa69dc0cd0000 [54029.582630] RIP: 0010:retire_playback_urb+0x5/0xd0 [snd_usb_audio] [54029.617049] RSP: 0018:ffff9c289f243cd0 EFLAGS: 00010086 [54029.651439] RAX: ffffffffc031bac0 RBX: ffff9c2868a8a000 RCX: 0000000000000001 [54029.686222] RDX: 0000000000000000 RSI: ffff9c288e3e3a00 RDI: 0000000000000000 [54029.721046] RBP: ffff9c289f243d00 R08: 0000000000000001 R09: ffff9c289e803b00 [54029.755850] R10: ffff9c28848f3380 R11: ffff9c289038d0b0 R12: ffff9c2868a8a140 [54029.790482] R13: ffff9c288e3e3a00 R14: 0000000000000000 R15: ffff9c288e3e0390 [54029.824649] FS: 0000000000000000(0000) GS:ffff9c289f240000(0000) knlGS:0000000000000000 [54029.859458] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [54029.894609] CR2: 0000000000000070 CR3: 000000021e008000 CR4: 00000000001406e0 [54029.929476] Call Trace: [54029.963968] <IRQ> [54029.998291] ? snd_complete_urb+0x80/0x260 [snd_usb_audio] [54030.033359] __usb_hcd_giveback_urb+0x76/0x100 [54030.068352] usb_hcd_giveback_urb+0x3c/0xc0 [54030.103167] xhci_giveback_urb_in_irq.isra.23+0x6f/0xa0 [54030.138683] finish_td.constprop.39+0x175/0x260 [54030.173733] xhci_irq+0x9f0/0x1450 [54030.208790] ? try_to_wake_up+0x1f2/0x390 [54030.243696] ? usb_hcd_poll_rh_status+0x190/0x190 [54030.278521] xhci_msi_irq+0x11/0x20 [54030.313376] __handle_irq_event_percpu+0x7e/0x1a0 [54030.348615] handle_irq_event_percpu+0x32/0x80 [54030.383917] handle_irq_event+0x2c/0x50 [54030.419012] handle_edge_irq+0x9f/0x120 [54030.454042] handle_irq+0x73/0x130 [54030.488522] ? _local_bh_enable+0x21/0x50 [54030.522777] do_IRQ+0x46/0xd0 [54030.556882] common_interrupt+0x90/0x90 [54030.591095] RIP: 0010:cpuidle_enter_state+0x134/0x2a0 [54030.625661] RSP: 0018:ffffa69dc0cd3e60 EFLAGS: 00000246 ORIG_RAX: ffffffffffffff2c [54030.660438] RAX: 0000000000000000 RBX: 00003123a9d13159 RCX: 000000000000001f [54030.695705] RDX: 00003123a9d13159 RSI: ffff9c289f254f98 RDI: 0000000000000000 [54030.731113] RBP: ffffa69dc0cd3e98 R08: cccccccccccccccd R09: 0000000000000018 [54030.766539] R10: 000000000000019c R11: 00000000000000a7 R12: 0000000000000004 [54030.802207] R13: 0000000000000004 R14: ffff9c289f25db08 R15: 00003123a9c9b583 [54030.837897] </IRQ> [54030.873227] cpuidle_enter+0x17/0x20 [54030.908827] call_cpuidle+0x23/0x40 [54030.944343] do_idle+0x189/0x200 [54030.979754] cpu_startup_entry+0x71/0x80 [54031.015166] start_secondary+0x142/0x160 [54031.050630] start_cpu+0x14/0x14 [54031.085944] Code: e9 03 41 5e 5d f7 f1 89 c0 c3 41 8b 76 64 4c 89 e7 e8 f0 fe ff ff eb c4 0f 1f 40 00 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 <48> 8b 4f 70 31 d2 8b 86 88 00 00 00 f7 b1 98 15 00 00 85 c0 75 [54031.124608] RIP: retire_playback_urb+0x5/0xd0 [snd_usb_audio] RSP: ffff9c289f243cd0 [54031.162852] CR2: 0000000000000070

1 0

[alsa-devel] How to keep track of the amount of queued samples?
by Jan Deinhard 23 Dec '16

23 Dec '16

Hi, I would like to understand the following quote which I copied from https://www.kernel.org/doc/Documentation/sound/alsa/timestamping.txt "The ALSA API provides two basic pieces of information, avail and delay, which combined with the trigger and current system timestamps allow for applications to keep track of the 'fullness' of the ring buffer and the amount of queued samples." Querying avail and delay is straight forward. But I have no idea how to use these values in combination with trigger_htstamp and the current system timestamp to calculate the fullness of the ring buffer. Can someone provide some insight? What exactly is meant by "current system timestamp"? Is it provied by ALSA (htstamp?) or should I use clock_gettime(CLOCK_MONOTONIC, &system_time); to get that timestamp? Thanks, Jan

2 1

[alsa-devel] [PATCH 1/2] ucm: Automatically load the best config file based on the card long name
by mengdong.lin＠linux.intel.com 23 Dec '16

23 Dec '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> Intel DSP platform drivers are used by many different devices. For user space to differentiate them, ASoC machine driver may include the DMI info (vendor, product and board) in card long name. Possible card long names are: broadwell-rt286-Dell Inc.-XPS 13 9343-0310JH broadwell-rt286-Intel Corp.-Broadwell Client platform-Wilson Beach SDS bytcr-rt5640-ASUSTeK COMPUTER INC.-T100TA-T100TA bytcr-rt5651-Circuitco-Minnowboard Max D0 PLATFORM-MinnowBoard MAX ... And user space can define configuration files including fields separated by '.' as below: broadwell-rt286 broadwell-rt286.Dell.XPS bytcr-rt5640 bytcr-rt5640.ASUS.T100 bytcr-rt5651.MinnowboardMax ... When being asked to load configuration file of a card, UCM will try to find the card long name from the local machine, and then scan all available configuration file names, search every field of config file name in the card long name. The more characters match, the higher score the file has. Finally, the file with the highest score will be loaded to configure the sound card. Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> diff --git a/src/ucm/parser.c b/src/ucm/parser.c index c98373a..ff75da7 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -55,6 +55,9 @@ static const char * const component_dir[] = { NULL, /* terminator */ }; +static int filename_filter(const struct dirent *dirent); +static int is_component_directory(const char *dir); + static int parse_sequence(snd_use_case_mgr_t *uc_mgr, struct list_head *base, snd_config_t *cfg); @@ -1328,6 +1331,210 @@ static int parse_master_file(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg) return 0; } +/* trim SPACE (0x20) from the string */ +static void trim_space(char *str) +{ + int i, j = 0; + + for (i = 0; str[i] && i < MAX_FILE; i++) { + if (str[i] != 0x20) + str[j++] = str[i]; + } + + str[j] = '\0'; +} + +/* find and store the card long name if the card is in this machine */ +static int get_card_long_name(snd_use_case_mgr_t *mgr) +{ + const char *card_name = mgr->card_name; + snd_ctl_t *handle; + int card, err, dev, idx; + snd_ctl_card_info_t *info; + const char *_name, *_long_name; + + snd_ctl_card_info_alloca(&info); + + card = -1; + if (snd_card_next(&card) < 0 || card < 0) { + uc_error("no soundcards found..."); + return -1; + } + + while (card >= 0) { + char name[32]; + + sprintf(name, "hw:%d", card); + err = snd_ctl_open(&handle, name, 0); + if (err < 0) { + uc_error("control open (%i): %s", card, + snd_strerror(err)); + goto next_card; + } + + err = snd_ctl_card_info(handle, info); + if (err < 0) { + uc_error("control hardware info (%i): %s", card, + snd_strerror(err)); + snd_ctl_close(handle); + goto next_card; + } + + _name = snd_ctl_card_info_get_name(info); + if (!strncmp(card_name, _name, 32)) { + _long_name = snd_ctl_card_info_get_longname(info); + strncpy(mgr->card_long_name, _long_name, + MAX_CARD_LONG_NAME); + snd_ctl_close(handle); + return 0; + } + + snd_ctl_close(handle); +next_card: + if (snd_card_next(&card) < 0) { + uc_error("snd_card_next"); + break; + } + } + + return -1; +} + +/* This function will find the best device-specific configuration file based + * on the sound card long name. + * Different devices may share the same sound driver and thus the same sound + * card name (short name), but they may still need different device-specific + * configurations. For user space to differentiate them, kernel drivers may + * include the DMI info (vendor, product and board) in the card long name. + * And user space can define configuration file names appending DMI keywords + * to the card name, like: + * bytcr-rt5640.ASUS.T100 + * bytcr-rt5651.MinnowBoard + * + * When being asked to load the configuration file for a card, this function + * will try to find the card long name from the local machine, and then scan + * all available configuration file names, search every field of the config + * file name in the card long name. The more characters match, the higher + * score the file has. Finally, the file with the highest score will be loaded. + */ +static void find_best_config_file(snd_use_case_mgr_t *mgr) +{ + const char *card_name = mgr->card_name; + char name[MAX_FILE]; + char *env = getenv(ALSA_CONFIG_UCM_VAR); + struct dirent **namelist; + char card_long_name[MAX_CARD_LONG_NAME]; + char *lpos, *lpos_next, *lname_end; + char *d_name, *dpos, *dpos_next, *d_name_end; + int d_name_len, field_len, long_name_len; + int i, cnt, err; + int score, score_max = 0, d_index = -1; + int is_first_field; + + if (get_card_long_name(mgr) < 0) { + /* cannot get long name, use card name as the conf file name */ + strcpy(mgr->conf_file_name, mgr->card_name); + return; + } + + strncpy(card_long_name, mgr->card_long_name, MAX_CARD_LONG_NAME); + trim_space(card_long_name); /* trim SPACE for matching */ + lname_end = card_long_name + strlen(card_long_name); + + /* get list of card directories under /usr/share/alsa/ucm */ + snprintf(name, sizeof(name)-1, + "%s", env ? env : ALSA_USE_CASE_DIR); + name[MAX_FILE-1] = '\0'; + + err = scandir(name, &namelist, filename_filter, alphasort); + if (err < 0) { + err = -errno; + uc_error("error: could not scan directory %s: %s", + name, strerror(-err)); + return; + } + cnt = err; + + /* scan the card directory names */ + for (i = 0; i < cnt; i++) { + + /* Skip the directories for component devices */ + if (is_component_directory(namelist[i]->d_name)) + continue; + + score = 0; + lpos = card_long_name; + + d_name = namelist[i]->d_name; + d_name_len = strlen(d_name); + d_name_end = d_name + d_name_len; + is_first_field = 1; + dpos = d_name; + + /* scan fields in the card directory name, separated by '.' */ + while (1) { + dpos_next = strchr(dpos, '.'); + if (dpos_next == dpos) /* start with '.' */ + goto next_field; + + if (!dpos_next) /* last field */ + field_len = d_name_end - dpos; + else + field_len = dpos_next - dpos; + + memcpy(name, dpos, field_len); + name[field_len] = '\0'; + + /* search the field in the given card long name */ + lpos_next = strstr(lpos, name); + if (!lpos_next) { + /* first field is the card name, must match */ + if (is_first_field) + break; + goto next_field; + } else { + /* The more characters match, + * the higher the score is. + */ + score += field_len; + if (lpos_next + field_len >= lname_end) + break; /* reach end of long name */ + + /* Skip the matched field, + * for searching next field. + */ + lpos = lpos_next + field_len; + } + +next_field: + if (!dpos_next) + break; /* no more fields */ + + dpos = dpos_next + 1; /* skip the separator '.' */ + is_first_field = 0; + if (dpos >= d_name_end) + break; + } + + if (score > score_max) { + score_max = score; + d_index = i; + } else if (score == 0 && score_max > 0) { + /* passed the card directories that can match, + * since directories are in alphabetical order. + */ + break; + } + } + + if (d_index >= 0) + strncpy(mgr->conf_file_name, namelist[d_index]->d_name, + MAX_CARD_LONG_NAME); + else + strncpy(mgr->conf_file_name, mgr->card_name, + MAX_CARD_LONG_NAME); +} + static int load_master_config(const char *card_name, snd_config_t **cfg) { char filename[MAX_FILE]; @@ -1355,7 +1562,9 @@ int uc_mgr_import_master_config(snd_use_case_mgr_t *uc_mgr) snd_config_t *cfg; int err; - err = load_master_config(uc_mgr->card_name, &cfg); + find_best_config_file(uc_mgr); + + err = load_master_config(uc_mgr->conf_file_name, &cfg); if (err < 0) return err; err = parse_master_file(uc_mgr, cfg); diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h index 6d3302f..299a5b9 100644 --- a/src/ucm/ucm_local.h +++ b/src/ucm/ucm_local.h @@ -41,6 +41,7 @@ #include "use-case.h" #define MAX_FILE 256 +#define MAX_CARD_LONG_NAME 80 #define ALSA_USE_CASE_DIR ALSA_CONFIG_DIR "/ucm" #define SEQUENCE_ELEMENT_TYPE_CDEV 1 @@ -190,6 +191,8 @@ struct use_case_verb { */ struct snd_use_case_mgr { char *card_name; + char card_long_name[MAX_CARD_LONG_NAME]; + char conf_file_name[MAX_CARD_LONG_NAME]; char *comment; /* use case verb, devices and modifier configs parsed from files */ -- 2.7.4

5 11

[alsa-devel] [PATCH 0/2] ASoC: Use DMI name in sound card long name
by mengdong.lin＠linux.intel.com 22 Dec '16

22 Dec '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> This series is based on Liam's idea to use DMI name as the sound card short name in the audio workshop. Now we add DMI info to the card long name: - Not change the card name (short name), keep it simple. So the card ID won't change as well. - Use short name and DMI name together to make a readable and unqique long name. Machine drivers can use a new API to get this feature. In user space, when the sound server ask UCM to open a sound card, UCM will try to find the best configuration file based on the card long name, and only if not avaiable, fallback to the default configuration file that matches the card name (short name). Please see patch: ucm: Automatically load the best config file based on the card long name History: v1 from RFC: Give up using a table to map DMI info to a simple string, since we cannot maintain such a table for each machine. Just do verbatim copy of DMI info and let user space decide how to use the DMI info in card long name to find the best UCM config file. If device driver adds a flavor string, just append it after the DMI info fields to the card long name. Liam Girdwood (1): ASoC: core: Add API to use DMI name in sound card long name Mengdong Lin (1): ASoC: Intel: Use DMI name for sound card long name in Broadwell machine driver include/sound/soc.h | 4 ++ sound/soc/intel/boards/broadwell.c | 2 + sound/soc/soc-core.c | 81 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) -- 2.5.0

5 8

[alsa-devel] [PATCH] Revert "ALSA: usb-audio: Fix race at stopping the stream"
by Takashi Iwai 21 Dec '16

21 Dec '16

This reverts commit 16200948d8353fe29a473a394d7d26790deae0e7. The commit was intended to cover the race condition, but it introduced yet another regression for devices with the implicit feedback, leading to a kernel panic due to NULL-dereference in an irq context. As the race condition that was addressed by the commit is very rare and the regression is much worse, let's revert the commit for rc1, and fix the issue properly in a later patch. Fixes: 16200948d835 ("ALSA: usb-audio: Fix race at stopping the stream") Reported-by: Ioan-Adrian Ratiu <adi(a)adirat.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- Linus, could you take this manually for rc1? I'm traveling and having a difficulty to set up a git pull request right now. Sorry for inconvenience. Thanks! Takashi sound/usb/endpoint.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index a2cdf3370afe..15d1d5c63c3c 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -384,9 +384,6 @@ static void snd_complete_urb(struct urb *urb) if (unlikely(atomic_read(&ep->chip->shutdown))) goto exit_clear; - if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags))) - goto exit_clear; - if (usb_pipeout(ep->pipe)) { retire_outbound_urb(ep, ctx); /* can be stopped during retire callback */ @@ -537,11 +534,6 @@ static int wait_clear_urbs(struct snd_usb_endpoint *ep) alive, ep->ep_num); clear_bit(EP_FLAG_STOPPING, &ep->flags); - ep->data_subs = NULL; - ep->sync_slave = NULL; - ep->retire_data_urb = NULL; - ep->prepare_data_urb = NULL; - return 0; } @@ -1028,6 +1020,10 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep) if (--ep->use_count == 0) { deactivate_urbs(ep, false); + ep->data_subs = NULL; + ep->sync_slave = NULL; + ep->retire_data_urb = NULL; + ep->prepare_data_urb = NULL; set_bit(EP_FLAG_STOPPING, &ep->flags); } } -- 2.11.0

1 0

Re: [alsa-devel] [PATCH] ALSA: snd-usb: fix IRQ triggered NULL pointer dereference
by Takashi Iwai 21 Dec '16

21 Dec '16

On Tue, 20 Dec 2016 14:04:56 +0100, Takashi Sakamoto wrote: > > Hi, > > On Dec 20 2016 20:47, Ioan-Adrian Ratiu wrote: > > On Tue, 20 Dec 2016, Takashi Sakamoto <o-takashi(a)sakamocchi.jp> wrote: > >> --- > >> > >> Hi, > >> > >>> Commit 16200948d835 ("ALSA: usb-audio: Fix race at stopping the stream") > >>> fixes a race-codition but it also introduces another really nasty data race > >>> regression which makes my usb sound card [1] completely useless, throwing > >>> the kernel into a panic if anything from userspace tries to start playback. > >>> > >>> The problem is this: ep->data_subs is now set to NULL every time inside > >>> wait_clear_urbs(). ep->data_subs is initalized only in one place in > >>> start_endpoints(), then it is immediately wiped by the pre-existing call to > >>> wait_clear_urbs() inside snd_usb_endpoint_start(). > >>> > >>> To ilustrate, this is what happens in the non-irq part of the code: > >>> > >>> Step 1 (inside start_endpoints): ep->data_subs = subs; > >>> Step 2 (inside start_endpoints): snd_usb_endpoint_start(ep, can_sleep); > >>> Step 3 (inside snd_usb_endpoint_start): wait_clear_urbs(ep); > >>> Step 4 (inside wait_clear_urbs): ep->data_subs = NULL; > >>> > >>> Here's a simplified call stack for the IRQ part (full one at the end): > >>> > >>> (NULL dereference, param "subs" is passed NULL value of ep->data_subs) > >>> retire_playback_urb > >>> retire_outbound_urb > >>> snd_complete_urb > >>> (...) > >>> xhci_irq > >>> > >>> Looking at the git log there seems to be quite a lot of history in this > >>> part of the codebase, dating back to 2012 or earlier. My fix is based on > >>> 015618b90 ("ALSA: snd-usb: Fix URB cancellation at stream start") and > >>> e9ba389c5 ("ALSA: usb-audio: Fix scheduling-while-atomic bug in PCM capture > >>> stream") with a few modifications of my own. My idea is to do the > >>> ep->data_subs wiping before endpoint initialization in a manner similar > >>> to these older commits by using stop_endpoints() in snd_usb_pcm_prepare() > >>> and at the same time keep the ep->data_subs = NULL in wait_clear_urbs() to > >>> not trigger the recently fixed stream stopping race again. > >>> > >>> Full call stack: > >>> > >>> [ 131.093240] BUG: unable to handle kernel NULL pointer dereference at 0000000000000010 > >>> [ 131.094313] IP: retire_playback_urb+0x1b/0x160 [snd_usb_audio] > >>> [ 131.095046] PGD 0 > >>> [ 131.095047] > >>> [ 131.096509] Oops: 0000 [#1] PREEMPT SMP > >>> [ 131.097255] Modules linked in: fuse snd_usb_audio snd_usbmidi_lib snd_rawmidi snd_seq_device ctr ccm arc4 ath9k intel_rapl ath9k_common x86_pkg_temp_thermal ath9k_hw intel_powerclamp coretemp joydev mousedev ath kvm_intel mac80211 kvm > >>> input_leds hid_generic psmouse irqbypass usbhid hid crct10dif_pclmul crc32_pclmul serio_raw crc32c_intel atkbd ghash_clmulni_intel snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_intel pcbc aesni_intel libps2 cfg8 > >>> 0211 aes_x86_64 crypto_simd dell_laptop glue_helper r8169 dell_smbios snd_hda_codec sr_mod cryptd led_class mii rfkill snd_hwdep cdrom snd_hda_core ac dcdbas i8042 xhci_pci serio xhci_hcd snd_pcm tpm_tis battery tpm_tis_core lpc_ich tpm > >>> snd_timer evdev shpchp i2c_i801 sch_fq_codel > >>> [ 131.105551] CPU: 2 PID: 165 Comm: irq/29-xhci_hcd Not tainted 4.9.0-gd824cdc58ba0 #10 > >>> [ 131.107516] Hardware name: Dell Inc. Inspiron 3521/018DYG, BIOS A14 07/31/2015 > >>> [ 131.109592] task: ffff880154a70000 task.stack: ffffc90000f48000 > >>> [ 131.111746] RIP: 0010:retire_playback_urb+0x1b/0x160 [snd_usb_audio] > >>> [ 131.113899] RSP: 0018:ffffc90000f4bc10 EFLAGS: 00010082 > >>> [ 131.116080] RAX: ffffffffa04cabe0 RBX: 0000000000000000 RCX: 0000000000000000 > >>> [ 131.118284] RDX: 0000000000000000 RSI: ffff8801435a4c00 RDI: 0000000000000000 > >>> [ 131.120505] RBP: ffffc90000f4bc40 R08: 0000000000000001 R09: 0000000000000001 > >>> [ 131.122807] R10: 0000000000000001 R11: ffffffff82f60d6d R12: ffff8801432a0238 > >>> [ 131.125265] R13: ffff8801435a4c00 R14: 0000000000000000 R15: ffff8801535c83b8 > >>> [ 131.127723] FS: 0000000000000000(0000) GS:ffff88015a000000(0000) knlGS:0000000000000000 > >>> [ 131.130217] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > >>> [ 131.132568] CR2: 0000000000000010 CR3: 0000000001e0b000 CR4: 00000000001406e0 > >>> [ 131.135007] Call Trace: > >>> [ 131.137329] snd_complete_urb+0x190/0x2b0 [snd_usb_audio] > >>> [ 131.139526] __usb_hcd_giveback_urb+0x8e/0x160 > >>> [ 131.141948] usb_hcd_giveback_urb+0x43/0x110 > >>> [ 131.144104] xhci_giveback_urb_in_irq.isra.22+0x7d/0xb0 [xhci_hcd] > >>> [ 131.146521] finish_td.constprop.38+0x1de/0x2f0 [xhci_hcd] > >>> [ 131.148736] xhci_irq+0x13a2/0x1ca0 [xhci_hcd] > >>> [ 131.150972] ? trace_hardirqs_on+0xd/0x10 > >>> [ 131.153209] ? _raw_spin_unlock_irq+0x2c/0x50 > >>> [ 131.155390] ? irq_thread+0xb5/0x1d0 > >>> [ 131.157771] xhci_msi_irq+0x11/0x20 [xhci_hcd] > >>> [ 131.159938] irq_forced_thread_fn+0x2f/0x70 > >>> [ 131.162072] ? irq_thread+0xb5/0x1d0 > >>> [ 131.164141] irq_thread+0x149/0x1d0 > >>> [ 131.166132] ? irq_finalize_oneshot.part.2+0xe0/0xe0 > >>> [ 131.168142] ? wake_threads_waitq+0x30/0x30 > >>> [ 131.170149] kthread+0x10f/0x150 > >>> [ 131.172144] ? irq_thread_dtor+0xc0/0xc0 > >>> [ 131.174139] ? kthread_create_on_node+0x40/0x40 > >>> [ 131.176116] ret_from_fork+0x2a/0x40 > >>> [ 131.178074] Code: 8b 77 64 4c 89 e7 e8 e5 fe ff ff eb c3 0f 1f 00 0f 1f 44 00 00 55 31 d2 48 89 e5 41 57 41 56 41 55 41 54 53 48 89 fb 48 83 ec 08 <48> 8b 47 10 48 8b 4f 70 48 c7 c7 88 7b 4d a0 4c 8b a0 78 01 00 > >>> [ 131.182382] RIP: retire_playback_urb+0x1b/0x160 [snd_usb_audio] RSP: ffffc90000f4bc10 > >>> [ 131.184562] CR2: 0000000000000010 > >>> > >>> [1] 041e:3232 Creative Technology SoundBlaster X-FI HD > >>> [2] http://mailman.alsa-project.org/pipermail/alsa-devel/2016-December/115425.h… > >> > >> I can regenerate this bug with my EMU 0404 USB. My understanding of this bug is > >> quite similar to your perspective. This bug is quite critical. In my > >> understanding, we encounter this bug in all of cases in which snd-usb-audio is > >> applied for PCM playback substream. > >> > >> Below workaround can also suppress this bug. > >> > >> diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c > >> index a2cdf33..9b34f76 100644 > >> --- a/sound/usb/endpoint.c > >> +++ b/sound/usb/endpoint.c > >> @@ -537,11 +537,14 @@ static int wait_clear_urbs(struct snd_usb_endpoint *ep) > >> alive, ep->ep_num); > >> clear_bit(EP_FLAG_STOPPING, &ep->flags); > >> > >> - ep->data_subs = NULL; > >> ep->sync_slave = NULL; > >> ep->retire_data_urb = NULL; > >> ep->prepare_data_urb = NULL; > >> > >> + msleep(200); > >> + > >> + ep->data_subs = NULL; > >> + > >> return 0; > >> } > >> > >> If initialization of 'struct snd_usb_endpoint.data_subs' can be done after all > >> of queued URBs are processed and corresponding complete interrupts are cought, > >> we can solve this critical bug. > >> > >>> Signed-off-by: Ioan-Adrian Ratiu <adi(a)adirat.com> > >>> --- > >>> sound/usb/endpoint.c | 11 ++--------- > >>> sound/usb/endpoint.h | 2 +- > >>> sound/usb/pcm.c | 13 ++++++------- > >>> 3 files changed, 9 insertions(+), 17 deletions(-) > >>> > >>> diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c > >>> index a2cdf3370afe..4465f324c2c2 100644 > >>> --- a/sound/usb/endpoint.c > >>> +++ b/sound/usb/endpoint.c > >>> @@ -920,9 +920,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, > >>> /** > >>> * snd_usb_endpoint_start: start an snd_usb_endpoint > >>> * > >>> - * @ep: the endpoint to start > >>> - * @can_sleep: flag indicating whether the operation is executed in > >>> - * non-atomic context > >>> + * @ep: the endpoint to start > >>> * > >>> * A call to this function will increment the use count of the endpoint. > >>> * In case it is not already running, the URBs for this endpoint will be > >>> @@ -932,7 +930,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, > >>> * > >>> * Returns an error if the URB submission failed, 0 in all other cases. > >>> */ > >>> -int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep) > >>> +int snd_usb_endpoint_start(struct snd_usb_endpoint *ep) > >>> { > >>> int err; > >>> unsigned int i; > >>> @@ -944,11 +942,6 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep) > >>> if (++ep->use_count != 1) > >>> return 0; > >>> > >>> - /* just to be sure */ > >>> - deactivate_urbs(ep, false); > >>> - if (can_sleep) > >>> - wait_clear_urbs(ep); > >>> - > >>> ep->active_mask = 0; > >>> ep->unlink_mask = 0; > >>> ep->phase = 0; > >>> diff --git a/sound/usb/endpoint.h b/sound/usb/endpoint.h > >>> index 6428392d8f62..584f295d7c77 100644 > >>> --- a/sound/usb/endpoint.h > >>> +++ b/sound/usb/endpoint.h > >>> @@ -18,7 +18,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, > >>> struct audioformat *fmt, > >>> struct snd_usb_endpoint *sync_ep); > >>> > >>> -int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep); > >>> +int snd_usb_endpoint_start(struct snd_usb_endpoint *ep); > >>> void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep); > >>> void snd_usb_endpoint_sync_pending_stop(struct snd_usb_endpoint *ep); > >>> int snd_usb_endpoint_activate(struct snd_usb_endpoint *ep); > >>> diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c > >>> index 34c6d4f2c0b6..db26f767f851 100644 > >>> --- a/sound/usb/pcm.c > >>> +++ b/sound/usb/pcm.c > >>> @@ -218,7 +218,7 @@ int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface, > >>> } > >>> } > >>> > >>> -static int start_endpoints(struct snd_usb_substream *subs, bool can_sleep) > >>> +static int start_endpoints(struct snd_usb_substream *subs) > >>> { > >>> int err; > >>> > >>> @@ -231,7 +231,7 @@ static int start_endpoints(struct snd_usb_substream *subs, bool can_sleep) > >>> dev_dbg(&subs->dev->dev, "Starting data EP @%p\n", ep); > >>> > >>> ep->data_subs = subs; > >>> - err = snd_usb_endpoint_start(ep, can_sleep); > >>> + err = snd_usb_endpoint_start(ep); > >>> if (err < 0) { > >>> clear_bit(SUBSTREAM_FLAG_DATA_EP_STARTED, &subs->flags); > >>> return err; > >>> @@ -260,7 +260,7 @@ static int start_endpoints(struct snd_usb_substream *subs, bool can_sleep) > >>> dev_dbg(&subs->dev->dev, "Starting sync EP @%p\n", ep); > >>> > >>> ep->sync_slave = subs->data_endpoint; > >>> - err = snd_usb_endpoint_start(ep, can_sleep); > >>> + err = snd_usb_endpoint_start(ep); > >>> if (err < 0) { > >>> clear_bit(SUBSTREAM_FLAG_SYNC_EP_STARTED, &subs->flags); > >>> return err; > >>> @@ -809,8 +809,7 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) > >>> goto unlock; > >>> } > >>> > >>> - snd_usb_endpoint_sync_pending_stop(subs->sync_endpoint); > >>> - snd_usb_endpoint_sync_pending_stop(subs->data_endpoint); > >>> + stop_endpoints(subs, true); > >>> > >>> ret = set_format(subs, subs->cur_audiofmt); > >>> if (ret < 0) > >>> @@ -850,7 +849,7 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) > >>> /* for playback, submit the URBs now; otherwise, the first hwptr_done > >>> * updates for all URBs would happen at the same time when starting */ > >>> if (subs->direction == SNDRV_PCM_STREAM_PLAYBACK) > >>> - ret = start_endpoints(subs, true); > >>> + return start_endpoints(subs); > >>> > >>> unlock: > >>> snd_usb_unlock_shutdown(subs->stream->chip); > >>> @@ -1666,7 +1665,7 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream > >>> > >>> switch (cmd) { > >>> case SNDRV_PCM_TRIGGER_START: > >>> - err = start_endpoints(subs, false); > >>> + err = start_endpoints(subs); > >>> if (err < 0) > >>> return err; > >> > >> This patch works better, but not the best. It's a bit intrusive. > > > > I disagree. Being intrusive is not a good reason to reject a patch, > > especially if the alternative is to insert random magic number delays > > in hopes of synchronizing process and irq contexts to avoid critical > > errors. > > I apologize if you got some negative opinions in my previous message. > > My intention to show the ugly workaround is not to merge it instead of > yours, but clear what causes this bug. > > For example, we can also apply below patch for this bug, to solve it > roughly. > > diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c > index a2cdf33..6ec4eb1 100644 > --- a/sound/usb/endpoint.c > +++ b/sound/usb/endpoint.c > @@ -162,7 +162,7 @@ int snd_usb_endpoint_next_packet_size(struct > snd_usb_endpoint *ep) > static void retire_outbound_urb(struct snd_usb_endpoint *ep, > struct snd_urb_ctx *urb_ctx) > { > - if (ep->retire_data_urb) > + if (ep->retire_data_urb && ep->data_subs) > ep->retire_data_urb(ep->data_subs, urb_ctx->urb); > } > > But this is just a workaround and can't fix it thoroughly. The main > issue is synchronization between interrupt/process contexts. > > > Please take the time to fully analyze my patch and let's have a > > discussion based on it, not reject it outright and replace it with > > a quick and dirty delay hack. > > OK. I'll deliberately check it again so that I have no overlooks. I > with this thread also catch the other developers enough helpful to > you. (I just eventually caught your patch in LKML and not developer > for this category of devices.) Sorry for the late reply, as I've been (still) off and had bad net connections. About your fix: Sakamoto-san is right, it's no good way to fix this kind or problem. The easiest option right now is just to revert my previous fix, as it obviously introduces another regression. The correct fix will be taken after that. I'm going to prepare a revert patch and ask Linus to take it before rc1. thanks, Takashi > > > Ionel > > > >> > >> What we need to synchronize process contexts to interrupt context till all of > >> queued URBs are handled. This seems to be a main purpose of wait_clear_bits, > >> while current implementation of snd_complete_urb()/wait_clear_bits() is not > >> enough. > >> > >> Thanks for your reporting. > >> > >> Takashi Sakamoto > >> -- > >> 2.9.3 > > > Thanks > > Takashi Sakamoto >

1 0

[alsa-devel] [PATCH] ASoC: sun4i-i2s: Add quirks for newer SoCs
by codekipper＠gmail.com 20 Dec '16

20 Dec '16

From: Marcus Cooper <codekipper(a)gmail.com> Newer SoCs have additional functionality so a quirks structure has been added to handle them. So far we've seen the use of a reset controller, a different address for the TXFIFO and varying register changes. This patch prepares the driver for these changes and adds the reset specifier. Signed-off-by: Marcus Cooper <codekipper(a)gmail.com> --- .../devicetree/bindings/sound/sun4i-i2s.txt | 2 + sound/soc/sunxi/sun4i-i2s.c | 47 ++++++++++++++++++++-- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt index 7a2c0945fd22..494a881ccd21 100644 --- a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt +++ b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt @@ -18,6 +18,8 @@ Required properties: - "apb" : clock for the I2S bus interface - "mod" : module clock for the I2S controller - #sound-dai-cells : Must be equal to 0 +- resets: reset specifier for the ahb reset (A31 and newer only) + Example: diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index f24d19526603..80fe4f1d6e3b 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -14,9 +14,11 @@ #include <linux/clk.h> #include <linux/dmaengine.h> #include <linux/module.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> +#include <linux/reset.h> #include <sound/dmaengine_pcm.h> #include <sound/pcm_params.h> @@ -92,6 +94,7 @@ struct sun4i_i2s { struct clk *bus_clk; struct clk *mod_clk; struct regmap *regmap; + struct reset_control *rst; unsigned int mclk_freq; @@ -104,6 +107,13 @@ struct sun4i_i2s_clk_div { u8 val; }; +struct sun4i_i2s_quirks { + unsigned int reg_dac_txdata; /* TX FIFO offset for DMA config */ + bool has_reset; + const struct regmap_config *sun4i_i2s_regmap; + const struct snd_soc_dai_ops *ops; +}; + static const struct sun4i_i2s_clk_div sun4i_i2s_bclk_div[] = { { .div = 2, .val = 0 }, { .div = 4, .val = 1 }, @@ -541,7 +551,6 @@ static struct snd_soc_dai_driver sun4i_i2s_dai = { .rates = SNDRV_PCM_RATE_8000_192000, .formats = SNDRV_PCM_FMTBIT_S16_LE, }, - .ops = &sun4i_i2s_dai_ops, .symmetric_rates = 1, }; @@ -655,6 +664,7 @@ static int sun4i_i2s_probe(struct platform_device *pdev) { struct sun4i_i2s *i2s; struct resource *res; + const struct sun4i_i2s_quirks *quirks; void __iomem *regs; int irq, ret; @@ -680,8 +690,14 @@ static int sun4i_i2s_probe(struct platform_device *pdev) return PTR_ERR(i2s->bus_clk); } + quirks = of_device_get_match_data(&pdev->dev); + if (quirks == NULL) { + dev_err(&pdev->dev, "Failed to determine the quirks to use\n"); + return -ENODEV; + } + i2s->regmap = devm_regmap_init_mmio(&pdev->dev, regs, - &sun4i_i2s_regmap_config); + quirks->sun4i_i2s_regmap); if (IS_ERR(i2s->regmap)) { dev_err(&pdev->dev, "Regmap initialisation failed\n"); return PTR_ERR(i2s->regmap); @@ -692,13 +708,25 @@ static int sun4i_i2s_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Can't get our mod clock\n"); return PTR_ERR(i2s->mod_clk); } + - i2s->playback_dma_data.addr = res->start + SUN4I_I2S_FIFO_TX_REG; + i2s->playback_dma_data.addr = res->start + quirks->reg_dac_txdata; i2s->playback_dma_data.maxburst = 4; i2s->capture_dma_data.addr = res->start + SUN4I_I2S_FIFO_RX_REG; i2s->capture_dma_data.maxburst = 4; + if (quirks->has_reset) { + i2s->rst = devm_reset_control_get_optional(&pdev->dev, NULL); + if (IS_ERR(i2s->rst) && PTR_ERR(i2s->rst) == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret); + goto err_pm_disable; + } + if (!IS_ERR(i2s->rst)) + reset_control_deassert(i2s->rst); + } + pm_runtime_enable(&pdev->dev); if (!pm_runtime_enabled(&pdev->dev)) { ret = sun4i_i2s_runtime_resume(&pdev->dev); @@ -706,6 +734,8 @@ static int sun4i_i2s_probe(struct platform_device *pdev) goto err_pm_disable; } + /* Register ops with dai */ + sun4i_i2s_dai.ops = quirks->ops; ret = devm_snd_soc_register_component(&pdev->dev, &sun4i_i2s_component, &sun4i_i2s_dai, 1); @@ -742,8 +772,17 @@ static int sun4i_i2s_remove(struct platform_device *pdev) return 0; } +static const struct sun4i_i2s_quirks sun4i_a10_i2s_quirks = { + .reg_dac_txdata = SUN4I_I2S_FIFO_TX_REG, + .sun4i_i2s_regmap = &sun4i_i2s_regmap_config, + .ops = &sun4i_i2s_dai_ops, +}; + static const struct of_device_id sun4i_i2s_match[] = { - { .compatible = "allwinner,sun4i-a10-i2s", }, + { + .compatible = "allwinner,sun4i-a10-i2s", + .data = &sun4i_a10_i2s_quirks, + }, {} }; MODULE_DEVICE_TABLE(of, sun4i_i2s_match); -- 2.11.0

3 2

[alsa-devel] [PATCH v3 0/4] Generic HDMI codec: Add channel mapping control
by Arnaud Pouliquen 20 Dec '16

20 Dec '16

Aim of this patch is to add 'Playback Channel Map' control to export audio capabilities in term of HDMI sink speakers allocation. V3: - "ASoC: hdmi-codec: add channel mapping control": => Minor fixes: - select stereo speaker config by default if HDMI cable unplugged - fix compilation warning. - "DRM: add help to get ELD speaker allocation" => No delta vs V2. - "ALSA pcm: allow non constant snd_pcm_chmap_elem" => No delta vs V2. - "ASoC: core: add optional pcm_new callback for DAI driver" => No delta vs V2. V2: In this version I use chmap helper functions from pcm_lib.c. It is quite tricky to use it from ASoC due to the relation chip of the controls with the pcm runtime. After several tries, my conclusion is that it must be handled in ASoC DAI driver. Main reason is that the DAI driver can not provide snd_pcm_chmap struct through kcontrol structure. But this induces that soc-core provides pcm runtime structure to DAI driver during probe. Base on this conclusion. I reworked my patches by adding 2 new patches in patch-set 1) ALSA pcm: allow non constant snd_pcm_chmap_elem This patch allows to handle non constant channel mapping. As ELD information can change during runtime it is mandatory to properly handle the feature. In term of compatibility with legacy it should be straightforward, as update just consists in suppressing the 'const' constraint. 2) ASoC: core: add optional pcm_new callback for DAI driver This is the only way i found to be able to use snd_pcm_add_chmap_ctls and associated controls helper functions. From my point of view, this is the more simple way to add relationship between DAI and associated pcm devices. Notice that this patch, if accepted, makes the following one obsolete, as it also answer to the associated topic: [PATCH v5 0/2] ALSA controls management using index/device/sub-devices fields (http://www.spinics.net/lists/alsa-devel/msg57639.html). If you estimate that this it not reasonable i will come back to my first version. V1: This patch follows discussion initiate here: [RFC] ASOC: HDMI audio info frame speaker allocation http://www.spinics.net/lists/alsa-devel/msg57363.html The code is fully inspired from HDA driver. On hw_param, HDMI sink speaker capabilities are exported via TLV ops and a CEA allocation is choson, based on ELD information and the number of channels requested by user. Mains differences with HDA implementation are: - Control is read only - Channel swap is not supported. Consequence is that unused channel in the mid of CEA audio infoframe channel mapping are considered as active. example for channel allocation 0x02: FL, FR, 0, FC) This configuration is only available for a 4 channels stream. - Channel allocation table has been reordered and HDMI 2.0 is not supported. Arnaud Pouliquen (4): DRM: add help to get ELD speaker allocation ALSA pcm: allow non constant snd_pcm_chmap_elem ASoC: core: add optional pcm_new callback for DAI driver ASoC: hdmi-codec: add channel mapping control include/drm/drm_edid.h | 13 ++ include/sound/pcm.h | 4 +- include/sound/soc-dai.h | 3 + sound/core/pcm_lib.c | 6 +- sound/soc/codecs/hdmi-codec.c | 313 +++++++++++++++++++++++++++++++++++++++++- sound/soc/soc-core.c | 28 ++++ 6 files changed, 361 insertions(+), 6 deletions(-) -- 1.9.1

4 8

[alsa-devel] [PATCH v2] ASoC: wm_adsp: Don't overrun firmware file buffer when reading region data
by Richard Fitzgerald 20 Dec '16

20 Dec '16

Protect against corrupt firmware files by ensuring that the length we get for the data in a region actually lies within the available firmware file data buffer. Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 593b7d1..d72ccef 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1551,7 +1551,7 @@ static int wm_adsp_load(struct wm_adsp *dsp) const struct wmfw_region *region; const struct wm_adsp_region *mem; const char *region_name; - char *file, *text; + char *file, *text = NULL; struct wm_adsp_buf *buf; unsigned int reg; int regions = 0; @@ -1700,10 +1700,21 @@ static int wm_adsp_load(struct wm_adsp *dsp) regions, le32_to_cpu(region->len), offset, region_name); + if ((pos + le32_to_cpu(region->len) + sizeof(*region)) > + firmware->size) { + adsp_err(dsp, + "%s.%d: %s region len %d bytes exceeds file length %zu\n", + file, regions, region_name, + le32_to_cpu(region->len), firmware->size); + ret = -EINVAL; + goto out_fw; + } + if (text) { memcpy(text, region->data, le32_to_cpu(region->len)); adsp_info(dsp, "%s: %s\n", file, text); kfree(text); + text = NULL; } if (reg) { @@ -1748,6 +1759,7 @@ static int wm_adsp_load(struct wm_adsp *dsp) regmap_async_complete(regmap); wm_adsp_buf_free(&buf_list); release_firmware(firmware); + kfree(text); out: kfree(file); @@ -2233,6 +2245,17 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) } if (reg) { + if ((pos + le32_to_cpu(blk->len) + sizeof(*blk)) > + firmware->size) { + adsp_err(dsp, + "%s.%d: %s region len %d bytes exceeds file length %zu\n", + file, blocks, region_name, + le32_to_cpu(blk->len), + firmware->size); + ret = -EINVAL; + goto out_fw; + } + buf = wm_adsp_buf_alloc(blk->data, le32_to_cpu(blk->len), &buf_list); -- 1.9.1

2 1

Re: [alsa-devel] [PATCH] ALSA: snd-usb: fix IRQ triggered NULL pointer dereference
by Takashi Sakamoto 20 Dec '16

20 Dec '16

--- Hi, > Commit 16200948d835 ("ALSA: usb-audio: Fix race at stopping the stream") > fixes a race-codition but it also introduces another really nasty data race > regression which makes my usb sound card [1] completely useless, throwing > the kernel into a panic if anything from userspace tries to start playback. > > The problem is this: ep->data_subs is now set to NULL every time inside > wait_clear_urbs(). ep->data_subs is initalized only in one place in > start_endpoints(), then it is immediately wiped by the pre-existing call to > wait_clear_urbs() inside snd_usb_endpoint_start(). > > To ilustrate, this is what happens in the non-irq part of the code: > > Step 1 (inside start_endpoints): ep->data_subs = subs; > Step 2 (inside start_endpoints): snd_usb_endpoint_start(ep, can_sleep); > Step 3 (inside snd_usb_endpoint_start): wait_clear_urbs(ep); > Step 4 (inside wait_clear_urbs): ep->data_subs = NULL; > > Here's a simplified call stack for the IRQ part (full one at the end): > > (NULL dereference, param "subs" is passed NULL value of ep->data_subs) > retire_playback_urb > retire_outbound_urb > snd_complete_urb > (...) > xhci_irq > > Looking at the git log there seems to be quite a lot of history in this > part of the codebase, dating back to 2012 or earlier. My fix is based on > 015618b90 ("ALSA: snd-usb: Fix URB cancellation at stream start") and > e9ba389c5 ("ALSA: usb-audio: Fix scheduling-while-atomic bug in PCM capture > stream") with a few modifications of my own. My idea is to do the > ep->data_subs wiping before endpoint initialization in a manner similar > to these older commits by using stop_endpoints() in snd_usb_pcm_prepare() > and at the same time keep the ep->data_subs = NULL in wait_clear_urbs() to > not trigger the recently fixed stream stopping race again. > > Full call stack: > > [ 131.093240] BUG: unable to handle kernel NULL pointer dereference at 0000000000000010 > [ 131.094313] IP: retire_playback_urb+0x1b/0x160 [snd_usb_audio] > [ 131.095046] PGD 0 > [ 131.095047] > [ 131.096509] Oops: 0000 [#1] PREEMPT SMP > [ 131.097255] Modules linked in: fuse snd_usb_audio snd_usbmidi_lib snd_rawmidi snd_seq_device ctr ccm arc4 ath9k intel_rapl ath9k_common x86_pkg_temp_thermal ath9k_hw intel_powerclamp coretemp joydev mousedev ath kvm_intel mac80211 kvm > input_leds hid_generic psmouse irqbypass usbhid hid crct10dif_pclmul crc32_pclmul serio_raw crc32c_intel atkbd ghash_clmulni_intel snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_intel pcbc aesni_intel libps2 cfg8 > 0211 aes_x86_64 crypto_simd dell_laptop glue_helper r8169 dell_smbios snd_hda_codec sr_mod cryptd led_class mii rfkill snd_hwdep cdrom snd_hda_core ac dcdbas i8042 xhci_pci serio xhci_hcd snd_pcm tpm_tis battery tpm_tis_core lpc_ich tpm > snd_timer evdev shpchp i2c_i801 sch_fq_codel > [ 131.105551] CPU: 2 PID: 165 Comm: irq/29-xhci_hcd Not tainted 4.9.0-gd824cdc58ba0 #10 > [ 131.107516] Hardware name: Dell Inc. Inspiron 3521/018DYG, BIOS A14 07/31/2015 > [ 131.109592] task: ffff880154a70000 task.stack: ffffc90000f48000 > [ 131.111746] RIP: 0010:retire_playback_urb+0x1b/0x160 [snd_usb_audio] > [ 131.113899] RSP: 0018:ffffc90000f4bc10 EFLAGS: 00010082 > [ 131.116080] RAX: ffffffffa04cabe0 RBX: 0000000000000000 RCX: 0000000000000000 > [ 131.118284] RDX: 0000000000000000 RSI: ffff8801435a4c00 RDI: 0000000000000000 > [ 131.120505] RBP: ffffc90000f4bc40 R08: 0000000000000001 R09: 0000000000000001 > [ 131.122807] R10: 0000000000000001 R11: ffffffff82f60d6d R12: ffff8801432a0238 > [ 131.125265] R13: ffff8801435a4c00 R14: 0000000000000000 R15: ffff8801535c83b8 > [ 131.127723] FS: 0000000000000000(0000) GS:ffff88015a000000(0000) knlGS:0000000000000000 > [ 131.130217] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ 131.132568] CR2: 0000000000000010 CR3: 0000000001e0b000 CR4: 00000000001406e0 > [ 131.135007] Call Trace: > [ 131.137329] snd_complete_urb+0x190/0x2b0 [snd_usb_audio] > [ 131.139526] __usb_hcd_giveback_urb+0x8e/0x160 > [ 131.141948] usb_hcd_giveback_urb+0x43/0x110 > [ 131.144104] xhci_giveback_urb_in_irq.isra.22+0x7d/0xb0 [xhci_hcd] > [ 131.146521] finish_td.constprop.38+0x1de/0x2f0 [xhci_hcd] > [ 131.148736] xhci_irq+0x13a2/0x1ca0 [xhci_hcd] > [ 131.150972] ? trace_hardirqs_on+0xd/0x10 > [ 131.153209] ? _raw_spin_unlock_irq+0x2c/0x50 > [ 131.155390] ? irq_thread+0xb5/0x1d0 > [ 131.157771] xhci_msi_irq+0x11/0x20 [xhci_hcd] > [ 131.159938] irq_forced_thread_fn+0x2f/0x70 > [ 131.162072] ? irq_thread+0xb5/0x1d0 > [ 131.164141] irq_thread+0x149/0x1d0 > [ 131.166132] ? irq_finalize_oneshot.part.2+0xe0/0xe0 > [ 131.168142] ? wake_threads_waitq+0x30/0x30 > [ 131.170149] kthread+0x10f/0x150 > [ 131.172144] ? irq_thread_dtor+0xc0/0xc0 > [ 131.174139] ? kthread_create_on_node+0x40/0x40 > [ 131.176116] ret_from_fork+0x2a/0x40 > [ 131.178074] Code: 8b 77 64 4c 89 e7 e8 e5 fe ff ff eb c3 0f 1f 00 0f 1f 44 00 00 55 31 d2 48 89 e5 41 57 41 56 41 55 41 54 53 48 89 fb 48 83 ec 08 <48> 8b 47 10 48 8b 4f 70 48 c7 c7 88 7b 4d a0 4c 8b a0 78 01 00 > [ 131.182382] RIP: retire_playback_urb+0x1b/0x160 [snd_usb_audio] RSP: ffffc90000f4bc10 > [ 131.184562] CR2: 0000000000000010 > > [1] 041e:3232 Creative Technology SoundBlaster X-FI HD > [2] http://mailman.alsa-project.org/pipermail/alsa-devel/2016-December/115425.h… I can regenerate this bug with my EMU 0404 USB. My understanding of this bug is quite similar to your perspective. This bug is quite critical. In my understanding, we encounter this bug in all of cases in which snd-usb-audio is applied for PCM playback substream. Below workaround can also suppress this bug. diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index a2cdf33..9b34f76 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -537,11 +537,14 @@ static int wait_clear_urbs(struct snd_usb_endpoint *ep) alive, ep->ep_num); clear_bit(EP_FLAG_STOPPING, &ep->flags); - ep->data_subs = NULL; ep->sync_slave = NULL; ep->retire_data_urb = NULL; ep->prepare_data_urb = NULL; + msleep(200); + + ep->data_subs = NULL; + return 0; } If initialization of 'struct snd_usb_endpoint.data_subs' can be done after all of queued URBs are processed and corresponding complete interrupts are cought, we can solve this critical bug. > Signed-off-by: Ioan-Adrian Ratiu <adi(a)adirat.com> > --- > sound/usb/endpoint.c | 11 ++--------- > sound/usb/endpoint.h | 2 +- > sound/usb/pcm.c | 13 ++++++------- > 3 files changed, 9 insertions(+), 17 deletions(-) > > diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c > index a2cdf3370afe..4465f324c2c2 100644 > --- a/sound/usb/endpoint.c > +++ b/sound/usb/endpoint.c > @@ -920,9 +920,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, > /** > * snd_usb_endpoint_start: start an snd_usb_endpoint > * > - * @ep: the endpoint to start > - * @can_sleep: flag indicating whether the operation is executed in > - * non-atomic context > + * @ep: the endpoint to start > * > * A call to this function will increment the use count of the endpoint. > * In case it is not already running, the URBs for this endpoint will be > @@ -932,7 +930,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, > * > * Returns an error if the URB submission failed, 0 in all other cases. > */ > -int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep) > +int snd_usb_endpoint_start(struct snd_usb_endpoint *ep) > { > int err; > unsigned int i; > @@ -944,11 +942,6 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep) > if (++ep->use_count != 1) > return 0; > > - /* just to be sure */ > - deactivate_urbs(ep, false); > - if (can_sleep) > - wait_clear_urbs(ep); > - > ep->active_mask = 0; > ep->unlink_mask = 0; > ep->phase = 0; > diff --git a/sound/usb/endpoint.h b/sound/usb/endpoint.h > index 6428392d8f62..584f295d7c77 100644 > --- a/sound/usb/endpoint.h > +++ b/sound/usb/endpoint.h > @@ -18,7 +18,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, > struct audioformat *fmt, > struct snd_usb_endpoint *sync_ep); > > -int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep); > +int snd_usb_endpoint_start(struct snd_usb_endpoint *ep); > void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep); > void snd_usb_endpoint_sync_pending_stop(struct snd_usb_endpoint *ep); > int snd_usb_endpoint_activate(struct snd_usb_endpoint *ep); > diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c > index 34c6d4f2c0b6..db26f767f851 100644 > --- a/sound/usb/pcm.c > +++ b/sound/usb/pcm.c > @@ -218,7 +218,7 @@ int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface, > } > } > > -static int start_endpoints(struct snd_usb_substream *subs, bool can_sleep) > +static int start_endpoints(struct snd_usb_substream *subs) > { > int err; > > @@ -231,7 +231,7 @@ static int start_endpoints(struct snd_usb_substream *subs, bool can_sleep) > dev_dbg(&subs->dev->dev, "Starting data EP @%p\n", ep); > > ep->data_subs = subs; > - err = snd_usb_endpoint_start(ep, can_sleep); > + err = snd_usb_endpoint_start(ep); > if (err < 0) { > clear_bit(SUBSTREAM_FLAG_DATA_EP_STARTED, &subs->flags); > return err; > @@ -260,7 +260,7 @@ static int start_endpoints(struct snd_usb_substream *subs, bool can_sleep) > dev_dbg(&subs->dev->dev, "Starting sync EP @%p\n", ep); > > ep->sync_slave = subs->data_endpoint; > - err = snd_usb_endpoint_start(ep, can_sleep); > + err = snd_usb_endpoint_start(ep); > if (err < 0) { > clear_bit(SUBSTREAM_FLAG_SYNC_EP_STARTED, &subs->flags); > return err; > @@ -809,8 +809,7 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) > goto unlock; > } > > - snd_usb_endpoint_sync_pending_stop(subs->sync_endpoint); > - snd_usb_endpoint_sync_pending_stop(subs->data_endpoint); > + stop_endpoints(subs, true); > > ret = set_format(subs, subs->cur_audiofmt); > if (ret < 0) > @@ -850,7 +849,7 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) > /* for playback, submit the URBs now; otherwise, the first hwptr_done > * updates for all URBs would happen at the same time when starting */ > if (subs->direction == SNDRV_PCM_STREAM_PLAYBACK) > - ret = start_endpoints(subs, true); > + return start_endpoints(subs); > > unlock: > snd_usb_unlock_shutdown(subs->stream->chip); > @@ -1666,7 +1665,7 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream > > switch (cmd) { > case SNDRV_PCM_TRIGGER_START: > - err = start_endpoints(subs, false); > + err = start_endpoints(subs); > if (err < 0) > return err; This patch works better, but not the best. It's a bit intrusive. What we need to synchronize process contexts to interrupt context till all of queued URBs are handled. This seems to be a main purpose of wait_clear_bits, while current implementation of snd_complete_urb()/wait_clear_bits() is not enough. Thanks for your reporting. Takashi Sakamoto -- 2.9.3

1 0

[alsa-devel] [PATCH v3 2/2] ASoC: cs43130: Add devicetree bindings for CS43130
by Li Xu 19 Dec '16

19 Dec '16

Add devicetree bindings documentation file for Cirrus Logic CS43130 codec. Signed-off-by: Li Xu <li.xu(a)cirrus.com> --- .../devicetree/bindings/sound/cs43130.txt | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/cs43130.txt diff --git a/Documentation/devicetree/bindings/sound/cs43130.txt b/Documentation/devicetree/bindings/sound/cs43130.txt new file mode 100644 index 0000000..1af6b78 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/cs43130.txt @@ -0,0 +1,41 @@ +CS43130 DAC + +Required properties: + + - compatible : "cirrus,cs43130" + + - reg : the I2C address of the device for I2C + + - VA-supply, VP-supply, VL-supply, VCP-supply, VD-supply: + power supplies for the device, as covered in + Documentation/devicetree/bindings/regulator/regulator.txt. + + +Optional properties: + + - reset-gpios : Active low GPIO used to reset the device + + - cirrus,xtal-ibias: + When external MCLK is generated by external crystal + oscillator, CS43130 can be used to provide bias current + for external crystal. Amount of bias current sent is + set as: + 1 = 7.5uA + 2 = 12.5uA + 3 = 15uA + +Example: + +cs43130: audio-codec@30 { + compatible = "cirrus,cs43130"; + reg = <0x30>; + reset-gpios = <&axi_gpio 54 1>; + VA-supply = <&dummy_vreg>; + VP-supply = <&dummy_vreg>; + VL-supply = <&dummy_vreg>; + VCP-supply = <&dummy_vreg>; + VD-supply = <&dummy_vreg>; + cirrus,xtal-ibias = <2>; + interrupt-parent = <&gpio0>; + interrupts = <55 8>; +}; -- 1.9.1

2 1

[alsa-devel] [PATCH v2 2/2] ASoC: cs35l35: Add device tree documentation for CS35L35
by Li Xu 19 Dec '16

19 Dec '16

Add device tree documentation for Cirrus Logic CS35L35 speaker amplifier Signed-off-by: Li Xu <li.xu(a)cirrus.com> --- .../devicetree/bindings/sound/cs35l35.txt | 172 +++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/cs35l35.txt diff --git a/Documentation/devicetree/bindings/sound/cs35l35.txt b/Documentation/devicetree/bindings/sound/cs35l35.txt new file mode 100644 index 0000000..8b13f67 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/cs35l35.txt @@ -0,0 +1,172 @@ +CS35L35 Speaker Amplifier + +Required properties: + + - compatible : "cirrus,cs35l35" + + - reg : the I2C address of the device for I2C + + - VA-supply, VP-supply : power supplies for the device, + as covered in + Documentation/devicetree/bindings/regulator/regulator.txt. + + - interrupt-parent : Specifies the phandle of the interrupt controller to + which the IRQs from CS35L35 are delivered to. + - interrupts : IRQ line info CS35L35. + (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt + for further information relating to interrupt properties) + +Optional properties: + - cirrus,reset-gpios : Active low GPIO used to reset the amplifier + + - cirrus,stereo-config : Boolean to determine if there are 2 AMPs for a + Stereo configuration + + - cirrus,audio-channel : Set Location of Audio Signal on Serial Port + 0 = Data Packet received on Left I2S Channel + 1 = Data Packet received on Right I2S Channel + + - cirrus,advisory-channel : Set Location of Advisory Signal on Serial Port + 0 = Data Packet received on Left I2S Channel + 1 = Data Packet received on Right I2S Channel + + - cirrus,shared-boost : Boolean to enable ClassH tracking of Advisory Signal + if 2 Devices share Boost BST_CTL + + - cirrus,sp-drv-strength : Value for setting the Serial Port drive strength + Table 3-10 of the datasheet lists drive-strength specifications + 0 = 1x (Default) + 1 = .5x + + - cirrus,bst-pdn-fet-on : Boolean to determine if the Boost PDN control + powers down with a rectification FET On or Off. If VSPK is supplied + externally then FET is off. + + - cirrus,boost-ctl-millivolt : Boost Converter control word. Step Size of 100mV + 0x00 = (Default) VP + 0x01 = 2600mV + 0x41 = 9000mV + + - cirrus,boost-ipk-milliamp : Boost-converter peak current limit. + Configures the peak current by monitoring the current through the boost FET. + Step size: 112mA + 0x00 = 1680mA + 0x19 = 4480mA + + - cirrus,amp-gain-zc : Boolean to determine if to use Amplifier gain-change + zero-cross + +Optional H/G Algorithm sub-node: + + The cs35l35 node can have a single "cirrus,classh-internal-algo" sub-node + that will disable automatic control of the internal H/G Algorithm. + + It is strongly recommended that the Datasheet be referenced when adjusting + or using these Class H Algorithm controls over the internal Algorithm. + Serious damage can occur to the Device and surrounding components. + + - cirrus,classh-internal-algo : Sub-node for the Internal Class H Algorithm + See Section 4.3 Internal Class H Algorithm in the Datasheet. + If not used, the device manages the ClassH Algorithm internally. + +Optional properties for the "cirrus,classh-internal-algo" Sub-node + + Section 7.29 Class H Control + - cirrus,classh-bst-overide : Boolean + - cirrus,classh-bst-max-limit + - cirrus,classh-mem-depth + + Section 7.30 Class H Headroom Control + - cirrus,classh-headroom + + Section 7.31 Class H Release Rate + - cirrus,classh-release-rate + + Section 7.32 Class H Weak FET Drive Control + - cirrus,classh-wk-fet-disable + - cirrus,classh-wk-fet-delay + - cirrus,classh-wk-fet-thld + + Section 7.34 Class H VP Control + - cirrus,classh-vpch-auto + - cirrus,classh-vpch-rate + - cirrus,classh-vpch-man + +Optional Monitor Signal Format sub-node: + + The cs35l35 node can have a single "cirrus,monitor-signal-format" sub-node + for adjusting the Depth, Location and Frame of the Monitoring Signals + for Algorithms. + + See Sections 4.8.2 through 4.8.4 Serial-Port Control in the Datasheet + + -cirrus,monitor-signal-format : Sub-node for the Monitor Signaling Formating + on the I2S Port. Each of the 3 8 bit values in the array contain the settings + for depth, location, and frame. + + If not used, the defaults for the 6 monitor signals is used. + + Sections 7.44 - 7.53 lists values for the depth, location, and frame + for each monitoring signal. + + - cirrus,imon : 3 8 bit values to set the depth, location, and frame + of the IMON monitor signal. + + - cirrus,vmon : 3 8 bit values to set the depth, location, and frame + of the VMON monitor signal. + + - cirrus,vpmon : 3 8 bit values to set the depth, location, and frame + of the VPMON monitor signal. + + - cirrus,vbstmon : 3 8 bit values to set the depth, location, and frame + of the VBSTMON monitor signal + + - cirrus,vpbrstat : 3 8 bit values to set the depth, location, and frame + of the VPBRSTAT monitor signal + + - cirrus,zerofill : 3 8 bit values to set the depth, location, and frame\ + of the ZEROFILL packet in the monitor signal + +Example: + +cs35l35: audio-codec@20 { + compatible = "cirrus,cs35l35"; + reg = <0x20>; + VA-supply = <&dummy_vreg>; + VP-supply = <&dummy_vreg>; + reset-gpios = <&axi_gpio 54 1>; + interrupt-parent = <&gpio8>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; + cirrus,boost-ctl = <0x41>; + + cirrus,stereo-config { + cirrus,audio-channel = <0x00>; + cirrus,advisory-channel = <0x01>; + cirrus,shared-boost; + }; + + cirrus,classh-internal-algo { + cirrus,classh-bst-overide; + cirrus,classh-bst-max-limit = <0x01>; + cirrus,classh-mem-depth = <0x01>; + cirrus,classh-release-rate = <0x08>; + cirrus,classh-headroom-millivolt = <0x0B>; + cirrus,classh-wk-fet-disable = <0x01>; + cirrus,classh-wk-fet-delay = <0x04>; + cirrus,classh-wk-fet-thld = <0x01>; + cirrus,classh-vpch-auto = <0x01>; + cirrus,classh-vpch-rate = <0x02>; + cirrus,classh-vpch-man = <0x05>; + }; + + /* Depth, Location, Frame */ + cirrus,monitor-signal-format { + cirrus,imon = /bits/ 8 <0x03 0x00 0x01>; + cirrus,vmon = /bits/ 8 <0x03 0x00 0x00>; + cirrus,vpmon = /bits/ 8 <0x03 0x04 0x00>; + cirrus,vbstmon = /bits/ 8 <0x03 0x04 0x01>; + cirrus,vpbrstat = /bits/ 8 <0x00 0x04 0x00>; + cirrus,zerofill = /bits/ 8 <0x00 0x00 0x00>; + }; + +}; -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: wm_adsp: Don't overrun firmware file buffer when reading region data
by Richard Fitzgerald 19 Dec '16

19 Dec '16

Protect against corrupt firmware files by ensuring that the length we get for the data in a region actually lies within the available firmware file data buffer. Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 593b7d1..91ccf62 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1551,7 +1551,7 @@ static int wm_adsp_load(struct wm_adsp *dsp) const struct wmfw_region *region; const struct wm_adsp_region *mem; const char *region_name; - char *file, *text; + char *file, *text = NULL; struct wm_adsp_buf *buf; unsigned int reg; int regions = 0; @@ -1700,10 +1700,21 @@ static int wm_adsp_load(struct wm_adsp *dsp) regions, le32_to_cpu(region->len), offset, region_name); + if ((pos + le32_to_cpu(region->len) + sizeof(*region)) > + firmware->size) { + adsp_err(dsp, + "%s.%d: %s region len %d bytes exceeds file length %d\n", + file, regions, region_name, + le32_to_cpu(region->len), firmware->size); + ret = -EINVAL; + goto out_fw; + } + if (text) { memcpy(text, region->data, le32_to_cpu(region->len)); adsp_info(dsp, "%s: %s\n", file, text); kfree(text); + text = NULL; } if (reg) { @@ -1748,6 +1759,7 @@ static int wm_adsp_load(struct wm_adsp *dsp) regmap_async_complete(regmap); wm_adsp_buf_free(&buf_list); release_firmware(firmware); + kfree(text); out: kfree(file); @@ -2233,6 +2245,17 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) } if (reg) { + if ((pos + le32_to_cpu(blk->len) + sizeof(*blk)) > + firmware->size) { + adsp_err(dsp, + "%s.%d: %s region len %d bytes exceeds file length %d\n", + file, blocks, region_name, + le32_to_cpu(blk->len), + firmware->size); + ret = -EINVAL; + goto out_fw; + } + buf = wm_adsp_buf_alloc(blk->data, le32_to_cpu(blk->len), &buf_list); -- 1.9.1

1 0

[alsa-devel] [PATCH v3] ASoC: Intel: bytcr_rt5640: fallback mechanism if MCLK is not enabled
by Pierre-Louis Bossart 19 Dec '16

19 Dec '16

Commit df1a2776a795 ("ASoC: Intel: bytcr_rt5640: add MCLK support") was merged but the corresponding clock framework patches have not, after being bumped from audio to clock to x86 domains. The missing clock-related patches result in a regression starting with 4.9 with the audio card not being created. Rather than reverting this commit and all following updates already queued up for 4.10, handle run-time dependency on MCLK and fall back to the previous bit-clock mode. This provides the same functionality as in 4.8 for Baytrail devices. On Baytrail-CR most devices remain silent with this fallback but additional patches are needed anyway. As suggested by Mark Brown, the fallback is only allowed with -ENOENT, all other run-time errors, including -EPROBE_DEFER, will stop the probe with no sound card registered. This patch should be applied to -stable as well as ASoC 4.10 fixes Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- Notes: v3: fixed printf format warning reported by 0-day sound/soc/intel/boards/bytcr_rt5640.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 507a86a..e33e477 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -825,10 +825,20 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) if ((byt_rt5640_quirk & BYT_RT5640_MCLK_EN) && (is_valleyview())) { priv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3"); if (IS_ERR(priv->mclk)) { + ret_val = PTR_ERR(priv->mclk); + dev_err(&pdev->dev, - "Failed to get MCLK from pmc_plt_clk_3: %ld\n", - PTR_ERR(priv->mclk)); - return PTR_ERR(priv->mclk); + "Failed to get MCLK from pmc_plt_clk_3: %d\n", + ret_val); + + /* + * Fall back to bit clock usage for -ENOENT (clock not + * available likely due to missing dependencies), bail + * for all other errors, including -EPROBE_DEFER + */ + if (ret_val != -ENOENT) + return ret_val; + byt_rt5640_quirk &= ~BYT_RT5640_MCLK_EN; } } -- 2.7.4

2 1

Re: [alsa-devel] [PATCH 4/4] hda: thinkpad_helper: Add support for hid-lenovo LED control
by Dennis Wassenberg 19 Dec '16

19 Dec '16

Hi Jiri, On 19.12.2016 11:53, Jiri Kosina wrote: > On Mon, 19 Dec 2016, Dennis Wassenberg wrote: > >> "led_set_func_hid_lenovo" is set to "hid_lenovo_led_set" >> >> +#if IS_ENABLED(CONFIG_HID_LENOVO) >> +static int hda_fixup_thinkpad_hid_prepare(struct hda_codec *codec) >> +{ >> + struct hda_gen_spec *spec = codec->spec; >> + int ret = 0; >> + >> + if (!is_thinkpad(codec)) >> + return -ENODEV; >> + if (!led_set_func_hid_lenovo) >> + led_set_func_hid_lenovo = symbol_request(hid_lenovo_led_set); >> >> "hid_lenovo_led_set" is introduced in "[PATCH v2 2/2] hda: >> thinkpad_helper: Add support for hid-lenovo LED control". This means >> that "[PATCH 4/4] hda: thinkpad_helper: Add support for hid-lenovo LED >> control" can only work with applied "[PATCH 1/4] hid-lenovo: Add support >> for X1 Tablet cover special keys" and "[PATCH v2 2/2] hda: >> thinkpad_helper: Add support for hid-lenovo LED control". > > Ah, okay, I wasn't aware of the other patchset. These two probably should > be merged together. Is the other 2-patch set merged in any tree already? > Where has it been submitted to? > No 1/4, 2/4 and 3/4 are currently not merged to any tree. I reworked 1/4, 2/4 and 3/4 because of some comments from Benjamin Tissoires (mail from 14th September 2016). The patches are submitted to all recipients at the To, CC-Line (e.g. linux-input mailing list). Maybe I can merge 2/4 and 4/4 together. This is all for LED control. 1/4 is for key/input handling and 3/4 is a special FNLock handling where I should use a separate patch. Currently I have no feedback regarding the reworked linux-input specific code. I hope I will get it soon :) Best regards, Dennis

1 0

Re: [alsa-devel] [PATCH 4/4] hda: thinkpad_helper: Add support for hid-lenovo LED control
by Dennis Wassenberg 19 Dec '16

19 Dec '16

Hi Jiri, "led_set_func_hid_lenovo" is set to "hid_lenovo_led_set" +#if IS_ENABLED(CONFIG_HID_LENOVO) +static int hda_fixup_thinkpad_hid_prepare(struct hda_codec *codec) +{ + struct hda_gen_spec *spec = codec->spec; + int ret = 0; + + if (!is_thinkpad(codec)) + return -ENODEV; + if (!led_set_func_hid_lenovo) + led_set_func_hid_lenovo = symbol_request(hid_lenovo_led_set); "hid_lenovo_led_set" is introduced in "[PATCH v2 2/2] hda: thinkpad_helper: Add support for hid-lenovo LED control". This means that "[PATCH 4/4] hda: thinkpad_helper: Add support for hid-lenovo LED control" can only work with applied "[PATCH 1/4] hid-lenovo: Add support for X1 Tablet cover special keys" and "[PATCH v2 2/2] hda: thinkpad_helper: Add support for hid-lenovo LED control". Best regards, Dennis On 19.12.2016 11:09, Jiri Kosina wrote: > On Fri, 9 Dec 2016, Dennis Wassenberg wrote: > >> +#if IS_ENABLED(CONFIG_THINKPAD_ACPI) >> + if (led_set_func_tpacpi) >> + led_set_func_tpacpi(TPACPI_LED_MUTE, !enabled); >> +#endif >> +#if IS_ENABLED(CONFIG_HID_LENOVO) >> + if (led_set_func_hid_lenovo) >> + led_set_func_hid_lenovo(HID_LENOVO_LED_MUTE, !enabled); > > Where does led_set_func_hid_lenovo() come from? I don't see it in Linus' > tree as of today. Is that something else than tpacpi_led_set()? > > Thanks, >

1 0