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

[alsa-devel] ASoC update for 3.3
by Mark Brown 24 Jan '12

24 Jan '12

The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f: Linux 3.3-rc1 (2012-01-19 15:04:48 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-3.3-20120124 for you to fetch changes up to c83f1d7e71625801c72f4013291194e09b6f0a6e: ASoC: wm2000: Fix use-after-free - don't release_firmware() twice on error (2012-01-24 11:34:19 +0000) ---------------------------------------------------------------- ASoC: Updates for 3.3 A bunch of small updates for drivers that accumilated during the merge window. ---------------------------------------------------------------- Fabio Estevam (1): ASoC: mxs: Fix mxs-saif timeout Jesper Juhl (2): ASoC: wm8958: Use correct format string in dev_err() call ASoC: wm2000: Fix use-after-free - don't release_firmware() twice on error Mark Brown (4): ASoC: Mark WM5100 register map cache only when going into BIAS_OFF ASoC: Don't go through cache when applying WM5100 rev A updates ASoC: Disable register synchronisation for low frequency WM8996 SYSCLK ASoC: wm8996: Call _POST_PMU callback for CPVDD Wolfram Sang (2): ASoC: tlv320aic32x4: always enable dividers ASoC: tlv320aic32x4: always enable analouge block Zeng Zhaoming (1): ASoC: sgtl5000: Fix wrong register name in restore sound/soc/codecs/sgtl5000.c | 17 +++++-- sound/soc/codecs/tlv320aic32x4.c | 110 +++++++++++++++++-------------------- sound/soc/codecs/wm2000.c | 31 +++++------ sound/soc/codecs/wm5100.c | 3 + sound/soc/codecs/wm8958-dsp2.c | 2 +- sound/soc/codecs/wm8996.c | 7 ++- sound/soc/codecs/wm8996.h | 4 ++ sound/soc/mxs/mxs-saif.c | 5 ++ 8 files changed, 96 insertions(+), 83 deletions(-)

1 0

[PATCH] sound/soc/mxs/mxs-saif.c: use devm_ functions
by Julia Lawall 24 Jan '12

24 Jan '12

From: Julia Lawall <Julia.Lawall(a)lip6.fr> The various devm_ functions allocate memory that is released when a driver detaches. This patch uses these functions for data that is allocated in the probe function of a platform device and is only freed in the remove function. By removing the need for iounmap, this also eliminates a missing iounmap problem, in the the original error handling code following a successful call to ioremap. Signed-off-by: Julia Lawall <Julia.Lawall(a)lip6.fr> --- sound/soc/mxs/mxs-saif.c | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index f204dba..7d755e0 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -630,7 +630,7 @@ static int mxs_saif_probe(struct platform_device *pdev) if (pdev->id >= ARRAY_SIZE(mxs_saif)) return -EINVAL; - saif = kzalloc(sizeof(*saif), GFP_KERNEL); + saif = devm_kzalloc(&pdev->dev, sizeof(*saif), GFP_KERNEL); if (!saif) return -ENOMEM; @@ -655,7 +655,7 @@ static int mxs_saif_probe(struct platform_device *pdev) ret = PTR_ERR(saif->clk); dev_err(&pdev->dev, "Cannot get the clock: %d\n", ret); - goto failed_clk; + return ret; } iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -666,18 +666,19 @@ static int mxs_saif_probe(struct platform_device *pdev) goto failed_get_resource; } - if (!request_mem_region(iores->start, resource_size(iores), - "mxs-saif")) { + if (!devm_request_mem_region(&pdev->dev, iores->start, + resource_size(iores), "mxs-saif")) { dev_err(&pdev->dev, "request_mem_region failed\n"); ret = -EBUSY; goto failed_get_resource; } - saif->base = ioremap(iores->start, resource_size(iores)); + saif->base = devm_ioremap(&pdev->dev, iores->start, + resource_size(iores)); if (!saif->base) { dev_err(&pdev->dev, "ioremap failed\n"); ret = -ENODEV; - goto failed_ioremap; + goto failed_get_resource; } dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0); @@ -685,7 +686,7 @@ static int mxs_saif_probe(struct platform_device *pdev) ret = -ENODEV; dev_err(&pdev->dev, "failed to get dma resource: %d\n", ret); - goto failed_ioremap; + goto failed_get_resource; } saif->dma_param.chan_num = dmares->start; @@ -694,14 +695,15 @@ static int mxs_saif_probe(struct platform_device *pdev) ret = saif->irq; dev_err(&pdev->dev, "failed to get irq resource: %d\n", ret); - goto failed_get_irq1; + goto failed_get_resource; } saif->dev = &pdev->dev; - ret = request_irq(saif->irq, mxs_saif_irq, 0, "mxs-saif", saif); + ret = devm_request_irq(&pdev->dev, saif->irq, mxs_saif_irq, 0, + "mxs-saif", saif); if (ret) { dev_err(&pdev->dev, "failed to request irq\n"); - goto failed_get_irq1; + goto failed_get_resource; } saif->dma_param.chan_irq = platform_get_irq(pdev, 1); @@ -709,7 +711,7 @@ static int mxs_saif_probe(struct platform_device *pdev) ret = saif->dma_param.chan_irq; dev_err(&pdev->dev, "failed to get dma irq resource: %d\n", ret); - goto failed_get_irq2; + goto failed_get_resource; } platform_set_drvdata(pdev, saif); @@ -717,7 +719,7 @@ static int mxs_saif_probe(struct platform_device *pdev) ret = snd_soc_register_dai(&pdev->dev, &mxs_saif_dai); if (ret) { dev_err(&pdev->dev, "register DAI failed\n"); - goto failed_register; + goto failed_get_resource; } saif->soc_platform_pdev = platform_device_alloc( @@ -740,36 +742,19 @@ failed_pdev_add: platform_device_put(saif->soc_platform_pdev); failed_pdev_alloc: snd_soc_unregister_dai(&pdev->dev); -failed_register: -failed_get_irq2: - free_irq(saif->irq, saif); -failed_get_irq1: - iounmap(saif->base); -failed_ioremap: - release_mem_region(iores->start, resource_size(iores)); failed_get_resource: clk_put(saif->clk); -failed_clk: - kfree(saif); return ret; } static int __devexit mxs_saif_remove(struct platform_device *pdev) { - struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct mxs_saif *saif = platform_get_drvdata(pdev); platform_device_unregister(saif->soc_platform_pdev); - snd_soc_unregister_dai(&pdev->dev); - - iounmap(saif->base); - release_mem_region(res->start, resource_size(res)); - free_irq(saif->irq, saif); - clk_put(saif->clk); - kfree(saif); return 0; }

1 0

[alsa-devel] [PATCH] ALSA: hda: set mute led polarity for laptops with buggy BIOS based on SSID
by Gustavo Maciel Dias Vieira 24 Jan '12

24 Jan '12

HP laptop models with buggy BIOS are apparently frequent, including machines with different codecs. Set the polarity of the mute led based on the SSID and include an entry for the HP Mini 110-3100. Signed-off-by: Gustavo Maciel Dias Vieira <gustavo(a)sagui.org> --- Takashi, is this ok? Predrag, can you test this patch? Abraços, Gustavo sound/pci/hda/patch_sigmatel.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 336cfcd..948f0be 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -4870,7 +4870,14 @@ static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity) /* BIOS bug: unfilled OEM string */ if (strstr(dev->name, "HP_Mute_LED_P_G")) { set_hp_led_gpio(codec); - spec->gpio_led_polarity = 1; + switch (codec->subsystem_id) { + case 0x103c148a: + spec->gpio_led_polarity = 0; + break; + default: + spec->gpio_led_polarity = 1; + break; + } return 1; } } -- 1.7.7.5

1 0

[alsa-devel] [PATCH] ALSA Au88x0 - Implement subdevice volume controls
by Raymond Yau 24 Jan '12

24 Jan '12

[PATCH] ALSA Au88x0 - Implement subdevice volume controls - add "PCM Playback Volume" controls for 16 playback subdevices This allow application to change the volume of each subdevice by using hardware mixer of au88x0 and default is zero gain/attenunation.

2 1

[alsa-devel] [PATCH] ALSA ymfpci - Don't create rear device, 4ch device and 4ch duplication switch when AC97 codec does not has SDAC bit
by Raymond Yau 24 Jan '12

24 Jan '12

[PATCH] ALSA ymfpci - Don't create rear device, 4ch device and 4ch duplication switch when AC97 codec does not has SDAC bit - check SDAC bit of AC97 primary codec when create "rear" device 3, "4ch" device 2 and "4ch Duplication" switch as the card need a four channels AC97 codec to support surround40.

2 1

[alsa-devel] [PATCH] sound: Fix memory leak on error in snd_compr_set_params()
by Jesper Juhl 24 Jan '12

24 Jan '12

If copy_from_user() does not return 0 we'll leak the memory we allocated for 'params' when that variable goes out of scope. Also a small CodingStyle cleanup: Use braces on both branches of if/else when one branch needs it. Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> --- sound/core/compress_offload.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index dac3633..a68aed7 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -441,19 +441,22 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg) params = kmalloc(sizeof(*params), GFP_KERNEL); if (!params) return -ENOMEM; - if (copy_from_user(params, (void __user *)arg, sizeof(*params))) - return -EFAULT; + if (copy_from_user(params, (void __user *)arg, sizeof(*params))) { + retval = -EFAULT; + goto out; + } retval = snd_compr_allocate_buffer(stream, params); if (retval) { - kfree(params); - return -ENOMEM; + retval = -ENOMEM; + goto out; } retval = stream->ops->set_params(stream, params); if (retval) goto out; stream->runtime->state = SNDRV_PCM_STATE_SETUP; - } else + } else { return -EPERM; + } out: kfree(params); return retval; -- 1.7.8.4 -- Jesper Juhl <jj(a)chaosbits.net> http://www.chaosbits.net/ Don't top-post http://www.catb.org/jargon/html/T/top-post.html Plain text mails only, please.

3 2

[alsa-devel] Hang up at .prepare( )
by Tomoya MORINAGA 24 Jan '12

24 Jan '12

Hi I've started debugging our ASoC drivers. I've faced issue when installing these drivers, system becomes hang up at async_synchronize_full_domain() of dapm_power_widgets() in .prepare(). Do you have any information about this hang up ? I show details below. ======Details============ * Procedure install codec-driver install platform-driver install machine driver echo ml26124 0x1A > /sys/bus/i2c/devices/i2c-1/new_device After this command, occur system hang up within a few seconds * Call Trees platform-driver:.open() machine-driver:.hw_params() codec-driver:.hw_params() platform-driver:.dai_hw_params() platform-driver:.hw_params() platform-driver:.prepare() platform-driver:.dai_digital_mute() platform-driver:.prepare() platform-driver:.dai_digital_mute() platform-driver:.open() machine-driver:.hw_params() codec-driver:.hw_params() platform-driver:.dai_hw_params() platform-driver:.hw_params() platform-driver:.prepare() platform-driver:.dai_digital_mute() platform-driver:.prepare() platform-driver:.dai_digital_mute() platform-driver:.hw_free platform-driver:.dai_hw_free platform-driver:.hw_free platform-driver:.dai_hw_free platform-driver:.close() platform-driver:.open() machine-driver:.hw_params() codec-driver:.hw_params() platform-driver:.dai_hw_params() platform-driver:.hw_params() platform-driver:.prepare() platform-driver:.dai_digital_mute() platform-driver:.prepare() platform-driver:.dai_digital_mute() platform-driver:.hw_free platform-driver:.dai_hw_free platform-driver:.hw_free platform-driver:.dai_hw_free platform-driver:.close() platform-driver:.hw_free platform-driver:.dai_hw_free platform-driver:.hw_free platform-driver:.dai_hw_free platform-driver:.close() platform-driver:.dai_digital_mute() platform-driver:.open() machine-driver:.hw_params() codec-driver:.hw_params() platform-driver:.dai_hw_params() platform-driver:.hw_params() platform-driver:.prepare() platform-driver:.dai_digital_mute() platform-driver:.prepare() platform-driver:.dai_digital_mute() platform-driver:.open() machine-driver:.hw_params() codec-driver:.hw_params() platform-driver:.dai_hw_params() platform-driver:.hw_params() platform-driver:.prepare() platform-driver:.dai_digital_mute() platform-driver:.prepare() platform-driver:.dai_digital_mute() platform-driver:.hw_free platform-driver:.dai_hw_free platform-driver:.hw_free platform-driver:.dai_hw_free platform-driver:.close() platform-driver:.open() machine-driver:.hw_params() codec-driver:.hw_params() platform-driver:.dai_hw_params() platform-driver:.hw_params() platform-driver:.prepare() ==> Occur system hang up. According to system log, the hang up seems occuring at async_synchronize_full_domain(), which is at soc_pcm_prepare -> soc_dapm_stream_event -> dapm_power_widgets -> async_synchronize_full_domain [2nd call] * Test condition CPU=Intel Atom E6xx series IOH=LAPIS Semiconductor ML7213 Fedora15 Kernel=3.2 thanks in advance. tomoya

2 3

[alsa-devel] ASoC: Fix use-after-free in wm2000 - don't release_firmware() twice
by Jesper Juhl 24 Jan '12

24 Jan '12

In wm2000_i2c_probe(), if we take the true branch in " ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm2000, NULL, 0); if (ret != 0) goto err_fw; " then we'll release_firmware(fw) at the 'err_fw' label. But we've already done that just a few lines above. That's a use-after-free bug. This patch restructures the code so that we always call release_firmware(fw) before leaving the function, but only ever call it once. This means that we have to initialize 'fw' to NULL since some paths may now end up calling it without having called request_firmware(), but since request_firmware() deals gracefully with NULL pointers, we are fine if we just NULL initialize it. Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> --- sound/soc/codecs/wm2000.c | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) note: Since I have no real way to test this, it is compile tested only. I believe the logic is identical, but please check my work before applying it. diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index c288090..a75c376 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -733,8 +733,9 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, struct wm2000_priv *wm2000; struct wm2000_platform_data *pdata; const char *filename; - const struct firmware *fw; - int reg, ret; + const struct firmware *fw = NULL; + int ret; + int reg; u16 id; wm2000 = devm_kzalloc(&i2c->dev, sizeof(struct wm2000_priv), @@ -751,7 +752,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, ret = PTR_ERR(wm2000->regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", ret); - goto err; + goto out; } /* Verify that this is a WM2000 */ @@ -763,7 +764,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, if (id != 0x2000) { dev_err(&i2c->dev, "Device is not a WM2000 - ID %x\n", id); ret = -ENODEV; - goto err_regmap; + goto out_regmap_exit; } reg = wm2000_read(i2c, WM2000_REG_REVISON); @@ -782,7 +783,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, ret = request_firmware(&fw, filename, &i2c->dev); if (ret != 0) { dev_err(&i2c->dev, "Failed to acquire ANC data: %d\n", ret); - goto err_regmap; + goto out_regmap_exit; } /* Pre-cook the concatenation of the register address onto the image */ @@ -793,15 +794,13 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, if (wm2000->anc_download == NULL) { dev_err(&i2c->dev, "Out of memory\n"); ret = -ENOMEM; - goto err_fw; + goto out_regmap_exit; } wm2000->anc_download[0] = 0x80; wm2000->anc_download[1] = 0x00; memcpy(wm2000->anc_download + 2, fw->data, fw->size); - release_firmware(fw); - wm2000->anc_eng_ena = 1; wm2000->anc_active = 1; wm2000->spk_ena = 1; @@ -809,18 +808,14 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, wm2000_reset(wm2000); - ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm2000, - NULL, 0); - if (ret != 0) - goto err_fw; + ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm2000, NULL, 0); + if (!ret) + goto out; - return 0; - -err_fw: - release_firmware(fw); -err_regmap: +out_regmap_exit: regmap_exit(wm2000->regmap); -err: +out: + release_firmware(fw); return ret; } -- 1.7.8.4 -- Jesper Juhl <jj(a)chaosbits.net> http://www.chaosbits.net/ Don't top-post http://www.catb.org/jargon/html/T/top-post.html Plain text mails only, please.

2 1

Re: [alsa-devel] [PATCH v4 1/5] OMAP4: hwmod: Add names for DMIC memory address space
by Peter Ujfalusi 24 Jan '12

24 Jan '12

Hi Paul, Tony, On 12/19/2011 11:51 PM, Paul Walmsley wrote: > Hi > > On Fri, 16 Dec 2011, Cousson, Benoit wrote: > >> On 12/16/2011 7:28 AM, Paul Walmsley wrote: >>> On Mon, 28 Nov 2011, Peter Ujfalusi wrote: >>> >>>> To be able to get the memory resources by name from >>>> the DMIC driver (for MPU and for DMA). >>> >>> Any comments on this one? Looks like we'd need to add these names as >>> hints in the script. >> >> Maybe not, in theory we should be able to detect the dual mapping and add the >> proper name. I did that for some other IP in the ABE domain, so it should be >> doable for that one too. >> >>>> Signed-off-by: Peter Ujfalusi<peter.ujfalusi(a)ti.com> >> >> Acked-by: Benoit Cousson <b-cousson(a)ti.com> > > Cool. Queued for when Tony wants to pull it. This patch seams to be missing from 3.3-rc1. The rest of the series is there, but because of the missing patch audio does not probe on 4430SDP/Blaze. Can you queue this as a fix for Linus? Thanks, Péter

2 2

[alsa-devel] [PATCH 1/6] hda_intel: Add Lynx Point HD Audio Controller DeviceIDs
by Seth Heasley 24 Jan '12

24 Jan '12

This patch adds the HD Audio DeviceIDs for the Intel Lynx Point PCH. Signed-off-by: Seth Heasley <seth.heasley(a)intel.com> --- sound/pci/hda/hda_intel.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 0852e20..adb4fa7 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -148,6 +148,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6}," "{Intel, PCH}," "{Intel, CPT}," "{Intel, PPT}," + "{Intel, LPT}," "{Intel, PBG}," "{Intel, SCH}," "{ATI, SB450}," @@ -2989,6 +2990,10 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { { PCI_DEVICE(0x8086, 0x1e20), .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP | AZX_DCAPS_BUFSIZE}, + /* Lynx Point */ + { PCI_DEVICE(0x8086, 0x8c20), + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP | + AZX_DCAPS_BUFSIZE}, /* SCH */ { PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP | -- 1.7.4.4

3 2