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

Re: [alsa-devel] [PATCH] ASoC: arizona: Add delay for output disable
by Mark Brown 19 Jan '15

19 Jan '15

On Mon, Jan 19, 2015 at 03:49:46PM +0000, Charles Keepax wrote: > + case SND_SOC_DAPM_POST_PMD: > + switch (w->shift) { > + case ARIZONA_OUT1L_ENA_SHIFT: > + case ARIZONA_OUT1R_ENA_SHIFT: > + case ARIZONA_OUT2L_ENA_SHIFT: > + case ARIZONA_OUT2R_ENA_SHIFT: > + case ARIZONA_OUT3L_ENA_SHIFT: > + case ARIZONA_OUT3R_ENA_SHIFT: > + udelay(750); > + break; That's a really quite long udelay() especially given that as the code is written it's going to be cumalative over all the outputs being torn down so typically will be 1.5ms for headphones (not sure if that's the intention or not). msleep() would be more friendly than udelay() and it'd also be good to arrange to coalesce the delays. Perhaps set a flag in _PRE_PMD and check if a delay is needed in the clock teardown? Or better yet record a timestamp and then figure out if a delay is needed when tearing down the clock though that is probably overengineering.

2 3

[alsa-devel] [PATCH v2 1/1] alsa-lib: Add snd_pcm_start_at.
by Tim Cussins 19 Jan '15

19 Jan '15

Add notion of TSTAMP_CLASS (SYSTEM/AUDIO) as per Pierre's suggestion. Add snd_pcm_start_at() Signed-off-by: Tim Cussins <timcussins(a)eml.cc> diff --git a/include/pcm.h b/include/pcm.h index 0655e7f..c57edca 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -323,13 +323,25 @@ typedef enum _snd_pcm_tstamp { SND_PCM_TSTAMP_LAST = SND_PCM_TSTAMP_ENABLE } snd_pcm_tstamp_t; +typedef enum _snd_pcm_tstamp_class { + SND_PCM_TSTAMP_CLASS_SYSTEM = 0, + SND_PCM_TSTAMP_CLASS_AUDIO, + SND_PCM_TSTAMP_CLASS_LAST = SND_PCM_TSTAMP_CLASS_AUDIO, +} snd_pcm_tstamp_class_t; + typedef enum _snd_pcm_tstamp_type { SND_PCM_TSTAMP_TYPE_GETTIMEOFDAY = 0, /** gettimeofday equivalent */ - SND_PCM_TSTAMP_TYPE_MONOTONIC, /** posix_clock_monotonic equivalent */ + SND_PCM_TSTAMP_TYPE_MONOTONIC, /** posix_clock_monotonic equivalent */ SND_PCM_TSTAMP_TYPE_MONOTONIC_RAW, /** monotonic_raw (no NTP) */ SND_PCM_TSTAMP_TYPE_LAST = SND_PCM_TSTAMP_TYPE_MONOTONIC_RAW, } snd_pcm_tstamp_type_t; +typedef enum _snd_pcm_audio_tstamp_type { + SND_PCM_AUDIO_TSTAMP_TYPE_DEFAULT = 0, + SND_PCM_AUDIO_TSTAMP_TYPE_LINK, + SND_PCM_AUDIO_TSTAMP_TYPE_LAST = SND_PCM_AUDIO_TSTAMP_TYPE_LINK, +} snd_pcm_audio_tstamp_t; + /** Unsigned frames quantity */ typedef unsigned long snd_pcm_uframes_t; /** Signed frames quantity */ @@ -478,6 +490,7 @@ int snd_pcm_prepare(snd_pcm_t *pcm); int snd_pcm_reset(snd_pcm_t *pcm); int snd_pcm_status(snd_pcm_t *pcm, snd_pcm_status_t *status); int snd_pcm_start(snd_pcm_t *pcm); +int snd_pcm_start_at(snd_pcm_t *pcm, snd_pcm_tstamp_class_t tstamp_class, int tstamp_type, const snd_htimestamp_t* start_time); int snd_pcm_drop(snd_pcm_t *pcm); int snd_pcm_drain(snd_pcm_t *pcm); int snd_pcm_pause(snd_pcm_t *pcm, int enable); diff --git a/include/sound/asound.h b/include/sound/asound.h index 1f23cd6..1592160 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h @@ -466,12 +466,30 @@ struct snd_xfern { }; enum { + SNDRV_PCM_TSTAMP_CLASS_SYSTEM = 0, + SNDRV_PCM_TSTAMP_CLASS_AUDIO, + SNDRV_PCM_TSTAMP_CLASS_LAST = SNDRV_PCM_TSTAMP_CLASS_AUDIO, +}; + +enum { SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY = 0, /* gettimeofday equivalent */ SNDRV_PCM_TSTAMP_TYPE_MONOTONIC, /* posix_clock_monotonic equivalent */ - SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW, /* monotonic_raw (no NTP) */ + SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW, /* monotonic_raw (no NTP) */ SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW, }; +enum { + SNDRV_PCM_AUDIO_TSTAMP_TYPE_DEFAULT = 0, + SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK, + SNDRV_PCM_AUDIO_TSTAMP_TYPE_LAST = SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK, +}; + +struct snd_start_at { + int tstamp_class; + int tstamp_type; + struct timespec start_time; +}; + /* channel positions */ enum { SNDRV_CHMAP_UNKNOWN = 0, @@ -550,6 +568,8 @@ enum { #define SNDRV_PCM_IOCTL_READN_FRAMES _IOR('A', 0x53, struct snd_xfern) #define SNDRV_PCM_IOCTL_LINK _IOW('A', 0x60, int) #define SNDRV_PCM_IOCTL_UNLINK _IO('A', 0x61) +#define SNDRV_PCM_IOCTL_START_AT _IOW('A', 0x62, struct snd_start_at) + /***************************************************************************** * * diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index baa47c7..40a4689 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -1085,6 +1085,37 @@ int snd_pcm_start(snd_pcm_t *pcm) } /** + * \brief Start a PCM at a specified point in the future + * \param pcm PCM handle + * \param tstamp_class specifies the class of tstamp_type + * \param tstamp_type specifies the clock with which to interpret \p start_time + * \param start_time Absolute time at which to start the stream + * \return 0 on success otherwise a negative error code + * \retval -ENOSYS operation not supported for the current timestamp type + * \retval -EINVAL timespec, tstamp_class or tstamp_type is invalid + * \retval -ETIME requested start_time cannot be satisfied + * + * This method is non-blocking: It establishes an appropriate timer in the kernel + * that will start the stream on expiry. + * + * The timer is unconditionally cancelled upon any \a attempt to change the stream + * state e.g. drop, drain, start, start_at. + */ +int snd_pcm_start_at(snd_pcm_t *pcm, snd_pcm_tstamp_class_t tstamp_class, int tstamp_type, const snd_htimestamp_t *start_time) +{ + assert(pcm); + assert(start_time); + if (CHECK_SANITY(! pcm->setup)) { + SNDMSG("PCM not set up"); + return -EIO; + } + if (pcm->fast_ops->start_at) { + return pcm->fast_ops->start_at(pcm->fast_op_arg, tstamp_class, tstamp_type, start_time); + } + return -EINVAL; +} + +/** * \brief Stop a PCM dropping pending frames * \param pcm PCM handle * \return 0 on success otherwise a negative error code diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index c34b766..0190787 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -620,6 +620,26 @@ static int snd_pcm_hw_start(snd_pcm_t *pcm) return 0; } +static int snd_pcm_hw_start_at(snd_pcm_t *pcm, snd_pcm_tstamp_class_t tstamp_class, int tstamp_type, const snd_htimestamp_t *start_time) +{ + snd_pcm_hw_t *hw = pcm->private_data; + int err; + + struct snd_start_at start_at = { + .tstamp_class = tstamp_class, + .tstamp_type = tstamp_type, + .start_time = *start_time + }; + + sync_ptr(hw, 0); + if (ioctl(hw->fd, SNDRV_PCM_IOCTL_START_AT, &start_at) < 0) { + err = -errno; + SYSMSG("SNDRV_PCM_IOCTL_START_AT failed (%i)", err); + return err; + } + return 0; +} + static int snd_pcm_hw_drop(snd_pcm_t *pcm) { snd_pcm_hw_t *hw = pcm->private_data; @@ -1336,6 +1356,7 @@ static const snd_pcm_fast_ops_t snd_pcm_hw_fast_ops = { .prepare = snd_pcm_hw_prepare, .reset = snd_pcm_hw_reset, .start = snd_pcm_hw_start, + .start_at = snd_pcm_hw_start_at, .drop = snd_pcm_hw_drop, .drain = snd_pcm_hw_drain, .pause = snd_pcm_hw_pause, diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h index 394505f..5cdfd3a 100644 --- a/src/pcm/pcm_local.h +++ b/src/pcm/pcm_local.h @@ -154,6 +154,7 @@ typedef struct { int (*prepare)(snd_pcm_t *pcm); int (*reset)(snd_pcm_t *pcm); int (*start)(snd_pcm_t *pcm); + int (*start_at)(snd_pcm_t *pcm, snd_pcm_tstamp_class_t tstamp_class, int tstamp_type, const snd_htimestamp_t *start_time); int (*drop)(snd_pcm_t *pcm); int (*drain)(snd_pcm_t *pcm); int (*pause)(snd_pcm_t *pcm, int enable); -- 1.7.10.4

3 10

[alsa-devel] [PATCH 00/18] Use setup_timer() and mod_timer()
by Takashi Iwai 19 Jan '15

19 Jan '15

Hi, this is a series of simple cleanup patches to replace the open codes with the standard helpers, setup_timer() and mod_timer(). Takashi

1 18

Re: [alsa-devel] [PATCH v2 2/2] sound: dummy, avoid race with timer
by Takashi Iwai 19 Jan '15

19 Jan '15

At Mon, 19 Jan 2015 10:56:41 +0100, Jiri Slaby wrote: > > There is a race between timer and process contexts. Process context > does not disable irqs, so when a timer ticks inside process' critical > section, the system can deadlock. Fix this by a traditional _irqsave > variant of spin_lock. > > [v2] removed ->pointer change as it is called with BH off Sorry, my previous comment was incorrect. The start function here is also called from PCM trigger callback that is already irq-disabled. So, this is also superfluous. thanks, Takashi > > Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> > Cc: Jaroslav Kysela <perex(a)perex.cz> > Cc: Takashi Iwai <tiwai(a)suse.de> > Cc: alsa-devel(a)alsa-project.org > --- > sound/drivers/dummy.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c > index d11baaf0f0b4..0791210cb4e7 100644 > --- a/sound/drivers/dummy.c > +++ b/sound/drivers/dummy.c > @@ -271,10 +271,13 @@ static void dummy_systimer_update(struct dummy_systimer_pcm *dpcm) > static int dummy_systimer_start(struct snd_pcm_substream *substream) > { > struct dummy_systimer_pcm *dpcm = substream->runtime->private_data; > - spin_lock(&dpcm->lock); > + unsigned long flags; > + > + spin_lock_irqsave(&dpcm->lock, flags); > dpcm->base_time = jiffies; > dummy_systimer_rearm(dpcm); > - spin_unlock(&dpcm->lock); > + spin_unlock_irqrestore(&dpcm->lock, flags); > + > return 0; > } > > -- > 2.2.1 >

1 0

Re: [alsa-devel] [PATCH 2/3] sound: dummy, use del_timer_sync
by Takashi Iwai 19 Jan '15

19 Jan '15

At Mon, 19 Jan 2015 10:42:55 +0100, Jiri Slaby wrote: > > Wait for the timer to really quit, not only by ensuring it is not in > the critical section. > > BTW the spin_lock in here does not disable BH, so that it could > deadlock. The stop function is called from the PCM trigger callback which is irq-disabled. So, you can't use del_timer_sync() here. thanks, Takashi > > Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> > Cc: Jaroslav Kysela <perex(a)perex.cz> > Cc: Takashi Iwai <tiwai(a)suse.de> > Cc: alsa-devel(a)alsa-project.org > --- > sound/drivers/dummy.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c > index d11baaf0f0b4..6d6bf4093583 100644 > --- a/sound/drivers/dummy.c > +++ b/sound/drivers/dummy.c > @@ -281,9 +281,9 @@ static int dummy_systimer_start(struct snd_pcm_substream *substream) > static int dummy_systimer_stop(struct snd_pcm_substream *substream) > { > struct dummy_systimer_pcm *dpcm = substream->runtime->private_data; > - spin_lock(&dpcm->lock); > - del_timer(&dpcm->timer); > - spin_unlock(&dpcm->lock); > + > + del_timer_sync(&dpcm->timer); > + > return 0; > } > > -- > 2.2.1 >

2 1

Re: [alsa-devel] [PATCH 3/3] sound: dummy, avoid races with timer
by Takashi Iwai 19 Jan '15

19 Jan '15

At Mon, 19 Jan 2015 10:42:56 +0100, Jiri Slaby wrote: > > There is a race between timer and process contexts. Process context > does not disable irqs, so when a timer ticks inside process' critical > section, the system can deadlock. Fix this by a traditional _irqsave > variant of spin_lock. > > Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> > Cc: Jaroslav Kysela <perex(a)perex.cz> > Cc: Takashi Iwai <tiwai(a)suse.de> > Cc: alsa-devel(a)alsa-project.org > --- > sound/drivers/dummy.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c > index 6d6bf4093583..18a7cfc99078 100644 > --- a/sound/drivers/dummy.c > +++ b/sound/drivers/dummy.c > @@ -271,10 +271,13 @@ static void dummy_systimer_update(struct dummy_systimer_pcm *dpcm) > static int dummy_systimer_start(struct snd_pcm_substream *substream) > { > struct dummy_systimer_pcm *dpcm = substream->runtime->private_data; > - spin_lock(&dpcm->lock); > + unsigned long flags; > + > + spin_lock_irqsave(&dpcm->lock, flags); > dpcm->base_time = jiffies; > dummy_systimer_rearm(dpcm); > - spin_unlock(&dpcm->lock); > + spin_unlock_irqrestore(&dpcm->lock, flags); > + This looks correct, but... > return 0; > } > > @@ -322,12 +325,14 @@ static snd_pcm_uframes_t > dummy_systimer_pointer(struct snd_pcm_substream *substream) > { > struct dummy_systimer_pcm *dpcm = substream->runtime->private_data; > + unsigned long flags; > snd_pcm_uframes_t pos; > > - spin_lock(&dpcm->lock); > + spin_lock_irqsave(&dpcm->lock, flags); > dummy_systimer_update(dpcm); > pos = dpcm->frac_pos / HZ; > - spin_unlock(&dpcm->lock); > + spin_unlock_irqrestore(&dpcm->lock, flags); > + This chunk is superfluous. The pointer callback is guaranteed to be called in the irq-disabled context. thanks, Takashi

2 1

Re: [alsa-devel] [PATCH 1/3] sound: dummy, use setup_timer and mod_timer
by Takashi Iwai 19 Jan '15

19 Jan '15

At Mon, 19 Jan 2015 10:42:54 +0100, Jiri Slaby wrote: > > From: Roman Kollar <rkollar(a)mail.muni.cz> > > Use setup_timer and mod_timer instead of structure assignments as it > is the preferred way to setup and set the timer. > > Signed-off-by: Roman Kollar <rkollar(a)mail.muni.cz> > Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> > Cc: Jaroslav Kysela <perex(a)perex.cz> > Cc: Takashi Iwai <tiwai(a)suse.de> > Cc: alsa-devel(a)alsa-project.org Applied this one, thanks. Takashi > --- > sound/drivers/dummy.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c > index 5d0dfb787cec..d11baaf0f0b4 100644 > --- a/sound/drivers/dummy.c > +++ b/sound/drivers/dummy.c > @@ -245,9 +245,8 @@ struct dummy_systimer_pcm { > > static void dummy_systimer_rearm(struct dummy_systimer_pcm *dpcm) > { > - dpcm->timer.expires = jiffies + > - (dpcm->frac_period_rest + dpcm->rate - 1) / dpcm->rate; > - add_timer(&dpcm->timer); > + mod_timer(&dpcm->timer, jiffies + > + (dpcm->frac_period_rest + dpcm->rate - 1) / dpcm->rate); > } > > static void dummy_systimer_update(struct dummy_systimer_pcm *dpcm) > @@ -340,9 +339,8 @@ static int dummy_systimer_create(struct snd_pcm_substream *substream) > if (!dpcm) > return -ENOMEM; > substream->runtime->private_data = dpcm; > - init_timer(&dpcm->timer); > - dpcm->timer.data = (unsigned long) dpcm; > - dpcm->timer.function = dummy_systimer_callback; > + setup_timer(&dpcm->timer, dummy_systimer_callback, > + (unsigned long) dpcm); > spin_lock_init(&dpcm->lock); > dpcm->substream = substream; > return 0; > -- > 2.2.1 >

1 0

[alsa-devel] [PATCH v2] conf/ucm: GoogleNyan: Add configuration
by Tomeu Vizoso 19 Jan '15

19 Jan '15

Taken from the ChromeOS sources, this configuration should apply to all Nyan boards from Google, so far HP Chromebook 14 (nyan-blaze) and Acer Chromebook 13 (nyan-big). Signed-off-by: Tomeu Vizoso <tomeu.vizoso(a)collabora.com> --- The board name matches what is proposed in this patch: http://article.gmane.org/gmane.linux.ports.arm.kernel/386036 v2: * Fix whitespace * Remove ChromeOS-specific stuff * Use Headphones control instead of HP Left/Right Out --- configure.ac | 1 + src/conf/ucm/GoogleNyan/GoogleNyan.conf | 5 +++ src/conf/ucm/GoogleNyan/HiFi.conf | 77 +++++++++++++++++++++++++++++++++ src/conf/ucm/GoogleNyan/Makefile.am | 4 ++ src/conf/ucm/Makefile.am | 2 +- 5 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 src/conf/ucm/GoogleNyan/GoogleNyan.conf create mode 100644 src/conf/ucm/GoogleNyan/HiFi.conf create mode 100644 src/conf/ucm/GoogleNyan/Makefile.am diff --git a/configure.ac b/configure.ac index 734163c..916280b 100644 --- a/configure.ac +++ b/configure.ac @@ -654,6 +654,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/SDP4430/Makefile \ src/conf/ucm/tegraalc5632/Makefile \ src/conf/ucm/PAZ00/Makefile \ + src/conf/ucm/GoogleNyan/Makefile \ modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ alsalisp/Makefile aserver/Makefile \ test/Makefile test/lsb/Makefile \ diff --git a/src/conf/ucm/GoogleNyan/GoogleNyan.conf b/src/conf/ucm/GoogleNyan/GoogleNyan.conf new file mode 100644 index 0000000..efe6ad8 --- /dev/null +++ b/src/conf/ucm/GoogleNyan/GoogleNyan.conf @@ -0,0 +1,5 @@ +Comment "Nyan internal card" +SectionUseCase."HiFi" { + File "HiFi.conf" + Comment "Default" +} diff --git a/src/conf/ucm/GoogleNyan/HiFi.conf b/src/conf/ucm/GoogleNyan/HiFi.conf new file mode 100644 index 0000000..b28fe91 --- /dev/null +++ b/src/conf/ucm/GoogleNyan/HiFi.conf @@ -0,0 +1,77 @@ +SectionVerb { + EnableSequence [ + cdev "hw:GoogleNyan" + cset "name='Left Speaker Mixer Left DAC Switch' on" + cset "name='Right Speaker Mixer Right DAC Switch' on" + cset "name='Headphone Left Switch' on" + cset "name='Headphone Right Switch' on" + cset "name='Digital EQ 3 Band Switch' off" + cset "name='Digital EQ 5 Band Switch' off" + cset "name='Digital EQ 7 Band Switch' off" + cset "name='Biquad Switch' off" + cset "name='Filter Mode' Music" + cset "name='ADC Oversampling Rate' 0" + cset "name='DMIC Mux' DMIC" + cset "name='MIC2 Mux' IN34" + cset "name='Right ADC Mixer MIC2 Switch' on" + cset "name='Left ADC Mixer MIC2 Switch' on" + cset "name='MIC2 Volume' 10" + cset "name='MIC2 Boost Volume' 0" + cset "name='Mic Jack Switch' off" + cset "name='Int Mic Switch' on" + cset "name='ADCR Boost Volume' 4" + cset "name='ADCL Boost Volume' 4" + cset "name='ADCR Volume' 11" + cset "name='ADCL Volume' 11" + cset "name='Left Speaker Mixer Left DAC Switch' on" + cset "name='Right Speaker Mixer Right DAC Switch' on" + cset "name='Speaker Left Mixer Volume' 2" + cset "name='Speaker Right Mixer Volume' 2" + cset "name='Record Path DC Blocking' on" + cset "name='Playback Path DC Blocking' on" + cset "name='Headphone Left Switch' on" + cset "name='Headphone Right Switch' on" + cset "name='Headphones Switch' off" + cset "name='Speaker Left Switch' on" + cset "name='Speaker Right Switch' on" + cset "name='Speakers Switch' on" + ] + DisableSequence [ + ] +} + +SectionDevice."Headphone".0 { + Value { + OutputDspName "" + } + EnableSequence [ + cdev "hw:GoogleNyan" + cset "name='Speakers Switch' off" + cset "name='Headphones Switch' on" + ] + DisableSequence [ + cdev "hw:GoogleNyan" + cset "name='Headphones Switch' off" + cset "name='Speakers Switch' on" + ] +} + +SectionDevice."Mic".0 { + Value { + CaptureControl "MIC2" + } + EnableSequence [ + cdev "hw:GoogleNyan" + cset "name='Int Mic Switch' off" + cset "name='DMIC Mux' ADC" + cset "name='Mic Jack Switch' on" + cset "name='Record Path DC Blocking' on" + ] + DisableSequence [ + cdev "hw:GoogleNyan" + cset "name='Mic Jack Switch' off" + cset "name='DMIC Mux' DMIC" + cset "name='Int Mic Switch' on" + cset "name='Record Path DC Blocking' off" + ] +} diff --git a/src/conf/ucm/GoogleNyan/Makefile.am b/src/conf/ucm/GoogleNyan/Makefile.am new file mode 100644 index 0000000..47c7fc9 --- /dev/null +++ b/src/conf/ucm/GoogleNyan/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/GoogleNyan +ucm_DATA = GoogleNyan.conf HiFi.conf +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index bde89df..14fc7ae 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -1 +1 @@ -SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 +SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan -- 1.9.3

2 1

[alsa-devel] [PATCH - UCM 1/1] ucm: add binary configure file parse
by han.lu＠intel.com 19 Jan '15

19 Jan '15

From: "Lu, Han" <han.lu(a)intel.com> with cset command, UCM set kcontrol parameters directly: cset "name='<KCONTROL_NAME>' 1<,2,3,...>" This patch enables UCM to set kcontrol with parameters from configure file: cset-bin-file "name='<KCONTROL_NAME>' <path/to/file>" where "cset-bin-file" is a newly added keyword alongside of "cset", to indicate cset with binary data in file. The binary data in file is parameter for audio DSPs, and it's just passed by UCM/ALSA as raw data. The data type of the parameter element must be byte, and the count is limited by the size of struct snd_ctl_elem_value and driver definition. Signed-off-by: Lu, Han <han.lu(a)intel.com> diff --git a/src/ucm/main.c b/src/ucm/main.c index 37ae4c8..a1b1fb6 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -160,11 +160,57 @@ static int open_ctl(snd_use_case_mgr_t *uc_mgr, return 0; } +static int binary_file_parse(snd_ctl_elem_value_t *dst, + snd_ctl_elem_info_t *info, + const char *filepath) +{ + int err, fd; + struct stat st; + size_t sz; + char *res; + snd_ctl_elem_type_t type; + unsigned int idx, count; + + type = snd_ctl_elem_info_get_type(info); + if (type != SND_CTL_ELEM_TYPE_BYTES) { + uc_error("only support byte type!"); + err = -EINVAL; + return err; + } + fd = open(filepath, O_RDONLY); + if (fd < 0) { + err = -errno; + return err; + } + if (stat(filepath, &st) == -1) { + err = -errno; + goto __fail; + } + sz = st.st_size; + if (sz > sizeof(dst->value.bytes)) + sz = sizeof(dst->value.bytes); + count = snd_ctl_elem_info_get_count(info); + if (sz > count) + sz = count; + res = calloc(sz, 1); + if (res == NULL) { + err = -ENOMEM; + goto __fail; + } + read(fd, res, sz); + for (idx = 0; idx < sz; idx++) + snd_ctl_elem_value_set_byte(dst, idx, *(res + idx)); + free(res); + __fail: + close(fd); + return err; +} + extern int __snd_ctl_ascii_elem_id_parse(snd_ctl_elem_id_t *dst, const char *str, const char **ret_ptr); -static int execute_cset(snd_ctl_t *ctl, const char *cset) +static int execute_cset(snd_ctl_t *ctl, const char *cset, unsigned int type) { const char *pos; int err; @@ -194,7 +240,10 @@ static int execute_cset(snd_ctl_t *ctl, const char *cset) err = snd_ctl_elem_info(ctl, info); if (err < 0) goto __fail; - err = snd_ctl_ascii_value_parse(ctl, value, info, pos); + if (type == SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE) + err = binary_file_parse(value, info, pos); + else + err = snd_ctl_ascii_value_parse(ctl, value, info, pos); if (err < 0) goto __fail; err = snd_ctl_elem_write(ctl, value); @@ -239,6 +288,7 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr, goto __fail_nomem; break; case SEQUENCE_ELEMENT_TYPE_CSET: + case SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE: if (cdev == NULL) { const char *cdev1 = NULL, *cdev2 = NULL; err = get_value3(&cdev1, "PlaybackCTL", @@ -274,7 +324,7 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr, goto __fail; } } - err = execute_cset(ctl, s->data.cset); + err = execute_cset(ctl, s->data.cset, s->type); if (err < 0) { uc_error("unable to execute cset '%s'\n", s->data.cset); goto __fail; diff --git a/src/ucm/parser.c b/src/ucm/parser.c index d7517f6..9e1cb41 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -306,6 +306,16 @@ static int parse_sequence(snd_use_case_mgr_t *uc_mgr ATTRIBUTE_UNUSED, continue; } + if (strcmp(cmd, "cset-bin-file") == 0) { + curr->type = SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE; + err = parse_string(n, &curr->data.cset); + if (err < 0) { + uc_error("error: cset-bin-file requires a string!"); + return err; + } + continue; + } + if (strcmp(cmd, "usleep") == 0) { curr->type = SEQUENCE_ELEMENT_TYPE_SLEEP; err = snd_config_get_integer(n, &curr->data.sleep); diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h index 87f14a2..c1655c7 100644 --- a/src/ucm/ucm_local.h +++ b/src/ucm/ucm_local.h @@ -47,6 +47,7 @@ #define SEQUENCE_ELEMENT_TYPE_CSET 2 #define SEQUENCE_ELEMENT_TYPE_SLEEP 3 #define SEQUENCE_ELEMENT_TYPE_EXEC 4 +#define SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE 5 struct ucm_value { struct list_head list; -- 2.1.0

2 1

[alsa-devel] Strange bug in alsa-lib
by plcmn 19 Jan '15

19 Jan '15

Greetings everyone! I'm sorry in advance for my poor English. Unfortunately your bugtracker is down so I've had to send this bug report (or description, huh) here. Alsa information about my system is in the attachments. I've came across this bug a few days ago, it appeared since I've installed alsa. Everytime when I try to quickly change the volume on Master channel the sound brakes: alsamixer hangs up and some music players (for example, Music on Console) play music by fits and starts (it's similar to watching hd video on a slow connection). Some music players, for example DeadBeeF, or browsers, such as Chromium work quite normal. I've searched forums, but I didn't come across anyone with a similar problem. So, I've decided to do a little research to find out what caused the problems. I've started with a simple script: plcmn@equestria:~$ cat test.sh export i=0 while [ $i -lt 80 ] do amixer set Master $i% let i=$(($i+1)) done Here are the results of the execution before the bug appears: plcmn@equestria:~$ time ./test.sh real 0m0.743s user 0m0.350s sys 0m0.203s And this how it looks like when the bug comes out (I've just launched this script two times in a row): plcmn@equestria~$ time test.sh real 4m41.763s user 0m0.607s sys 0m12.037s That looked really weird, so I've tried to figure out what caused the problem. Checking the source with cppcheck didn't gave any results, except some memory leaks (like [src/rawmidi/rawmidi_hw.c:304]: (error) Memory leak: hw), but none of them referred to my problem. So I've digged into the code and found out the line that caused the error: --- From src/control/control_hw.c: 193 if (ioctl(hw->fd, SNDRV_CTL_IOCTL_ELEM_WRITE, control) < 0) { --- I'm a dummy in system programming, so I can't exactly tell what's the problem with this line (I know ioctl's purpose, but I don't what to do next -- a mess of macros and structures were hard for understanding, so I stopped at this point). The delay measured by clock() from time.h was about 0.18 ms here. Here is gdb's output for arguments passed to the problematic function: Breakpoint 2, snd_ctl_hw_elem_write (handle=<optimized out>, control=0x7fffffffd9e0) at control_hw.c:193 (gdb) n 194 snd_ctl_hw_t *hw = handle->private_data; (gdb) p handle $2 = <optimized out> (gdb) p control $3 = (snd_ctl_elem_value_t *) 0x7fffffffd9e0 (gdb) p control->id $4 = {numid = 16, iface = 2, device = 0, subdevice = 0, name = "Master Playback Volume", '\000' <repeats 21 times>, index = 0} (gdb) p control->indirect $5 = 0 (gdb) p control->reserved $6 = '\000' <repeats 111 times> (gdb) p control->tstamp $7 = {tv_sec = 0, tv_nsec = 0} (gdb) p control->value $8 = {integer = {value = {70, 0 <repeats 127 times>}, value_ptr = 0x46}, integer64 = {value = {70, 0 <repeats 63 times>}, value_ptr = 0x46}, enumerated = {item = {70, 0 <repeats 127 times>}, item_ptr = 0x46}, bytes = {data = "F", '\000' <repeats 510 times>, data_ptr = 0x46 <error: Cannot access memory at address 0x46>}, iec958 = {status = "F", '\000' <repeats 22 times>, subcode = '\000' <repeats 146 times>, pad = 0 '\000', dig_subframe = "\000\000\000"}} For some reason this function is called twice, the second call doesn't cause such a delay. I can provide any information you'll need. I hope that my report will be useful. Sorry again for my poor English and sending a bug report to dev mail lists.

2 1