July 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] Buffer underrun in a not empty playback buffer
by Christian Gruber 25 Jul '12

25 Jul '12

I had a problem with an ALSA-driver, which causes an underrun in the playback stream before the playback buffer was completely empty (snd_pcm_avail() < playback buffer size). The driver developer told me, that this is correct, since for correct DMA transfer a minimum buffer filling level is required. Is this an allowed ALSA-driver behaviour or does the ALSA-driver developer has to hide all DMA internals to the application developer so that an underrun just occurs, when the playback buffer is empty? If yes, how can I get to know about the required minimum buffer filling level before an underrun occurs? Regards, Christian -- --------------------------------------------------------------- Dipl.-Ing. Christian Gruber voiceINTERconnect GmbH Ammonstraße 35 01067 Dresden Germany Tel.: +49 (0) 351 - 407 526 67 Fax.: +49 (0) 351 - 407 526 55 --------------------------------------------------------------- www.voiceinterconnect.de ... smart signal processing for electronic devices Geschäftsführung: Eingetragen im Handelsregister: Dr.-Ing. Diane Hirschfeld, Amtsgericht Dresden HRB 19466 Ludwig Linkenheil

2 3

[alsa-devel] question about sound/soc/ux500/ux500_msp_i2s.c
by Julia Lawall 25 Jul '12

25 Jul '12

I noticed that the function ux500_msp_i2s_init_msp in the file sound/soc/ux500/ux500_msp_i2s.c returns 0 rather than -ENOMEM in case the second devm_kzalloc fails: /* I2S-controller is allocated and added in I2S controller class. */ i2s_cont = devm_kzalloc(&pdev->dev, sizeof(*i2s_cont), GFP_KERNEL); if (!i2s_cont) { dev_err(&pdev->dev, "%s: ERROR: Failed to allocate I2S-controller!\n", __func__); goto err_i2s_cont; } Then I also noticed that this function uses devm_kzalloc, but not devm_ioremap, and that it does use devm_kfree instead of letting the data get freed automatically. But it is true that this function is not itself a probe function, only called by one. The only call site I see is in ux500_msp_drv_probe, in sound/soc/ux500/ux500_msp_dai.c. But then what seems strange is that the call site does not test the return value, but only if the value pointer to by the second argument of the call has been successfully initialized. That initialization happens quite near the beginning of ux500_msp_i2s_init_msp, and there are many ways in which the function can fail after that. Do they not matter? Perhaps that explains the need for devm_kfree? Also I see that ux500_msp_drv_probe uses devm_regulator_put, which I was not previously familiar with. But if that works like the other devm functions, and since ux500_msp_drv_probe is actually a probe function of a platform driver, then is devm_regulator_put actually needed? thanks, julia

1 0

[alsa-devel] [PATCH 1/1] ASoC: isabelle: Remove version.h header file inclusion
by Sachin Kamat 25 Jul '12

25 Jul '12

version.h header file inclusion is no longer needed for this file. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> --- sound/soc/codecs/isabelle.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/isabelle.c b/sound/soc/codecs/isabelle.c index 5d8f39e..1bf5560 100644 --- a/sound/soc/codecs/isabelle.c +++ b/sound/soc/codecs/isabelle.c @@ -13,7 +13,6 @@ */ #include <linux/module.h> #include <linux/moduleparam.h> -#include <linux/version.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/delay.h> -- 1.7.4.1

3 2

[alsa-devel] Declaring HDMI channel allocation to kernel
by Gabriel M. Beddingfield 25 Jul '12

25 Jul '12

Is there an established way for me (from userspace) to pass the HDMI Channel Allocation (1 byte) to the driver? If not, can you recommend an approach? In most of the drivers that I've inspected, the drivers seem to assume that there's a 1:1 mapping of Number-of-Channels to Channel-Allocation. However, the HDMI sink declares which speakers it has attached in the EDID. If I can match this in userspace... I need a way to communicate it to the driver. -gabriel

6 7

[alsa-devel] Help request - ASoC recursion issue
by Lee Jones 25 Jul '12

25 Jul '12

Hi Mark, I was wondering if I may bother you for some help. I've been having serious issues with testing the new mop500 sound system you have in your ASoC for-next branch. I've fixed a few issues and will be submitting patches shortly. The most serious issue I came across was with recursion. Let me show you: So here we setup the power_check function pointer with 'dapm_supply_check_power()'. > static struct snd_soc_dapm_widget * > snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, > const struct snd_soc_dapm_widget *widget) > { <snip> > case snd_soc_dapm_regulator_supply: > case snd_soc_dapm_clock_supply: > w->power_check = dapm_supply_check_power; > break; <snip> > } Later we call 'dapm_widget_power_check()' which calls into the function pointer we know to be 'dapm_supply_check_power()'. > static int dapm_widget_power_check(struct snd_soc_dapm_widget *w) > { > if (w->power_checked) > return w->new_power; > > if (w->force) > w->new_power = 1; > else > w->new_power = w->power_check(w); > > w->power_checked = true; > > return w->new_power; > } The problem seems to be that 'dapm_supply_check_power()' then calls back into 'dapm_widget_power_check()'. Then round and round we go! > /* Check to see if a power supply is needed */ > static int dapm_supply_check_power(struct snd_soc_dapm_widget *w) > { <snip> > /* Check if one of our outputs is connected */ > list_for_each_entry(path, &w->sinks, list_source) { > DAPM_UPDATE_STAT(w, neighbour_checks); > > if (path->weak) > continue; > > if (path->connected && > !path->connected(path->source, path->sink)) > continue; > > if (!path->sink) > continue; > > if (dapm_widget_power_check(path->sink)) /* <-- Doh! */ > return 1; > } <snip> > } Can you shed some light on what the correct solution might be? Any help would be gratefully received. Kind regards, Lee -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog

3 6

[alsa-devel] [PATCH 0/2] MFD: twl6040: Version support fixes, additions
by Peter Ujfalusi 25 Jul '12

25 Jul '12

Hello, The following series fixes the revision information for twl6040 and adds support for twl6041. While the first patch is changing a driver in sound/soc/codecs the series can go via MFD since we do not have pending patches for twl6040 audio part for 3.6. Regards, Peter --- Peter Ujfalusi (2): MFD: twl6040: Fix revision information MFD: twl6040: Add support for twl6041 Documentation/devicetree/bindings/mfd/twl6040.txt | 2 +- drivers/mfd/twl6040-core.c | 1 + include/linux/mfd/twl6040.h | 5 +++-- sound/soc/codecs/twl6040.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) -- 1.7.8.6

4 6

[alsa-devel] [RESEND] ASoC: omap-mcpdm: Convert to use devm_*
by Peter Ujfalusi 24 Jul '12

24 Jul '12

Switch to use devm_* te make the probe/remove code more cleaner. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Reviewed-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/omap/omap-mcpdm.c | 52 ++++++++++-------------------------------- 1 files changed, 13 insertions(+), 39 deletions(-) diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index 2c66e24..f7babb3 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -445,9 +445,8 @@ static __devinit int asoc_mcpdm_probe(struct platform_device *pdev) { struct omap_mcpdm *mcpdm; struct resource *res; - int ret = 0; - mcpdm = kzalloc(sizeof(struct omap_mcpdm), GFP_KERNEL); + mcpdm = devm_kzalloc(&pdev->dev, sizeof(struct omap_mcpdm), GFP_KERNEL); if (!mcpdm) return -ENOMEM; @@ -456,55 +455,30 @@ static __devinit int asoc_mcpdm_probe(struct platform_device *pdev) mutex_init(&mcpdm->mutex); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (res == NULL) { - dev_err(&pdev->dev, "no resource\n"); - goto err_res; - } + if (res == NULL) + return -ENOMEM; - if (!request_mem_region(res->start, resource_size(res), "McPDM")) { - ret = -EBUSY; - goto err_res; - } + if (!devm_request_mem_region(&pdev->dev, res->start, + resource_size(res), "McPDM")) + return -EBUSY; - mcpdm->io_base = ioremap(res->start, resource_size(res)); - if (!mcpdm->io_base) { - ret = -ENOMEM; - goto err_iomap; - } + mcpdm->io_base = devm_ioremap(&pdev->dev, res->start, + resource_size(res)); + if (!mcpdm->io_base) + return -ENOMEM; mcpdm->irq = platform_get_irq(pdev, 0); - if (mcpdm->irq < 0) { - ret = mcpdm->irq; - goto err_irq; - } + if (mcpdm->irq < 0) + return mcpdm->irq; mcpdm->dev = &pdev->dev; - ret = snd_soc_register_dai(&pdev->dev, &omap_mcpdm_dai); - if (!ret) - return 0; - -err_irq: - iounmap(mcpdm->io_base); -err_iomap: - release_mem_region(res->start, resource_size(res)); -err_res: - kfree(mcpdm); - return ret; + return snd_soc_register_dai(&pdev->dev, &omap_mcpdm_dai); } static int __devexit asoc_mcpdm_remove(struct platform_device *pdev) { - struct omap_mcpdm *mcpdm = platform_get_drvdata(pdev); - struct resource *res; - snd_soc_unregister_dai(&pdev->dev); - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - iounmap(mcpdm->io_base); - release_mem_region(res->start, resource_size(res)); - - kfree(mcpdm); return 0; } -- 1.7.8.6

2 1

Re: [alsa-devel] VIA VT2021 Support
by Paul Freeman 24 Jul '12

24 Jul '12

> If you have a luck, the codec might be somehow compatible with one of > other VIA codecs. If not, we'd need more codes. > > Please run alsa-info.sh (with --no-upload option) on that machine, > and > give the output. seems the list's SPAM filter thought the message including full alsa-info.sh output was to large.. so resorting so pastebin http://pastebin.com/7iSFm3mp

1 0

[alsa-devel] [PATCH] ASoC: wm8994: Hold runtime PM reference while handling mic and jack IRQs
by Mark Brown 24 Jul '12

24 Jul '12

Ensures that we don't interact badly with the power management framework, especially in the cases where we're doing deferred work or we're using a direct GPIO for these signals. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 09f3d2a..1abf279 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3262,10 +3262,13 @@ static void wm8994_mic_work(struct work_struct *work) int ret; int report; + pm_runtime_get_sync(dev); + ret = regmap_read(regmap, WM8994_INTERRUPT_RAW_STATUS_2, &reg); if (ret < 0) { dev_err(dev, "Failed to read microphone status: %d\n", ret); + pm_runtime_put(dev); return; } @@ -3308,6 +3311,8 @@ static void wm8994_mic_work(struct work_struct *work) snd_soc_jack_report(priv->micdet[1].jack, report, SND_JACK_HEADSET | SND_JACK_BTN_0); + + pm_runtime_put(dev); } static irqreturn_t wm8994_mic_irq(int irq, void *data) @@ -3430,12 +3435,15 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data) int reg; bool present; + pm_runtime_get_sync(codec->dev); + mutex_lock(&wm8994->accdet_lock); reg = snd_soc_read(codec, WM1811_JACKDET_CTRL); if (reg < 0) { dev_err(codec->dev, "Failed to read jack status: %d\n", reg); mutex_unlock(&wm8994->accdet_lock); + pm_runtime_put(codec->dev); return IRQ_NONE; } @@ -3500,6 +3508,7 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data) SND_JACK_MECHANICAL | SND_JACK_HEADSET | wm8994->btn_mask); + pm_runtime_put(codec->dev); return IRQ_HANDLED; } @@ -3611,6 +3620,8 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) if (!(snd_soc_read(codec, WM8958_MIC_DETECT_1) & WM8958_MICD_ENA)) return IRQ_HANDLED; + pm_runtime_get_sync(codec->dev); + /* We may occasionally read a detection without an impedence * range being provided - if that happens loop again. */ @@ -3621,6 +3632,7 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) dev_err(codec->dev, "Failed to read mic detect status: %d\n", reg); + pm_runtime_put(codec->dev); return IRQ_NONE; } @@ -3648,6 +3660,7 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) dev_warn(codec->dev, "Accessory detection with no callback\n"); out: + pm_runtime_put(codec->dev); return IRQ_HANDLED; } -- 1.7.10.4

1 0

[alsa-devel] [PATCH] ASoC: wm8994: Implement support for self-oscillation mode in the FLL
by Mark Brown 24 Jul '12

24 Jul '12

The FLLs in the WM8994 series devices can be started without any reference being supplied, mainly for use in analogue bypass cases. Implement support for this mode. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 21 +++++++++++++++------ sound/soc/codecs/wm8994.h | 9 +++++---- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 235577a..30fdcf9 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2102,6 +2102,10 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, case WM8994_FLL_SRC_LRCLK: case WM8994_FLL_SRC_BCLK: break; + case WM8994_FLL_SRC_INTERNAL: + freq_in = 12000000; + freq_out = 12000000; + break; default: return -EINVAL; } @@ -2164,9 +2168,11 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, fll.n << WM8994_FLL1_N_SHIFT); snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_5 + reg_offset, - WM8958_FLL1_BYP | + WM8994_FLL1_FRC_NCO | WM8958_FLL1_BYP | WM8994_FLL1_REFCLK_DIV_MASK | WM8994_FLL1_REFCLK_SRC_MASK, + ((src == WM8994_FLL_SRC_INTERNAL) + << WM8994_FLL1_FRC_NCO_SHIFT) | (fll.clk_ref_div << WM8994_FLL1_REFCLK_DIV_SHIFT) | (src - 1)); @@ -2192,13 +2198,16 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, } } + reg = WM8994_FLL1_ENA; + if (fll.k) - reg = WM8994_FLL1_ENA | WM8994_FLL1_FRAC; - else - reg = WM8994_FLL1_ENA; + reg |= WM8994_FLL1_FRAC; + if (src == WM8994_FLL_SRC_INTERNAL) + reg |= WM8994_FLL1_OSC_ENA; + snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_1 + reg_offset, - WM8994_FLL1_ENA | WM8994_FLL1_FRAC, - reg); + WM8994_FLL1_ENA | WM8994_FLL1_OSC_ENA | + WM8994_FLL1_FRAC, reg); if (wm8994->fll_locked_irq) { timeout = wait_for_completion_timeout(&wm8994->fll_locked[id], diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h index d77e06f..19068d8 100644 --- a/sound/soc/codecs/wm8994.h +++ b/sound/soc/codecs/wm8994.h @@ -28,10 +28,11 @@ #define WM8994_FLL1 1 #define WM8994_FLL2 2 -#define WM8994_FLL_SRC_MCLK1 1 -#define WM8994_FLL_SRC_MCLK2 2 -#define WM8994_FLL_SRC_LRCLK 3 -#define WM8994_FLL_SRC_BCLK 4 +#define WM8994_FLL_SRC_MCLK1 1 +#define WM8994_FLL_SRC_MCLK2 2 +#define WM8994_FLL_SRC_LRCLK 3 +#define WM8994_FLL_SRC_BCLK 4 +#define WM8994_FLL_SRC_INTERNAL 5 enum wm8994_vmid_mode { WM8994_VMID_NORMAL, -- 1.7.10.4

1 0