January 2017 - Alsa-devel - mailman.alsa-project.org

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

09 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> Signed-off-by: Mounesh Sutar <mounesh_sutar(a)mentor.com> diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 0770abc..2bb2d4a 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -550,6 +550,101 @@ int snd_pcm_direct_timer_stop(snd_pcm_direct_t *dmix) return 0; } +/* + * 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; + int semerr; + + semerr = snd_pcm_direct_semaphore_down(direct, + DIRECT_IPC_SEM_CLIENT); + if (semerr < 0) { + SNDERR("SEMDOWN FAILED with err %d", semerr); + return semerr; + } + + if (snd_pcm_state(direct->spcm) != SND_PCM_STATE_XRUN) { + /* ignore... someone else already did recovery */ + semerr = snd_pcm_direct_semaphore_up(direct, + DIRECT_IPC_SEM_CLIENT); + if (semerr < 0) { + SNDERR("SEMUP FAILED with err %d", semerr); + return semerr; + } + return 0; + } + + ret = snd_pcm_prepare(direct->spcm); + if (ret < 0) { + SNDERR("recover: unable to prepare slave"); + semerr = snd_pcm_direct_semaphore_up(direct, + DIRECT_IPC_SEM_CLIENT); + if (semerr < 0) { + SNDERR("SEMUP FAILED with err %d", semerr); + return semerr; + } + 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"); + semerr = snd_pcm_direct_semaphore_up(direct, + DIRECT_IPC_SEM_CLIENT); + if (semerr < 0) { + SNDERR("SEMUP FAILED with err %d", semerr); + return semerr; + } + return ret; + } + direct->shmptr->recoveries++; + semerr = snd_pcm_direct_semaphore_up(direct, + DIRECT_IPC_SEM_CLIENT); + if (semerr < 0) { + SNDERR("SEMUP FAILED with err %d", semerr); + return semerr; + } + 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; +} + int snd_pcm_direct_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents) { snd_pcm_direct_t *dmix = pcm->private_data; @@ -572,6 +667,12 @@ 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); + /* fallthrough */ case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_SETUP: events |= POLLERR; @@ -1382,6 +1483,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 a7c0439..5f51021 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 */ @@ -328,7 +330,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..258d4de 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -434,15 +434,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 +834,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 +851,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 +870,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..570f180 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -162,7 +162,7 @@ static int snd_pcm_dshare_sync_ptr0(snd_pcm_t *pcm, snd_pcm_uframes_t slave_hw_p snd_pcm_direct_t *dshare = pcm->private_data; snd_pcm_uframes_t old_slave_hw_ptr, avail; snd_pcm_sframes_t diff; - + old_slave_hw_ptr = dshare->slave_hw_ptr; dshare->slave_hw_ptr = slave_hw_ptr; diff = slave_hw_ptr - old_slave_hw_ptr; @@ -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..6b721ec 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) -- 2.7.4

3 2

[alsa-devel] [PATCH] pcm: returning semop error code for semaphore up/down failures.
by sutar.mounesh＠gmail.com 09 Jan '17

09 Jan '17

From: Mounesh Sutar <sutar.mounesh(a)gmail.com> Signed-off-by: Mounesh Sutar <sutar.mounesh(a)gmail.com> diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h index 91e816c..a7c0439 100644 --- a/src/pcm/pcm_direct.h +++ b/src/pcm/pcm_direct.h @@ -263,7 +263,12 @@ static inline int snd_pcm_direct_semaphore_down(snd_pcm_direct_t *dmix, int sem_ { struct sembuf op[2] = { { sem_num, 0, 0 }, { sem_num, 1, SEM_UNDO } }; int err = semop(dmix->semid, op, 2); - if (err == 0) dmix->locked[sem_num]++; + if (err == 0) { + dmix->locked[sem_num]++; + } + else if (err == -1) { + err = -errno; + } return err; } @@ -271,7 +276,12 @@ static inline int snd_pcm_direct_semaphore_up(snd_pcm_direct_t *dmix, int sem_nu { struct sembuf op = { sem_num, -1, SEM_UNDO | IPC_NOWAIT }; int err = semop(dmix->semid, &op, 1); - if (err == 0) dmix->locked[sem_num]--; + if (err == 0) { + dmix->locked[sem_num]--; + } + else if (err == -1) { + err = -errno; + } return err; } -- 2.7.4

2 1

[alsa-devel] [PATCH] Revert "ASoC: core: replace aux_comp_list to component_dev_list"
by Nikita Yushchenko 09 Jan '17

09 Jan '17

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(), which is called for aux devices by soc_probe_aux_devices(). 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> --- Fixed lost line in commit message ;) 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

4 8

[alsa-devel] [PATCH v2 0/2] ASoC: Use DMI name in sound card long name
by mengdong.lin＠linux.intel.com 09 Jan '17

09 Jan '17

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 DMI name to make the card 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 machine-specific 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. v2: Exclude card name and only keep DMI name in the long name, to save the space since the long name cannot exceed 80 characters. Trim special characters like SPACE in the long name, because UCM configuration files & directories may use the same long name and Autoconf cannot handle special characters. 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 | 99 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+) -- 2.5.0

5 10

[alsa-devel] How to build alsa-utils from git?
by Paul Menzel 09 Jan '17

09 Jan '17

Dear ALSA folks, Could you please help me building alsa-utils from git. ``` $ git describe --tag origin/master v1.1.3-2-ge9a6d42 $ aclocal --version aclocal (GNU automake) 1.15 Copyright (C) 2014 Free Software Foundation, Inc. License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl-2.0.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Written by Tom Tromey <tromey(a)redhat.com> and Alexandre Duret-Lutz <adl(a)gnu.org>. $ aclocal $ gettextize Copying file ABOUT-NLS Copying file config.rpath Not copying intl/ directory. Copying file po/Makefile.in.in Copying file po/boldquot.sed Copying file po/en(a)boldquot.header Copying file po/en(a)quot.header Copying file po/insert-header.sin Copying file po/Makevars.template Copying file po/quot.sed Copying file po/remove-potcdate.sin Copying file po/Rules-quot Creating po/ChangeLog Copying file m4/gettext.m4 Copying file m4/iconv.m4 Copying file m4/lib-ld.m4 Copying file m4/lib-link.m4 Copying file m4/lib-prefix.m4 Copying file m4/nls.m4 Copying file m4/po.m4 Copying file m4/progtest.m4 Updating EXTRA_DIST in m4/Makefile.am (backup is in m4/Makefile.am~) Updating Makefile.am (backup is in Makefile.am~) Updating configure.ac (backup is in configure.ac~) Adding an entry to ChangeLog (backup is in ChangeLog~) Please run 'aclocal -I m4' to regenerate the aclocal.m4 file. You need aclocal from GNU automake 1.9 (or newer) to do this. Then run 'autoconf' to regenerate the configure file. You will also need config.guess and config.sub, which you can get from the CVS of the 'config' project at http://savannah.gnu.org/. The commands to fetch them are $ wget 'http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.gue…' $ wget 'http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub' You might also want to copy the convenience header file gettext.h from the /usr/share/gettext directory into your package. It is a wrapper around <libintl.h> that implements the configure --disable-nls option. Press Return to acknowledge the previous three paragraphs. $ gettextize --version /usr/bin/gettextize (GNU gettext-tools) 0.19.8.1 Copyright (C) 1995-1998, 2000-2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Written by Ulrich Drepper $ autoheader configure.ac:418: error: `po/Makefile.in' is already registered with AC_CONFIG_FILES. ../../lib/autoconf/status.m4:288: AC_CONFIG_FILES is expanded from... configure.ac:418: the top level autom4te: /usr/bin/m4 failed with exit status: 1 autoheader: '/usr/bin/autom4te' failed with exit status: 1 ``` Could you please share the correct commands? Thanks, Paul

3 2

[alsa-devel] [PATCH] ASoC: wm8731: Adjust clk definitions so that simple card can work
by Jörg Krause 08 Jan '17

08 Jan '17

When trying to use simple card with wm8962 the following probe error happens: wm8731 0-001a: simple-card: set_sysclk error In simple-card.c the snd_soc_dai_set_sysclk() function is called with clk_id as 0, which is an invalid clock for wm8731. Adjust the clocks source definitions in wm8731.h so that the simple card driver can work successfully Signed-off-by: Jörg Krause <joerg.krause(a)embedded.rocks> --- sound/soc/codecs/wm8731.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8731.h b/sound/soc/codecs/wm8731.h index e9c0c76ab73b..c7c6f15b0e42 100644 --- a/sound/soc/codecs/wm8731.h +++ b/sound/soc/codecs/wm8731.h @@ -31,8 +31,8 @@ #define WM8731_CACHEREGNUM 10 +#define WM8731_SYSCLK_MCLK 0 #define WM8731_SYSCLK_XTAL 1 -#define WM8731_SYSCLK_MCLK 2 #define WM8731_DAI 0 -- 2.11.0

1 0

[alsa-devel] gitcompile fail
by Mark Brand 08 Jan '17

08 Jan '17

Hi I am unable to compile ALSA from fresh git clones. Please would you advise me? My procedure: mkdir $HOME/Projects/tiwai cd $HOME/Projects/tiwai git clone git://github.com/tiwai/alsa-driver-build.git git clone git://github.com/tiwai/sound.git cd alsa-driver-build git checkout build cd alsa ./utils/setup-alsa-kernel -c ../../sound ./gitcompile --with-debug=full --enable-dynamic-minors --with-moddir=updates Problems start with setup-alsa-kernel: mark@erudite:~/Projects/tiwai/alsa-driver-build/alsa$ ./utils/setup-alsa-kernel -c ../../sound cp: cannot stat '../../sound/Documentation/sound/alsa': No such file or directory cp: cannot stat '../../sound/Documentation/DocBook/alsa-driver-api.tmpl': No such file or directory cp: cannot stat '../../sound/Documentation/DocBook/writing-an-alsa-driver.tmpl': No such file or directory cp: cannot create hard link 'alsa-kernel/Documentation/DocBook' to '../../sound/Documentation/DocBook/stylesheet.xsl': No such file or directory So I try to gitcompile anyway: mark@erudite:~/Projects/tiwai/alsa-driver-build/alsa$ ./gitcompile --with-debug=full --enable-dynamic-minors --with-moddir=updates gcc utils/mod-deps.c -o utils/mod-deps utils/mod-deps.c: In function ‘output_card_list’: utils/mod-deps.c:1086:4: warning: format not a string literal and no format arguments [-Wformat-security] printf(card_name); ^ utils/mod-deps --basedir /home/mark/Projects/tiwai/alsa-driver-build/alsa/alsa-kernel --hiddendir /home/mark/Projects/tiwai/alsa-driver-build/alsa --versiondep /home/mark/Projects/tiwai/alsa-driver-build/alsa/kconfig-vers --makeconf > toplevel.config.in can't handle 'default SND_SEQUENCER && SND_RAWMIDI', translating as depends on can't handle 'default SND_SEQUENCER && SND_OPL3_LIB', translating as depends on can't handle 'default SND_SEQUENCER && SND_OPL4_LIB', translating as depends on can't handle 'default SND_SEQUENCER && SND_SBAWE', translating as depends on can't handle 'default SND_SEQUENCER && SND_EMU10K1', translating as depends on can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND_ES1968 properly, supposing it's OK can't handle word VIDEO_V4L2=y properly, supposing it's OK can't handle word VIDEO_V4L2=SND_ES1968 properly, supposing it's OK can't handle word VIDEO_V4L2=y properly, supposing it's OK can't handle word VIDEO_V4L2=SND_FM801 properly, supposing it's OK can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND_MAESTRO3 properly, supposing it's OK can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND_HDA properly, supposing it's OK can't handle word SND_HDA_INPUT_BEEP=y properly, supposing it's OK can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND_USB_CAIAQ properly, supposing it's OK Wrong condition = Makefile:152: recipe for target 'toplevel.config.in' failed make: *** [toplevel.config.in] Error 1 mark@erudite:~/Projects/tiwai/alsa-driver-build/alsa$ I have successfully compiled ALSA at various times in the past (years ago), and have intermittently worked on developing a driver for an old device. I'd very much like to finish that off and submit it now, but I'm struggling to get out of the starting blocks! You kind assistance is greatly appreciated. Regards Mark Brand

3 6

[alsa-devel] Alsamixer: missing Speakers entry in analog output choice (chipset AV200)
by Germano Massullo 08 Jan '17

08 Jan '17

I have a Asus Xonar Essence ST soundboard (Chip: AV200) on Fedora 23 kernel 4.4.5-300.fc23.x86_64 The audiocard has 3 different outputs - Speakers - Headphones - FP Headphones that have mutual exclusion, so that when you are using one of them, you cannot use the others. Sometimes the Speakers output disappears from alsamixer. By restarting the computer, the system gets back to its normal behaviour. I attach 3 logs taken when the problem was occurring. The problem happened also in past years, but in last a 1-2 years it happened less frequently

3 3

[alsa-devel] [PATCH v2] ASoC: pcm5102a: Provide a menu selection text
by Jörg Krause 07 Jan '17

07 Jan '17

Provide a menu selection text so that users can enable, disable or mark it as module in menuconfig. This is necessary for using the codec with the simple-card framework. Signed-off-by: Jörg Krause <joerg.krause(a)embedded.rocks> --- Changes v2: - improve commit log (suggested by Takashi Iwai) --- sound/soc/codecs/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 9e1718a8cb1c..534c8c2b5da1 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -642,7 +642,7 @@ config SND_SOC_PCM3168A_SPI select REGMAP_SPI config SND_SOC_PCM5102A - tristate + tristate "Texas Instruments PCM5102A CODEC" config SND_SOC_PCM512x tristate -- 2.11.0

1 0

[alsa-devel] ASoC: Using mxs-saif with simple-card
by Jörg Krause 07 Jan '17

07 Jan '17

Hi, I am trying to use the simple-card framework on a custom i.MX28 board. There are two SAIF modules (saif0 and saif1) instantiated on the cpu. A reference for the platform driver is mxs-sgtl5000. The two cpu dais saif0 and saif1 are connected to the audio codec sgtl5000. saif0 is used to playback and saif1 is used to capture. Unfortunately, I do not have a sgtl5000 codec, but a pcm5102a, a wm8524 and wm8731 to play with. For all those codec I copied the mxs-sgtl5000 driver, e.g. mxs- pcm5102a, mxs-wm8524, mxs-wm8731. I will refer to these drivers as mxs- <codec> later. The only difference was in setting the mclk. That's why I'm interested in using the simple-card driver for this platform. With the help of Mans Rullgard I came up with these parts of the device tree node when using the wm8731 codec: sound { compatible = "simple-audio-card"; simple-audio-card,name = "hbm10-wm8731"; simple-audio-card,widgets = "Headphone", "Headphone Jack", "Microphone", "Microphone Jack", "Line", "Line Jack"; simple-audio-card,routing = "Headphone Jack", "RHPOUT", "Headphone Jack", "LHPOUT", "LLINEIN", "Line Jack", "MICIN", "Mic Bias", "Mic Bias", "Microphone Jack"; simple-audio-card,dai-link@0 { format = "i2s"; bitclock-master = <&dai0_master>; frame-master = <&dai0_master>; mclk-fs = <256>; dai0_master: cpu { sound-dai = <&saif0>; }; codec { sound-dai = <&wm8731>; clocks = <&saif0>; }; }; simple-audio-card,dai-link@1 { format = "i2s"; bitclock-master = <&dai1_master>; frame-master = <&dai1_master>; mclk-fs = <256>; dai1_master: cpu { sound-dai = <&saif1>; }; codec { sound-dai = <&wm8731>; }; }; }; &saif0 { #sound-dai-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&saif0_pins_a>; assigned-clocks = <&clks 53>; assigned-clock-rates = <12288000>; status = "okay"; }; &saif1 { #sound-dai-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&saif1_pins_a>; fsl,saif-master = <&saif0>; status = "okay"; }; &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins_a>; status = "okay"; wm8731: wm8731@1a { #sound-dai-cells = <0>; compatible = "wlf,wm8731"; reg = <0x1a>; }; }; >From my understanding of the simple-card framework this should connect saif0 (cpu dai) <-> wm8731 (codec) and saif1 (cpu dai) <-> wm8731 (codec) as it is done in the probe function of the mxs-<codec> driver, right? However, this gives me a warning while bringing up the board: sysfs: cannot create duplicate filename '/devices/soc0/sound/mxs-saif- wm8731-hifi'. Note, that the simple-card framework works fine for mxs-saif if using only the dai0 link (playback) and leaving the dai1 link (capture). Am I doing something wrong here? Is it possible to map the two dai links using the current simple-card framework? Is anyone using the simple-card framework on mxs-saif using both playback and capture? Best regards, Jörg Krause

1 0