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

[alsa-devel] sound/pci/hda/hda_generic.c:1529 indep_hp_put() warn: inconsistent returns mutex:&spec->pcm_mutex: locked (1526) unlocked (1517, 1529)
by Fengguang Wu 12 Jan '13

12 Jan '13

Hi Takashi, FYI, there are new smatch warnings show up in tree: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-unstable.git master head: 02e5aa7b459f69538d4ec88658d064816a7692d6 commit: a5de6f4d021608c50ff5ff51d208b5030da92957 ALSA: hda - Implement independent HP control date: 33 hours ago sound/pci/hda/hda_generic.c:1529 indep_hp_put() warn: inconsistent returns mutex:&spec->pcm_mutex: locked (1526) unlocked (1517,1529) vim +1529 sound/pci/hda/hda_generic.c a5de6f4d Takashi Iwai 2012-12-21 1511 struct hda_gen_spec *spec = codec->spec; a5de6f4d Takashi Iwai 2012-12-21 1512 unsigned int select = ucontrol->value.enumerated.item[0]; a5de6f4d Takashi Iwai 2012-12-21 1513 a5de6f4d Takashi Iwai 2012-12-21 1514 mutex_lock(&spec->pcm_mutex); a5de6f4d Takashi Iwai 2012-12-21 1515 if (spec->active_streams) { a5de6f4d Takashi Iwai 2012-12-21 1516 mutex_unlock(&spec->pcm_mutex); a5de6f4d Takashi Iwai 2012-12-21 @1517 return -EBUSY; a5de6f4d Takashi Iwai 2012-12-21 1518 } a5de6f4d Takashi Iwai 2012-12-21 1519 a5de6f4d Takashi Iwai 2012-12-21 1520 if (spec->indep_hp_enabled != select) { a5de6f4d Takashi Iwai 2012-12-21 1521 spec->indep_hp_enabled = select; a5de6f4d Takashi Iwai 2012-12-21 1522 if (spec->indep_hp_enabled) a5de6f4d Takashi Iwai 2012-12-21 1523 spec->multiout.hp_out_nid[0] = 0; a5de6f4d Takashi Iwai 2012-12-21 1524 else a5de6f4d Takashi Iwai 2012-12-21 1525 spec->multiout.hp_out_nid[0] = spec->alt_dac_nid; a5de6f4d Takashi Iwai 2012-12-21 @1526 return 1; a5de6f4d Takashi Iwai 2012-12-21 1527 } a5de6f4d Takashi Iwai 2012-12-21 1528 mutex_unlock(&spec->pcm_mutex); a5de6f4d Takashi Iwai 2012-12-21 @1529 return 0; a5de6f4d Takashi Iwai 2012-12-21 1530 } a5de6f4d Takashi Iwai 2012-12-21 1531 a5de6f4d Takashi Iwai 2012-12-21 1532 static const struct snd_kcontrol_new indep_hp_ctl = { --- 0-DAY kernel build testing backend Open Source Technology Center Fengguang Wu, Yuanhan Liu Intel Corporation

1 0

[alsa-devel] sound/pci/hda/hda_codec.c:3433 snd_hda_codec_write_cache() error: we previously assumed 'c' could be null (see line 3430)
by Fengguang Wu 12 Jan '13

12 Jan '13

Hi Takashi, FYI, there are new smatch warnings show up in tree: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-unstable.git master head: 02e5aa7b459f69538d4ec88658d064816a7692d6 commit: 95836563e7f636fc57732f5e687ca2f170eb674f ALSA: hda - Introduce cache & flush cmd / amp writes date: 33 hours ago sound/pci/hda/hda_codec.c:3433 snd_hda_codec_write_cache() error: we previously assumed 'c' could be null (see line 3430) vim +/c +3433 sound/pci/hda/hda_codec.c aa2936f5 Takashi Iwai 2009-05-26 3424 /* parm may contain the verb stuff for get/set amp */ aa2936f5 Takashi Iwai 2009-05-26 3425 verb = verb | (parm >> 8); aa2936f5 Takashi Iwai 2009-05-26 3426 parm &= 0xff; aa2936f5 Takashi Iwai 2009-05-26 3427 key = build_cmd_cache_key(nid, verb); aa2936f5 Takashi Iwai 2009-05-26 3428 mutex_lock(&codec->bus->cmd_mutex); aa2936f5 Takashi Iwai 2009-05-26 3429 c = get_alloc_hash(&codec->cmd_cache, key); aa2936f5 Takashi Iwai 2009-05-26 @3430 if (c) aa2936f5 Takashi Iwai 2009-05-26 3431 c->val = parm; 95836563 Takashi Iwai 2012-12-13 3432 if (codec->cached_write) 95836563 Takashi Iwai 2012-12-13 @3433 c->dirty = 1; aa2936f5 Takashi Iwai 2009-05-26 3434 mutex_unlock(&codec->bus->cmd_mutex); aa2936f5 Takashi Iwai 2009-05-26 3435 return 0; b3ac5636 Takashi Iwai 2007-08-10 3436 } --- 0-DAY kernel build testing backend Open Source Technology Center Fengguang Wu, Yuanhan Liu Intel Corporation

1 0

[alsa-devel] [RESEND PATCH] ASoC: OMAP: HDMI: Initialize IEC-60958 channel status word
by Ricardo Neri 12 Jan '13

12 Jan '13

As the IEC-60958 channel status word is set by ANDing and ORing with the appropriate definitions, the word bytes need to be initialized to zero to avoid misconfiguration due to previous hw_params calls. Signed-off-by: Ricardo Neri <rneri(a)dextratech.com> --- sound/soc/omap/omap-hdmi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c index f59c69f..75ad378 100644 --- a/sound/soc/omap/omap-hdmi.c +++ b/sound/soc/omap/omap-hdmi.c @@ -110,6 +110,8 @@ static int omap_hdmi_dai_hw_params(struct snd_pcm_substream *substream, /* * fill the IEC-60958 channel status word */ + /* initialize the word bytes */ + memset(iec->status, 0, sizeof(iec->status)); /* specify IEC-60958-3 (commercial use) */ iec->status[0] &= ~IEC958_AES0_PROFESSIONAL; -- 1.7.10.4

2 2

[alsa-devel] [patch] ASoC: pcm: delete some dead code
by Dan Carpenter 12 Jan '13

12 Jan '13

I've removed several unreachable returns. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index cf191e6..1d6af4d 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1729,20 +1729,16 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream) /* startup must always be called for new BEs */ ret = dpcm_be_dai_startup(fe, stream); - if (ret < 0) { + if (ret < 0) goto disconnect; - return ret; - } /* keep going if FE state is > open */ if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_OPEN) return 0; ret = dpcm_be_dai_hw_params(fe, stream); - if (ret < 0) { + if (ret < 0) goto close; - return ret; - } /* keep going if FE state is > hw_params */ if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_HW_PARAMS) @@ -1750,10 +1746,8 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream) ret = dpcm_be_dai_prepare(fe, stream); - if (ret < 0) { + if (ret < 0) goto hw_free; - return ret; - } /* run the stream event for each BE */ dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_NOP);

2 1

[alsa-devel] [PATCH] ASoC: fsl: fix multiple definition of init_module
by Shawn Guo 12 Jan '13

12 Jan '13

With commit f2818d0 (ASoC: fsl: fix miscompilation of snd-soc-imx-pcm), we will see the following build error when building modules with CONFIG_SND_IMX_SOC=m in imx_v6_v7_defconfig. CC [M] sound/soc/fsl/phycore-ac97.o LD [M] sound/soc/fsl/snd-soc-fsl-ssi.o LD [M] sound/soc/fsl/snd-soc-fsl-utils.o LD [M] sound/soc/fsl/snd-soc-imx-ssi.o LD [M] sound/soc/fsl/snd-soc-imx-audmux.o LD [M] sound/soc/fsl/snd-soc-imx-pcm.o sound/soc/fsl/imx-pcm-dma.o: In function `init_module': imx-pcm-dma.c:(.init.text+0x0): multiple definition of `init_module' sound/soc/fsl/imx-pcm-fiq.o:imx-pcm-fiq.c:(.init.text+0x0): first defined here sound/soc/fsl/imx-pcm-dma.o: In function `cleanup_module': imx-pcm-dma.c:(.exit.text+0x0): multiple definition of `cleanup_module' sound/soc/fsl/imx-pcm-fiq.o:imx-pcm-fiq.c:(.exit.text+0x0): first defined here make[4]: *** [sound/soc/fsl/snd-soc-imx-pcm.o] Error 1 Instead of using bool for SND_SOC_IMX_PCM_FIQ and SND_SOC_IMX_PCM_DMA to fix the original issue, we should completely remove SND_SOC_IMX_PCM and have imx-pcm.o statically linked with imx-pcm-fiq.o or imx-pcm-dma.o. Signed-off-by: Shawn Guo <shawn.guo(a)linaro.org> --- Mark, To be clear, I think it's a v3.8 material. Shawn sound/soc/fsl/Kconfig | 9 ++------- sound/soc/fsl/Makefile | 5 ++++- sound/soc/fsl/imx-pcm.c | 3 --- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 3b98159..a210c8d 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -108,18 +108,13 @@ if SND_IMX_SOC config SND_SOC_IMX_SSI tristate -config SND_SOC_IMX_PCM - tristate - config SND_SOC_IMX_PCM_FIQ - bool + tristate select FIQ - select SND_SOC_IMX_PCM config SND_SOC_IMX_PCM_DMA - bool + tristate select SND_SOC_DMAENGINE_PCM - select SND_SOC_IMX_PCM config SND_SOC_IMX_AUDMUX tristate diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index afd3479..ec14579 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile @@ -41,7 +41,10 @@ endif obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o -obj-$(CONFIG_SND_SOC_IMX_PCM) += snd-soc-imx-pcm.o +obj-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += snd-soc-imx-pcm-fiq.o +snd-soc-imx-pcm-fiq-y := imx-pcm-fiq.o imx-pcm.o +obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += snd-soc-imx-pcm-dma.o +snd-soc-imx-pcm-dma-y := imx-pcm-dma.o imx-pcm.o # i.MX Machine Support snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o diff --git a/sound/soc/fsl/imx-pcm.c b/sound/soc/fsl/imx-pcm.c index d5cd9ef..0c9f188 100644 --- a/sound/soc/fsl/imx-pcm.c +++ b/sound/soc/fsl/imx-pcm.c @@ -31,7 +31,6 @@ int snd_imx_pcm_mmap(struct snd_pcm_substream *substream, runtime->dma_bytes); return ret; } -EXPORT_SYMBOL_GPL(snd_imx_pcm_mmap); static int imx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) { @@ -80,7 +79,6 @@ int imx_pcm_new(struct snd_soc_pcm_runtime *rtd) out: return ret; } -EXPORT_SYMBOL_GPL(imx_pcm_new); void imx_pcm_free(struct snd_pcm *pcm) { @@ -102,7 +100,6 @@ void imx_pcm_free(struct snd_pcm *pcm) buf->area = NULL; } } -EXPORT_SYMBOL_GPL(imx_pcm_free); MODULE_DESCRIPTION("Freescale i.MX PCM driver"); MODULE_AUTHOR("Sascha Hauer <s.hauer(a)pengutronix.de>"); -- 1.7.9.5

2 1

[alsa-devel] [PATCH v2 0/5] ASoC: twl6040: Updates for 3.9
by Peter Ujfalusi 12 Jan '13

12 Jan '13

Hi Mark, Liam, Changes since v1: - patch 2 for twl6040_resume() has been replaced with a simpler one Cover letter from v1: Small fixe from Misael for twl6040 codec driver and devm_* conversion, switch to system workqueue and dead code removal. Regards, Peter --- Misael Lopez Cruz (1): ASoC: twl6040: Convert PLUGINT to no-suspend irq Peter Ujfalusi (4): ASoC: twl6040: Only set the bias_level once in twl6040_resume() ASoC: twl6040: Convert to use devm_* when possible ASoC: twl6040: Switch to use system workqueue for jack reporting ASoC: twl6040: Remove leftover code from hs/hf ramp implementation sound/soc/codecs/twl6040.c | 62 +++++++--------------------------------------- 1 file changed, 9 insertions(+), 53 deletions(-) -- 1.8.1

2 6

[alsa-devel] [PATCH] ASoC: twl4030: Remove suspend/resume soc driver operations
by Peter Ujfalusi 12 Jan '13

12 Jan '13

With idle_bias_off these are no longer needed. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- sound/soc/codecs/twl4030.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 63b280b..5611b7b 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -2267,18 +2267,6 @@ static struct snd_soc_dai_driver twl4030_dai[] = { }, }; -static int twl4030_soc_suspend(struct snd_soc_codec *codec) -{ - twl4030_set_bias_level(codec, SND_SOC_BIAS_OFF); - return 0; -} - -static int twl4030_soc_resume(struct snd_soc_codec *codec) -{ - twl4030_set_bias_level(codec, SND_SOC_BIAS_STANDBY); - return 0; -} - static int twl4030_soc_probe(struct snd_soc_codec *codec) { struct twl4030_priv *twl4030; @@ -2316,8 +2304,6 @@ static int twl4030_soc_remove(struct snd_soc_codec *codec) static struct snd_soc_codec_driver soc_codec_dev_twl4030 = { .probe = twl4030_soc_probe, .remove = twl4030_soc_remove, - .suspend = twl4030_soc_suspend, - .resume = twl4030_soc_resume, .read = twl4030_read_reg_cache, .write = twl4030_write, .set_bias_level = twl4030_set_bias_level, -- 1.8.1

2 1

Re: [alsa-devel] [PATCH v2 06/10] ASoC: tegra: remove auxdata
by Stephen Warren 11 Jan '13

11 Jan '13

On 01/11/2013 01:01 AM, Prashant Gaikwad wrote: > Configlink clock information is added to device tree. Get the clocks > using device node. Remove AUXDATA. Cc'ing in the ASoC maintainers as an FYI and for Acks; this patch needs to go through the Tegra tree due to dependencies. > > Signed-off-by: Prashant Gaikwad <pgaikwad(a)nvidia.com> > --- > sound/soc/tegra/tegra30_ahub.c | 14 ++------------ > 1 files changed, 2 insertions(+), 12 deletions(-) > > diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c > index bb31c41..2355630 100644 > --- a/sound/soc/tegra/tegra30_ahub.c > +++ b/sound/soc/tegra/tegra30_ahub.c > @@ -299,15 +299,6 @@ static const char * const configlink_clocks[] = { > "spdif_in", > }; > > -struct of_dev_auxdata ahub_auxdata[] = { > - OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080300, "tegra30-i2s.0", NULL), > - OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080400, "tegra30-i2s.1", NULL), > - OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080500, "tegra30-i2s.2", NULL), > - OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080600, "tegra30-i2s.3", NULL), > - OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080700, "tegra30-i2s.4", NULL), > - {} > -}; > - > #define LAST_REG(name) \ > (TEGRA30_AHUB_##name + \ > (TEGRA30_AHUB_##name##_STRIDE * TEGRA30_AHUB_##name##_COUNT) - 4) > @@ -451,7 +442,7 @@ static int tegra30_ahub_probe(struct platform_device *pdev) > * Ensure that here. > */ > for (i = 0; i < ARRAY_SIZE(configlink_clocks); i++) { > - clk = clk_get_sys(NULL, configlink_clocks[i]); > + clk = clk_get(&pdev->dev, configlink_clocks[i]); > if (IS_ERR(clk)) { > dev_err(&pdev->dev, "Can't get clock %s\n", > configlink_clocks[i]); > @@ -569,8 +560,7 @@ static int tegra30_ahub_probe(struct platform_device *pdev) > goto err_pm_disable; > } > > - of_platform_populate(pdev->dev.of_node, NULL, ahub_auxdata, > - &pdev->dev); > + of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); > > return 0; > >

2 1

[alsa-devel] [PATCH 0/5] ASoC: twl6040: Updates for 3.9
by Peter Ujfalusi 11 Jan '13

11 Jan '13

Hi Mark, Liam, Small fixes from Misael for twl6040 codec driver and devm_* conversion, switch to system workqueue and dead code removal. Regards, Peter --- Misael Lopez Cruz (2): ASoC: twl6040: Convert PLUGINT to no-suspend irq ASoC: twl6040: Prevent extra power transitions during resume Peter Ujfalusi (3): ASoC: twl6040: Convert to use devm_* when possible ASoC: twl6040: Switch to use system workqueue for jack reporting ASoC: twl6040: Remove leftover code from hs/hf ramp implementation sound/soc/codecs/twl6040.c | 67 +++++++++------------------------------------- 1 file changed, 13 insertions(+), 54 deletions(-) -- 1.8.1

2 12

Re: [alsa-devel] Oops in sound/usb/pcm.c:match_endpoint_audioformats() in current -git
by Takashi Iwai 11 Jan '13

11 Jan '13

At Fri, 11 Jan 2013 08:47:25 +0100, Jens Axboe wrote: > > On 2013-01-10 21:19, Takashi Iwai wrote: > > From: Takashi Iwai <tiwai(a)suse.de> > > Subject: [PATCH v2] ALSA: usb-audio: Fix NULL dereference by access to > > non-existing substream > > > > The commit [0d9741c0: ALSA: usb-audio: sync ep init fix for > > audioformat mismatch] introduced the correction of parameters to be > > set for sync EP. But since the new code assumes that the sync EP is > > always paired with the data EP of another direction, it triggers Oops > > when a device only with a single direction is used. > > > > This patch adds a proper check of sync EP type and the presence of the > > paired substream for avoiding the crash. > > > > Reported-by: Jens Axboe <axboe(a)kernel.dk> > > Signed-off-by: Takashi Iwai <tiwai(a)suse.de> > > Confirmed, it works. You can add my tested-by too. Thanks Takashi! Thanks for quick testing. Applied it now. Takashi

1 0