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

[alsa-devel] [PATCH] ASoC : fsl_ssi : Correct the condition to check AC97 mode
by Harisangam, Sharvari (S.) 04 Jan '17

04 Jan '17

Corrected the condition to check if ssi is configured for AC97 mode. Other modes like dsp_a also satisfy the ANDing condition. Signed-off-by: Sharvari Harisangam <sharvari.harisangam(a)visteon.com> --- sound/soc/fsl/fsl_ssi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index ca6f6b1..4fbb7a2 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -317,7 +317,8 @@ MODULE_DEVICE_TABLE(of, fsl_ssi_ids); static bool fsl_ssi_is_ac97(struct fsl_ssi_private *ssi_private) { - return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97); + return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97) == + SND_SOC_DAIFMT_AC97; } static bool fsl_ssi_is_i2s_master(struct fsl_ssi_private *ssi_private) @@ -1016,7 +1017,7 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev, CCSR_SSI_SCR_TCH_EN); } - if (fmt & SND_SOC_DAIFMT_AC97) + if ((fmt & SND_SOC_DAIFMT_AC97) == SND_SOC_DAIFMT_AC97) fsl_ssi_setup_ac97(ssi_private); return 0; -- 2.7.4

5 5

[alsa-devel] [PATCH - alsa-lib 1/1] Change card/pid get functions to return -ENOSYS if the kernel is too old
by Adam Goode 03 Jan '17

03 Jan '17

When trying to get the pid or card of a client, the get functions will return -1 if there is no pid or card for a client. Clients have zero or one of these, so -1 is correct for these cases. But we also need to detect the case where the kernel cannot tell us if there is a card or pid, so that userspace can fallback to probing this information in the old way. Signed-off-by: Adam Goode <agoode(a)google.com> diff --git a/src/seq/seq.c b/src/seq/seq.c index 4405e68..7de1e81 100644 --- a/src/seq/seq.c +++ b/src/seq/seq.c @@ -1522,9 +1522,10 @@ int snd_seq_client_info_get_error_bounce(const snd_seq_client_info_t *info) } /** - * \brief Get the sound card number. + * \brief Get the sound card number if the kernel supports this. * \param info client_info container - * \return card number or -1 if value is not available. + * \return card number, -1 if there is no card for this client, + * or \c -ENOSYS if the kernel does not have support for this operation * * Only available for SND_SEQ_KERNEL_CLIENT clients. */ @@ -1535,9 +1536,10 @@ int snd_seq_client_info_get_card(const snd_seq_client_info_t *info) } /** - * \brief Get the owning PID. + * \brief Get the owning PID if the kernel supports this. * \param info client_info container - * \return pid or -1 if value is not available. + * \return pid, -1 if there is no PID for this client, + * or \c -ENOSYS if the kernel does not have support for this operation * * Only available for SND_SEQ_USER_CLIENT clients. */ diff --git a/src/seq/seq_hw.c b/src/seq/seq_hw.c index 578ef12..a1d1e4a 100644 --- a/src/seq/seq_hw.c +++ b/src/seq/seq_hw.c @@ -102,8 +102,8 @@ static int snd_seq_hw_get_client_info(snd_seq_t *seq, snd_seq_client_info_t * in return -errno; } if (hw->version < SNDRV_PROTOCOL_VERSION(1, 0, 2)) { - info->card = -1; - info->pid = -1; + info->card = -ENOSYS; + info->pid = -ENOSYS; } return 0; } @@ -374,8 +374,8 @@ static int snd_seq_hw_query_next_client(snd_seq_t *seq, snd_seq_client_info_t *i return -errno; } if (hw->version < SNDRV_PROTOCOL_VERSION(1, 0, 2)) { - info->card = -1; - info->pid = -1; + info->card = -ENOSYS; + info->pid = -ENOSYS; } return 0; } -- 2.8.0.rc3.226.g39d4020

5 16

[alsa-devel] [PATCH v4] ASoC: omap-mcbsp: Add PM QoS support for McBSP to prevent glitches
by Matt Ranostay 03 Jan '17

03 Jan '17

We can get audio errors if hitting deeper idle states on omaps: [alsa.c:230] error: Fatal problem with alsa output, error -5. [audio.c:614] error: Error in writing audio (Input/output error?)! This seems to happen with off mode idle enabled as power for the whole SoC may get cut off between filling the McBSP fifo using DMA. While active DMA blocks deeper idle states in hardware, McBSP activity does not seem to do so. Basing the QoS latency calculation on the FIFO size, threshold, sample rate, and channels. Based on the original patch by Tony Lindgren Link: https://patchwork.kernel.org/patch/9305867/ Cc: Tony Lindgren <tony(a)atomide.com> Cc: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Signed-off-by: Matt Ranostay <matt(a)ranostay.consulting> --- Changes from v1: * add calculations for latency per number of FIFO locations Changes from v2: * add missing mcbsp.h header change Changes from v3: * base the latency calculations on threshold, buffer size, sample rate, and channels sound/soc/omap/mcbsp.c | 19 +++++++++++++++++++ sound/soc/omap/mcbsp.h | 3 +++ sound/soc/omap/omap-mcbsp.c | 21 ++++++++++++++++++++- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c index 06fec5699cc8..8f792e714894 100644 --- a/sound/soc/omap/mcbsp.c +++ b/sound/soc/omap/mcbsp.c @@ -25,6 +25,7 @@ #include <linux/io.h> #include <linux/slab.h> #include <linux/pm_runtime.h> +#include <linux/pm_qos.h> #include <linux/platform_data/asoc-ti-mcbsp.h> @@ -640,9 +641,19 @@ void omap_mcbsp_free(struct omap_mcbsp *mcbsp) */ void omap_mcbsp_start(struct omap_mcbsp *mcbsp, int tx, int rx) { + struct pm_qos_request *pm_qos_req = &mcbsp->pm_qos_req; int enable_srg = 0; u16 w; + /* Prevent omap hardware from hitting off between fifo fills */ + if (mcbsp->latency) { + if (pm_qos_request_active(pm_qos_req)) + pm_qos_update_request(pm_qos_req, mcbsp->latency); + else + pm_qos_add_request(pm_qos_req, PM_QOS_CPU_DMA_LATENCY, + mcbsp->latency); + } + if (mcbsp->st_data) omap_st_start(mcbsp); @@ -731,6 +742,11 @@ void omap_mcbsp_stop(struct omap_mcbsp *mcbsp, int tx, int rx) if (mcbsp->st_data) omap_st_stop(mcbsp); + + if (mcbsp->active == 1 && pm_qos_request_active(&mcbsp->pm_qos_req)) { + pm_qos_remove_request(&mcbsp->pm_qos_req); + mcbsp->latency = 0; + } } int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id) @@ -1098,6 +1114,9 @@ int omap_mcbsp_init(struct platform_device *pdev) void omap_mcbsp_cleanup(struct omap_mcbsp *mcbsp) { + if (pm_qos_request_active(&mcbsp->pm_qos_req)) + pm_qos_remove_request(&mcbsp->pm_qos_req); + if (mcbsp->pdata->buffer_size) sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h index 61e93b1c185d..d312e72f7979 100644 --- a/sound/soc/omap/mcbsp.h +++ b/sound/soc/omap/mcbsp.h @@ -323,8 +323,11 @@ struct omap_mcbsp { unsigned int fmt; unsigned int in_freq; + unsigned int latency; int clk_div; int wlen; + + struct pm_qos_request pm_qos_req; }; void omap_mcbsp_config(struct omap_mcbsp *mcbsp, diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index d018e966e533..ddaec37fb4c3 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -226,6 +226,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, int wlen, channels, wpf; int pkt_size = 0; unsigned int format, div, framesize, master; + unsigned int buffer_size = mcbsp->pdata->buffer_size; dma_data = snd_soc_dai_get_dma_data(cpu_dai, substream); channels = params_channels(params); @@ -240,7 +241,9 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, default: return -EINVAL; } - if (mcbsp->pdata->buffer_size) { + if (buffer_size) { + int latency; + if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) { int period_words, max_thrsh; int divider = 0; @@ -271,6 +274,22 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, /* Use packet mode for non mono streams */ pkt_size = channels; } + + latency = ((((buffer_size - pkt_size) / channels) * 1000) + / (params->rate_num / params->rate_den)); + + /* + * Use the lowest QoS latency value for active streams, but + * this has the disadvantage of using lower than needed latency + * if an stream with lower QoS ends before one with a higher + * one. Latency setting only gets reset when all streams + * complete. + */ + if (latency <= mcbsp->latency) + mcbsp->latency = latency; + else + mcbsp->latency = 0; + omap_mcbsp_set_threshold(substream, pkt_size); } -- 2.7.4

2 2

[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