November 2013 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] Use more than 1 .c file for a single codec driver
by Bard Liao 08 Nov '13

08 Nov '13

Can we use more than one .c file for a codec driver? There are some codecs with DSP function. I want to know if I can separate the DSP part from other functions. For example, rt5670.c/.h rt5670-dsp.c/.h for RT5670 codec driver. Thanks. Bard Liao Computer Peripherals Business Unit Realtek Semiconductor Corp. 886-3-578-0211 ext. 3334 bardliao(a)realtek.com

2 1

[alsa-devel] [patch] ASoC: fsl: imx-wm8962: remove an unneeded check
by Dan Carpenter 08 Nov '13

08 Nov '13

"data->codec_clk" can't be an ERR_PTR here so I have removed the superflous check. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c index a1deac6..61e4885 100644 --- a/sound/soc/fsl/imx-wm8962.c +++ b/sound/soc/fsl/imx-wm8962.c @@ -279,8 +279,7 @@ static int imx_wm8962_probe(struct platform_device *pdev) return 0; clk_fail: - if (!IS_ERR(data->codec_clk)) - clk_disable_unprepare(data->codec_clk); + clk_disable_unprepare(data->codec_clk); fail: if (ssi_np) of_node_put(ssi_np);

2 1

[alsa-devel] [PATCH] ASoC: fsl: imx-pcm-fiq: Remove unused 'runtime' variable
by Fabio Estevam 08 Nov '13

08 Nov '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> Commit 68f9672b (ASoC: fsl: imx-pcm-fiq: remove bogus period delta calculation) introduced the following build warning: sound/soc/fsl/imx-pcm-fiq.c:53:26: warning: unused variable 'runtime' [-Wunused-variable] Remove the unused 'runtime' variable. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/fsl/imx-pcm-fiq.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c index 73cb07d..41740e4 100644 --- a/sound/soc/fsl/imx-pcm-fiq.c +++ b/sound/soc/fsl/imx-pcm-fiq.c @@ -50,7 +50,6 @@ static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt) struct imx_pcm_runtime_data *iprtd = container_of(hrt, struct imx_pcm_runtime_data, hrt); struct snd_pcm_substream *substream = iprtd->substream; - struct snd_pcm_runtime *runtime = substream->runtime; struct pt_regs regs; if (!atomic_read(&iprtd->running)) -- 1.8.1.2

3 3

[alsa-devel] [RFC PATCH] MAINTAINERS: Remove Jaroslav Kysela
by Joe Perches 08 Nov '13

08 Nov '13

Jaroslav hasn't acked or signed a patch in quite awhile. Mark ISAPnp and HP VG/AnyLAN driver as orphan. Add sound to his CREDITS entry. Signed-off-by: Joe Perches <joe(a)perches.com> --- CREDITS | 1 + MAINTAINERS | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CREDITS b/CREDITS index 0640e16..01a1b34 100644 --- a/CREDITS +++ b/CREDITS @@ -2021,6 +2021,7 @@ E: perex(a)perex.cz W: http://www.perex.cz D: Original Author and Maintainer for HP 10/100 Mbit Network Adapters D: ISA PnP +D: ALSA/Sound S: Sindlovy Dvory 117 S: 370 01 Ceske Budejovice S: Czech Republic diff --git a/MAINTAINERS b/MAINTAINERS index 831b869..8706839 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3983,8 +3983,7 @@ S: Orphan F: drivers/platform/x86/tc1100-wmi.c HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series -M: Jaroslav Kysela <perex(a)perex.cz> -S: Maintained +S: Orphan F: drivers/net/ethernet/hp/hp100.* HPET: High Precision Event Timers driver @@ -4600,8 +4599,7 @@ F: include/linux/irqdomain.h F: kernel/irq/irqdomain.c ISAPNP -M: Jaroslav Kysela <perex(a)perex.cz> -S: Maintained +S: Orphan F: Documentation/isapnp.txt F: drivers/pnp/isapnp/ F: include/linux/isapnp.h @@ -7818,7 +7816,6 @@ S: Maintained F: drivers/memstick/core/ms_block.* SOUND -M: Jaroslav Kysela <perex(a)perex.cz> M: Takashi Iwai <tiwai(a)suse.de> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) W: http://www.alsa-project.org/

5 6

[alsa-devel] [PATCH] ALSA: hda/realtek - Make fixup regs persist after resume
by Takashi Iwai 08 Nov '13

08 Nov '13

From: Kailang Yang <kailang(a)realtek.com> Upon suspend / resume, the fixup register settings are lost because sending HDA_FIXUP_ACT_PRE_PROBE is not part of the resume path. Instead, write our registers in response to the HDA_FIXUP_ACT_INIT, which happens after initial probe and upon resume. Signed-off-by: Kailang Yang <kailang(a)realtek.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index daf720502385..6a214662700e 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3503,6 +3503,8 @@ static void alc283_fixup_chromebook(struct hda_codec *codec, /* Disable AA-loopback as it causes white noise */ spec->gen.mixer_nid = 0; spec->gen.hp_automute_hook = alc283_hp_automute_hook; + break; + case HDA_FIXUP_ACT_INIT: /* MIC2-VREF control */ /* Set to manual mode */ val = alc_read_coef_idx(codec, 0x06); -- 1.8.4.2

1 0

[alsa-devel] [PATCH v2][RESEND] ASoC: generic-dmaengine-pcm: Use SNDRV_DMA_TYPE_DEV_IRAM as default
by Nicolin Chen 07 Nov '13

07 Nov '13

When allocating memory space for DMA buffer, use on-chip internal SRAM as default choice to save power. Since the core would allocate memory from traditional external memory if iram allocation failed, we don't need to worry about any side effect. Signed-off-by: Nicolin Chen <b42378(a)freescale.com> --- * ! This patch should be applied to a branch containing the patch -- ALSA: * Add SoC on-chip internal ram support for DMA buffer allocation. Changelog v1->v2: * Use iram memory space as default sound/soc/soc-generic-dmaengine-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index e29ec3c..e5b61e3 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -163,7 +163,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd) } ret = snd_pcm_lib_preallocate_pages(substream, - SNDRV_DMA_TYPE_DEV, + SNDRV_DMA_TYPE_DEV_IRAM, dmaengine_dma_dev(pcm, substream), config->prealloc_buffer_size, config->pcm_hardware->buffer_bytes_max); -- 1.8.4

4 5

[alsa-devel] [PATCH 00/31] Kill BUG*() volume 2: ASoC
by Takashi Iwai 07 Nov '13

07 Nov '13

Hi, this is a second series of small patches to replace the usages of BUG*() macros, at this time, in ASoC. And the last patch is a revival of the previous coverity fix. The patches have been split to small pieces, but feel free to combine them appropriately. [PATCH 01/31] ASoC: blackfin: Use WARN_ON() instead of BUG_ON() [PATCH 02/31] ASoC: max98088: Use WARN_ON() instead of BUG_ON() [PATCH 03/31] ASoC: max98095: Use WARN_ON() instead of BUG_ON() [PATCH 04/31] ASoC: tpa6130a2: Use WARN_ON() instead of BUG_ON() [PATCH 05/31] ASoC: wm0010: Use WARN_ON() instead of BUG_ON() [PATCH 06/31] ASoC: wm2000: Use WARN_ON() instead of BUG_ON() [PATCH 07/31] ASoC: wm8580: Use WARN() instead of BUG_ON() [PATCH 08/31] ASoC: wm5100: Use WARN_ON() instead of BUG_ON() [PATCH 09/31] ASoC: wm8776: Use WARN_ON() instead of BUG_ON() [PATCH 10/31] ASoC: wm8900: Use WARN_ON() instead of BUG_ON() [PATCH 11/31] ASoC: wm8904: Use WARN_ON() instead of BUG_ON() [PATCH 12/31] ASoC: wm9713: Use WARN_ON() instead of BUG_ON() [PATCH 13/31] ASoC: wm_adsp: Fix BUG_ON() and WARN_ON() usages [PATCH 14/31] ASoC: mid-x86: Use WARN_ON() instead of BUG_ON() [PATCH 15/31] ASoC: omap: Use WARN_ON() instead of BUG_ON() [PATCH 16/31] ASoC: pxa: Use WARN_ON() instead of BUG_ON() [PATCH 17/31] ASoC: s6000: Use WARN_ON() instead of BUG_ON() [PATCH 18/31] ASoC: rcar: Use WARN_ON() instead of BUG_ON() [PATCH 19/31] ASoC: sh: Use WARN_ON() instead of BUG_ON() [PATCH 20/31] ASoC: txx9: Use WARN_ON() instead of BUG_ON() [PATCH 21/31] ASoC: dapm: Use WARN_ON() instead of BUG_ON() [PATCH 22/31] ASoC: wm5100: Replace BUG() with snd_BUG() [PATCH 23/31] ASoC: wm8350: Replace BUG() with snd_BUG() [PATCH 24/31] ASoC: wm8900: Replace BUG() with snd_BUG() [PATCH 25/31] ASoC: wm8904: Replace BUG() with snd_BUG() [PATCH 26/31] ASoC: wm8958: Replace BUG() with snd_BUG() [PATCH 27/31] ASoC: wm8962: Replace BUG() with snd_BUG() [PATCH 28/31] ASoC: wm8996: Replace BUG() with snd_BUG() [PATCH 29/31] ASoC: wm_hubs: Replace BUG() with snd_BUG() [PATCH 30/31] ASoC: Replace BUG() with snd_BUG() [PATCH 31/31] ASoC: max98095: Add missing negative channel checks thanks, Takashi

5 77

[alsa-devel] [PATCH 0/3] ALSA: hda - Delay HDMI presence reports while waiting for ELD information
by David Henningsson 07 Nov '13

07 Nov '13

Hi Takashi, I tested the patch you sent me last week on an Intel machine and it seems to work. I don't have any full set of PulseAudio patches written yet that makes of use of this, so I tested mainly with printk's to see that the eld was updated before the jack was sent to userspace. In addition, I added a workaround for the race condition that could happen if you try to probe two monitors simultaneously. For completeness I'm also sending the patch you sent me in this series. I think it is good enough to go into 3.13.

3 6

[alsa-devel] Microphones not working on Apple macbook Air 1, 1 (Early 2008) under 3.2.0-55-generic-pae Linux
by Nicolo' 07 Nov '13

07 Nov '13

Hello List, from time to time I spend time on this problem. (Of course, it is not related to muting or capturing in alsamixer, or pulseaudio stuff, since that was already tried.) I can't get the mics to work, neither the internal one nor the external; note that the same jack works both for HP and ext MIC, I think it's called TRRS, and it's the same as the one used e.g. on iphones. I tried also with more recent kernels, and playing with hda-jack-retask, but with no success up to now. alsa script result is attached A curious fact, I found this alsa script result http://www.alsa-project.org/db/?f=3ca8243c0626844f0264a3faad0aa72018bc14f4 from a guy running Arch on the same machine, where actually some Mic appears in codec#0: do you think it is relevant? Thanks and best, Nicolo'

1 0

[alsa-devel] [PATCHi v6] ALSA: compress: fix drain calls blocking other compress functions
by Vinod Koul 07 Nov '13

07 Nov '13

The drain and drain_notify callback were blocked by low level driver untill the draining was complete. Due to this being invoked with big fat mutex held, others ops like reading timestamp, calling pause, drop were blocked. So to fix this we add a new snd_compr_drain_notify() API. This would be required to be invoked by low level driver when drain or partial drain has been completed by the DSP. Thus we make the drain and partial_drain callback as non blocking and driver returns immediately after notifying DSP. The waiting is done while relasing the lock so that other ops can go ahead. Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> CC: stable(a)vger.kernel.org --- v6: remove code handled in snd_compr_drain_notify v5: remove the drain_wake and wait queue and use the existing wait queue make wait in draining state as interruptible v4: move pr_err -> pr_debug to avoid spamming kernel log make wait in drain interruptible v3: call snd_compr_drain_notify from compress_stop() rename draining -> drain_wake add some comments on state transistion after drain v2: fix the 80 line warn move the state change to compress_drain() include/sound/compress_driver.h | 9 ++++++ sound/core/compress_offload.c | 54 ++++++++++++++++++++++++++++++++++---- 2 files changed, 57 insertions(+), 6 deletions(-) diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h index 9031a26..ae6c3b8 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -171,4 +171,13 @@ static inline void snd_compr_fragment_elapsed(struct snd_compr_stream *stream) wake_up(&stream->runtime->sleep); } +static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) +{ + if (snd_BUG_ON(!stream)) + return; + + stream->runtime->state = SNDRV_PCM_STATE_SETUP; + wake_up(&stream->runtime->sleep); +} + #endif diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index bea523a..d9af638 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -680,14 +680,48 @@ static int snd_compr_stop(struct snd_compr_stream *stream) return -EPERM; retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_STOP); if (!retval) { - stream->runtime->state = SNDRV_PCM_STATE_SETUP; - wake_up(&stream->runtime->sleep); + snd_compr_drain_notify(stream); stream->runtime->total_bytes_available = 0; stream->runtime->total_bytes_transferred = 0; } return retval; } +static int snd_compress_wait_for_drain(struct snd_compr_stream *stream) +{ + int ret; + + /* + * We are called with lock held. So drop the lock while we wait for + * drain complete notfication from the driver + * + * It is expected that driver will notify the drain completion and then + * stream will be moved to SETUP state, even if draining resulted in an + * error. We can trigger next track after this. + */ + stream->runtime->state = SNDRV_PCM_STATE_DRAINING; + mutex_unlock(&stream->device->lock); + + /* we wait for drain to complete here, drain can return when + * interruption occurred, wait returned error or success. + * For the first two cases we don't do anything different here and + * return after waking up + */ + + ret = wait_event_interruptible(stream->runtime->sleep, + (stream->runtime->state != SNDRV_PCM_STATE_DRAINING)); + if (ret == -ERESTARTSYS) + pr_debug("wait aborted by a signal"); + else if (ret) + pr_debug("wait for drain failed with %d\n", ret); + + + wake_up(&stream->runtime->sleep); + mutex_lock(&stream->device->lock); + + return ret; +} + static int snd_compr_drain(struct snd_compr_stream *stream) { int retval; @@ -695,12 +729,15 @@ static int snd_compr_drain(struct snd_compr_stream *stream) if (stream->runtime->state == SNDRV_PCM_STATE_PREPARED || stream->runtime->state == SNDRV_PCM_STATE_SETUP) return -EPERM; + retval = stream->ops->trigger(stream, SND_COMPR_TRIGGER_DRAIN); - if (!retval) { - stream->runtime->state = SNDRV_PCM_STATE_DRAINING; + if (retval) { + pr_debug("SND_COMPR_TRIGGER_DRAIN failed %d\n", retval); wake_up(&stream->runtime->sleep); + return retval; } - return retval; + + return snd_compress_wait_for_drain(stream); } static int snd_compr_next_track(struct snd_compr_stream *stream) @@ -736,9 +773,14 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream) return -EPERM; retval = stream->ops->trigger(stream, SND_COMPR_TRIGGER_PARTIAL_DRAIN); + if (retval) { + pr_debug("Partial drain returned failure\n"); + wake_up(&stream->runtime->sleep); + return retval; + } stream->next_track = false; - return retval; + return snd_compress_wait_for_drain(stream); } static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg) -- 1.7.0.4

2 2