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

[alsa-devel] [PATCH 0/2] ASoC: fsl: Use usleep_range() instead of msleep()
by Xiubo Li 22 Jan '16

22 Jan '16

Xiubo Li (2): ASoC: fsl_sai: Use usleep_range() instead of msleep() ASoC: fsl-mpc5200: Use usleep_range() instead of msleep() sound/soc/fsl/fsl_sai.c | 3 ++- sound/soc/fsl/mpc5200_psc_ac97.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) -- 1.8.3.1

2 5

[alsa-devel] [PATCH 0/15] ASoC: rsnd: Ensure CTU/MUX works
by Kuninori Morimoto 22 Jan '16

22 Jan '16

Hi Mark Current rsnd is supporting CTU/MUX (no one is using it though) but it has some issues by previous big patch-set. These patches solve it. These are based on my previous Subject: [PATCH] ASoC: soc-pcm: copy dpcm->hw_params and call be_hw_params_fixup every time Date: Thu, 21 Jan 2016 10:43:48 +0900 Kuninori Morimoto (15): ASoC: rsnd: remove unsed *parent ASoC: rsnd: use rsnd_mod_init() for ADG ASoC: rsnd: add debug message for rsnd_mod_call() ASoC: rsnd: don't update status if rsnd_mod_call() doesn't match ASoC: rsnd: try to connect connected mod is not error ASoC: rsnd: always call probe/remove for MUX ASoC: rsnd: don't overwrite io on rsnd_cmd_init() ASoC: rsnd: select each SRC correctly for CMD data path ASoC: rsnd: each mod has status again for CTU/MUX support ASoC: rsnd: attach Audio-DMAC-periperi correctly ASoC: rsnd: ctu: add rsnd_mix_activation() ASoC: rsnd: ctu: add rsnd_ctu_halt() ASoC: rsnd: ctu: settings matches to datasheet ASoC: rsnd: tidyup Playback/Capture sequence ASoC: rsnd: disable SRC.out/in in same time sound/soc/sh/rcar/adg.c | 9 ++------- sound/soc/sh/rcar/cmd.c | 18 ++++++++++++------ sound/soc/sh/rcar/core.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- sound/soc/sh/rcar/ctu.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- sound/soc/sh/rcar/dma.c | 56 +++++++++++++++++++++++++++++--------------------------- sound/soc/sh/rcar/dvc.c | 2 +- sound/soc/sh/rcar/gen.c | 35 +++++++++++++++++++++++++++++++++++ sound/soc/sh/rcar/mix.c | 2 +- sound/soc/sh/rcar/rsnd.h | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- sound/soc/sh/rcar/src.c | 16 ++++------------ sound/soc/sh/rcar/ssi.c | 43 ++++++++++++++++++++++++++++++++++++++----- sound/soc/sh/rcar/ssiu.c | 3 ++- 12 files changed, 313 insertions(+), 92 deletions(-)

2 30

[alsa-devel] Hopelessly confused by channel mapping
by Steven Wawryk 22 Jan '16

22 Jan '16

Hi, I've been developing a soundcard driver for an embedded picozed bearing carrier card with 4 Cirrus CS42448 codecs. Each codec has 6 ADCs and 8 DACs, and is used in TDM mode, meaning there are 8 channel time slots on both the input and output serial audio data lines (DAIs). Wired to connectors (and so accessible to me) are all 6 analog inputs and 1 analog output, for each codec. Each codec and its DAI link come up as a separate device. I used the devices hw:2,n where n is the codec number. (hw:0 and hw:1 are the dummy and loopback devices) For each device/codec/DAI link, everything is as expected when using arecord and aplay when I either pipe the arecord output to aplay, or when arecord writes to WAV file and aplay outputs it. That is, an analog signal applied to input channel 1 then appears on the output channel (1) for the same codec. The first weird thing is when I use speaker-test. If there were only 1 device/codec/DAI link I wouldn't notice anything odd. As expected only 1 channel shows a signal because only channel 0 is wired to a connector. But with 4 codecs, when I output via codec n, the output I see is on the channel that speaker-test thinks is channel n (ie. same number as the codec), not channel 0, which it should be! Is this a possible channel mapping bug in speaker-test? The second weird thing is when I apply a signal to 1 channel at a time, producing 24 WAV files output from arecord (4 codecs x 6 channels, but each contains only 8 channels of data - 6 inputs for a given codec and 2 dummy channels). I copied the files to my desktop, played them through vlc (as 7.1 surround) and used the PulseAudio Volume Meter to see which channels have signal on it. Note that these files behaved completely as expected when played through aplay on the embedded system. The result was that the output channels were all over the place, seemingly random with no apparent pattern. For some files the signals appeared on more than 1 channel. It appears that vlc or PulseAudio Volume Meter must do some kind of remapping. What I don't get is that the WAV files only have 8 channels, from a single codec, and should be independent of which codec the inputs were read from. So even if the output channels were all over the place (and repeatably all over the place), they should be all over the place in the same way for each codec. This was not what I got. Each codec was all over the place in its own unique but repeatable way!!! So can anyone suggest a way I can visualize which channels have signal in the WAV files, without the bizarre remapping done by vlc or PulseAudio Volume Meter? Steve

2 1

[alsa-devel] Microphone Jack on "Acer Aspire V 15 Nitro"
by Sebastian Wagner 21 Jan '16

21 Jan '16

Hi list, the "Acer Aspire V 15 Nitro" has a combined headphone + microphone jack. The headphone worked out-of-the-box (Ubuntu 15.10), but no microphone was recognized. Also, I couldn't find anything about "Realtek ALC255" in my /usr/share/doc/alsa-base/driver/HD-Audio-Models.txt.gz after some googling, I've managed to get my microphone jack working: Adding "options snd-hda-intel model=dell-headset-multi" fixed the issue. See https://bugs.launchpad.net/ubuntu/+source/alsa-driver/+bug/1420988 for a similar setup. As the bug is still open, I thought this might be of interest. I've attached my alsa-info.txt Hope that helps. Sebastian

2 2

[alsa-devel] [PATCH] ASoC: rt286: fix capture doesn't work at some cases
by Bard Liao 21 Jan '16

21 Jan '16

RT286_CBJ_CTRL1(0x4f) bit 10 is needed for headset capture. It will be turned off when "VREF" widget is on and be turned on when bias level is ON. It is odd. And if "VREF" is turned on in bias level is ON, RT286_CBJ_CTRL1(0x4f) bit 10 will be turned off. This patch move the bit control from rt286_set_bias_level and rt298_vref_event to rt286_jack_detect. So it will be turned on once a jack is plugged in. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- The bit is already set in rt286_jack_detect's jack in case, So, it is not on the patch. --- sound/soc/codecs/rt286.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index bc08f0c..1bd3164 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c @@ -266,6 +266,8 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic) } else { *mic = false; regmap_write(rt286->regmap, RT286_SET_MIC1, 0x20); + regmap_update_bits(rt286->regmap, + RT286_CBJ_CTRL1, 0x0400, 0x0000); } } else { regmap_read(rt286->regmap, RT286_GET_HP_SENSE, &buf); @@ -470,24 +472,6 @@ static int rt286_set_dmic1_event(struct snd_soc_dapm_widget *w, return 0; } -static int rt286_vref_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) -{ - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); - - switch (event) { - case SND_SOC_DAPM_PRE_PMU: - snd_soc_update_bits(codec, - RT286_CBJ_CTRL1, 0x0400, 0x0000); - mdelay(50); - break; - default: - return 0; - } - - return 0; -} - static int rt286_ldo2_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { @@ -536,7 +520,7 @@ static const struct snd_soc_dapm_widget rt286_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY_S("HV", 1, RT286_POWER_CTRL1, 12, 1, NULL, 0), SND_SOC_DAPM_SUPPLY("VREF", RT286_POWER_CTRL1, - 0, 1, rt286_vref_event, SND_SOC_DAPM_PRE_PMU), + 0, 1, NULL, 0), SND_SOC_DAPM_SUPPLY_S("LDO1", 1, RT286_POWER_CTRL2, 2, 0, NULL, 0), SND_SOC_DAPM_SUPPLY_S("LDO2", 2, RT286_POWER_CTRL1, @@ -911,8 +895,6 @@ static int rt286_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_ON: mdelay(10); snd_soc_update_bits(codec, - RT286_CBJ_CTRL1, 0x0400, 0x0400); - snd_soc_update_bits(codec, RT286_DC_GAIN, 0x200, 0x0); break; @@ -920,8 +902,6 @@ static int rt286_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_STANDBY: snd_soc_write(codec, RT286_SET_AUDIO_POWER, AC_PWRST_D3); - snd_soc_update_bits(codec, - RT286_CBJ_CTRL1, 0x0400, 0x0000); break; default: -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] [PATCH] ASoC: rt5645: fix the shift bit of IN1 boost
by Bard Liao 21 Jan '16

21 Jan '16

The shift bit of IN1 boost gain control is 12. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index c61d38b..93e8c90 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -776,7 +776,7 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = { /* IN1/IN2 Control */ SOC_SINGLE_TLV("IN1 Boost", RT5645_IN1_CTRL1, - RT5645_BST_SFT1, 8, 0, bst_tlv), + RT5645_BST_SFT1, 12, 0, bst_tlv), SOC_SINGLE_TLV("IN2 Boost", RT5645_IN2_CTRL, RT5645_BST_SFT2, 8, 0, bst_tlv), -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] [PATCH] ASoC: avoid unused variable warning for rt5659_acpi_match
by Arnd Bergmann 21 Jan '16

21 Jan '16

The newly added rt5659 codec driver unconditionally defines an ACPI device match table but then uses ACPI_PTR() to remove the only reference to it, so we get a harmless build warning: sound/soc/codecs/rt5659.c:4200:30: warning: 'rt5659_acpi_match' defined but not used [-Wunused-variable] static struct acpi_device_id rt5659_acpi_match[] = { This changes both the OF match table and the ACPI match table to follow the same style, using ACPI_PTR/of_match_ptr to make the reference conditional, and using an #ifdef to hide the table. This also adds the missing MODULE_DEVICE_TABLE for the OF case and adapts the formatting to the same style. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- v3: actually builds with CONFIG_OF enabled, testing in a couple of configurations with and without OF diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c index c166d9394c69..fb8ea05c0de1 100644 --- a/sound/soc/codecs/rt5659.c +++ b/sound/soc/codecs/rt5659.c @@ -4183,24 +4183,29 @@ void rt5659_i2c_shutdown(struct i2c_client *client) regmap_write(rt5659->regmap, RT5659_RESET, 0); } +#ifdef CONFIG_OF static const struct of_device_id rt5659_of_match[] = { { .compatible = "realtek,rt5658", }, { .compatible = "realtek,rt5659", }, - {}, + { }, }; +MODULE_DEVICE_TABLE(of, rt5659_of_match); +#endif +#ifdef CONFIG_ACPI static struct acpi_device_id rt5659_acpi_match[] = { - { "10EC5658", 0}, - { "10EC5659", 0}, - { }, + { "10EC5658", 0, }, + { "10EC5659", 0, }, + { }, }; MODULE_DEVICE_TABLE(acpi, rt5659_acpi_match); +#endif struct i2c_driver rt5659_i2c_driver = { .driver = { .name = "rt5659", .owner = THIS_MODULE, - .of_match_table = rt5659_of_match, + .of_match_table = of_match_ptr(rt5659_of_match), .acpi_match_table = ACPI_PTR(rt5659_acpi_match), }, .probe = rt5659_i2c_probe,

2 1

[alsa-devel] [PATCH 1/2] ALSA: timer: Handle disconnection more safely
by Takashi Iwai 21 Jan '16

21 Jan '16

Currently ALSA timer device doesn't take the disconnection into account very well; it merely unlinks the timer device at disconnection callback but does nothing else. Because of this, when an application accessing the timer device is disconnected, it may release the resource before actually closed. In most cases, it results in a warning message indicating a leftover timer instance like: ALSA: timer xxxx is busy? But basically this is an open race. This patch tries to address it. The strategy is like other ALSA devices: namely, - Manage card's refcount at each open/close - Wake up the pending tasks at disconnection - Check the shutdown flag appropriately at each possible call Note that this patch has one ugly hack to handle the wakeup of pending tasks. It'd be cleaner to introduce a new disconnect op to snd_timer_instance ops. But since it would lead to internal ABI breakage and it eventually increase my own work when backporting to stable kernels, I took a different path to implement locally in timer.c. A cleanup patch will follow at next for 4.5 kernel. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=109431 Cc: <stable(a)vger.kernel.org> # v3.15+ Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/timer.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/sound/core/timer.c b/sound/core/timer.c index cb25aded5349..681fb051b9eb 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -65,6 +65,7 @@ struct snd_timer_user { int qtail; int qused; int queue_size; + bool disconnected; struct snd_timer_read *queue; struct snd_timer_tread *tqueue; spinlock_t qlock; @@ -290,6 +291,9 @@ int snd_timer_open(struct snd_timer_instance **ti, mutex_unlock(&register_mutex); return -ENOMEM; } + /* take a card refcount for safe disconnection */ + if (timer->card) + get_device(&timer->card->card_dev); timeri->slave_class = tid->dev_sclass; timeri->slave_id = slave_id; if (list_empty(&timer->open_list_head) && timer->hw.open) @@ -359,6 +363,9 @@ int snd_timer_close(struct snd_timer_instance *timeri) } spin_unlock(&timer->lock); spin_unlock_irq(&slave_active_lock); + /* release a card refcount for safe disconnection */ + if (timer->card) + put_device(&timer->card->card_dev); mutex_unlock(&register_mutex); } out: @@ -474,6 +481,8 @@ int snd_timer_start(struct snd_timer_instance *timeri, unsigned int ticks) timer = timeri->timer; if (timer == NULL) return -EINVAL; + if (timer->card && timer->card->shutdown) + return -ENODEV; spin_lock_irqsave(&timer->lock, flags); timeri->ticks = timeri->cticks = ticks; timeri->pticks = 0; @@ -505,6 +514,10 @@ static int _snd_timer_stop(struct snd_timer_instance *timeri, int event) spin_lock_irqsave(&timer->lock, flags); list_del_init(&timeri->ack_list); list_del_init(&timeri->active_list); + if (timer->card && timer->card->shutdown) { + spin_unlock_irqrestore(&timer->lock, flags); + return 0; + } if ((timeri->flags & SNDRV_TIMER_IFLG_RUNNING) && !(--timer->running)) { timer->hw.stop(timer); @@ -565,6 +578,8 @@ int snd_timer_continue(struct snd_timer_instance *timeri) timer = timeri->timer; if (! timer) return -EINVAL; + if (timer->card && timer->card->shutdown) + return -ENODEV; spin_lock_irqsave(&timer->lock, flags); if (!timeri->cticks) timeri->cticks = 1; @@ -628,6 +643,9 @@ static void snd_timer_tasklet(unsigned long arg) unsigned long resolution, ticks; unsigned long flags; + if (timer->card && timer->card->shutdown) + return; + spin_lock_irqsave(&timer->lock, flags); /* now process all callbacks */ while (!list_empty(&timer->sack_list_head)) { @@ -668,6 +686,9 @@ void snd_timer_interrupt(struct snd_timer * timer, unsigned long ticks_left) if (timer == NULL) return; + if (timer->card && timer->card->shutdown) + return; + spin_lock_irqsave(&timer->lock, flags); /* remember the current resolution */ @@ -878,11 +899,28 @@ static int snd_timer_dev_register(struct snd_device *dev) return 0; } +/* just for reference in snd_timer_dev_disconnect() below */ +static void snd_timer_user_ccallback(struct snd_timer_instance *timeri, + int event, struct timespec *tstamp, + unsigned long resolution); + static int snd_timer_dev_disconnect(struct snd_device *device) { struct snd_timer *timer = device->device_data; + struct snd_timer_instance *ti; + mutex_lock(&register_mutex); list_del_init(&timer->device_list); + /* wake up pending sleepers */ + list_for_each_entry(ti, &timer->open_list_head, open_list) { + /* FIXME: better to have a ti.disconnect() op */ + if (ti->ccallback == snd_timer_user_ccallback) { + struct snd_timer_user *tu = ti->callback_data; + + tu->disconnected = true; + wake_up(&tu->qchange_sleep); + } + } mutex_unlock(&register_mutex); return 0; } @@ -893,6 +931,8 @@ void snd_timer_notify(struct snd_timer *timer, int event, struct timespec *tstam unsigned long resolution = 0; struct snd_timer_instance *ti, *ts; + if (timer->card && timer->card->shutdown) + return; if (! (timer->hw.flags & SNDRV_TIMER_HW_SLAVE)) return; if (snd_BUG_ON(event < SNDRV_TIMER_EVENT_MSTART || @@ -1051,6 +1091,8 @@ static void snd_timer_proc_read(struct snd_info_entry *entry, mutex_lock(&register_mutex); list_for_each_entry(timer, &snd_timer_list, device_list) { + if (timer->card && timer->card->shutdown) + continue; switch (timer->tmr_class) { case SNDRV_TIMER_CLASS_GLOBAL: snd_iprintf(buffer, "G%i: ", timer->tmr_device); @@ -1876,6 +1918,10 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, remove_wait_queue(&tu->qchange_sleep, &wait); + if (tu->disconnected) { + err = -ENODEV; + break; + } if (signal_pending(current)) { err = -ERESTARTSYS; break; @@ -1925,6 +1971,8 @@ static unsigned int snd_timer_user_poll(struct file *file, poll_table * wait) mask = 0; if (tu->qused) mask |= POLLIN | POLLRDNORM; + if (tu->disconnected) + mask |= POLLERR; return mask; } -- 2.7.0

1 1

[alsa-devel] Use of snd_pcm_format_set_silence
by Ankhit Vivekananda 21 Jan '16

21 Jan '16

Hello, I have an application where in I need to silence the first few samples of the buffer that is read from snd_pcm_readi(). In order to do this, I call the snd_pcm_format_set_silence() providing the same buffer that the snd_pcm_readi() reads to. 1) By doing this, is there going to be a timing delay due to the use of snd_pcm_format_set_silence()? 2) Is snd_pcm_format_set_silence() the correct function to achieve this goal or are there better methods? Please do let me know. Thank you, Ankhit

2 4

[alsa-devel] Discarding the first few frames inside the kernel
by Ankhit Vivekananda 21 Jan '16

21 Jan '16

Hello All, I am interfacing the ICS43432 MEMS microphone with McBSP interface. The data sheet of the ICS43432 microphone shows that it takes about 4.5ms (16kHz sampling rate) for startup. Because of this, I hear a transient noise at the beginning of every stream. Is there in any way I can discard the frames inside the kernel space itself before reading the samples using snd_pcm_readi() call? I was able to mute the first few frames after the readi() call, but would want to know if I could do it before the readi() call itself inside the kernel space. Appreciate any help! Thanks, Ankhit

2 4