September 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 0/5] ASoC: rockchip-i2s: patches for rockchip i2s driver
by Jianqun 15 Sep '14

15 Sep '14

These patches to fix rockchip i2s driver bugs, also make driver codes reasonable. Tested on RK3288 board. Jianqun (5): ASoC: rockchip-i2s: fix rockchip i2s defination more reasonable ASoC: rockchip-i2s: fix master mode set bit error ASoC: rockchip-i2s: add dma data to snd_soc_dai ASoC: rockchip-i2s: fix registers' property of rockchip i2s controller ASoC: rockchip-i2s: enable "hclk" for rockchip I2S controller sound/soc/rockchip/Kconfig | 3 +-- sound/soc/rockchip/Makefile | 2 +- sound/soc/rockchip/rockchip_i2s.c | 41 ++++++++++++++++++++++++--------------- 3 files changed, 27 insertions(+), 19 deletions(-) -- 1.9.1

4 19

[alsa-devel] [PATCH] ASoC: rockchip-i2s: dt: swap tx and rx channed request number
by Jianqun 15 Sep '14

15 Sep '14

Reference to RK3288 TRM, fix an error channel id for i2s tx and rx Table 10-1 DMAC_BUS Request Mapping Table Req number Source Polarity 0 I2S tx High level 1 I2S rx High level Tested on RK3288 board. Signed-off-by: Jianqun <jay.xu(a)rock-chips.com> --- Documentation/devicetree/bindings/sound/rockchip-i2s.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt index 6c55fcf..9b82c20 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt +++ b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt @@ -31,7 +31,7 @@ i2s@ff890000 { #address-cells = <1>; #size-cells = <0>; dmas = <&pdma1 0>, <&pdma1 1>; - dma-names = "rx", "tx"; + dma-names = "tx", "rx"; clock-names = "i2s_hclk", "i2s_clk"; clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>; }; -- 1.9.1

3 4

[alsa-devel] [PATCH] pcm, rate: hw_avail must not be negative before starting the stream
by Alexander E. Patrakov 15 Sep '14

15 Sep '14

If it is, then it means most likely the driver problem, so we should return error immediately instead. Signed-off-by: Alexander E. Patrakov <patrakov(a)gmail.com> --- As suggested by Takashi Iwai. src/pcm/pcm_rate.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c index 736d558..c76db25 100644 --- a/src/pcm/pcm_rate.c +++ b/src/pcm/pcm_rate.c @@ -1069,7 +1069,10 @@ static int snd_pcm_rate_start(snd_pcm_t *pcm) gettimestamp(&rate->trigger_tstamp, pcm->tstamp_type); avail = snd_pcm_mmap_playback_hw_avail(rate->gen.slave); - if (avail <= 0) { + if (avail < 0) /* can't happen on healthy drivers */ + return -EBADFD; + + if (avail == 0) { /* postpone the trigger since we have no data committed yet */ rate->start_pending = 1; return 0; -- 2.1.0

1 0

[alsa-devel] question about snd_ctl_card_info_free and valgrind
by Ivica Ico Bukvic 15 Sep '14

15 Sep '14

Hi all, I have the following code snippet (excerpt from pd-l2ork's g_audio_alsa.c that was inherited from pure-data--full version available at https://github.com/pd-l2ork/pd/blob/master/pd/src/s_audio_alsa.c): if (snd_ctl_open(&ctl, devname, 0) >= 0) { snd_ctl_card_info_malloc(&info); snd_ctl_card_info(ctl, info); desc = snd_ctl_card_info_get_name(info); snd_ctl_card_info_free(info); } With the said implementation are no crashes or noticeable problems other than when ran through valgrind, I get the following error report: ==6884== Memcheck, a memory error detector ==6884== Copyright (C) 2002-2011, and GNU GPL'd, by Julian Seward et al. ==6884== Using Valgrind-3.7.0 and LibVEX; rerun with -h for copyright info ==6884== Command: pd-l2ork ==6884== ==6884== Invalid read of size 1 ==6884== at 0x719F061: vfprintf (vfprintf.c:1630) ==6884== by 0x725D263: __vsprintf_chk (vsprintf_chk.c:86) ==6884== by 0x725D1AC: __sprintf_chk (sprintf_chk.c:33) ==6884== by 0x51412D: alsa_getdevs (stdio2.h:34) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== Address 0xc1ac488 is 40 bytes inside a block of size 376 free'd ==6884== at 0x4C2A82E: free (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==6884== by 0x51410F: alsa_getdevs (s_audio_alsa.c:857) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== ==6884== Invalid read of size 1 ==6884== at 0x71CFDB8: _IO_default_xsputn (genops.c:480) ==6884== by 0x719EC31: vfprintf (vfprintf.c:1630) ==6884== by 0x725D263: __vsprintf_chk (vsprintf_chk.c:86) ==6884== by 0x725D1AC: __sprintf_chk (sprintf_chk.c:33) ==6884== by 0x51412D: alsa_getdevs (stdio2.h:34) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== Address 0xc1ac488 is 40 bytes inside a block of size 376 free'd ==6884== at 0x4C2A82E: free (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==6884== by 0x51410F: alsa_getdevs (s_audio_alsa.c:857) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== ==6884== Invalid read of size 1 ==6884== at 0x71CFDC7: _IO_default_xsputn (genops.c:479) ==6884== by 0x719EC31: vfprintf (vfprintf.c:1630) ==6884== by 0x725D263: __vsprintf_chk (vsprintf_chk.c:86) ==6884== by 0x725D1AC: __sprintf_chk (sprintf_chk.c:33) ==6884== by 0x51412D: alsa_getdevs (stdio2.h:34) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== Address 0xc1ac48a is 42 bytes inside a block of size 376 free'd ==6884== at 0x4C2A82E: free (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==6884== by 0x51410F: alsa_getdevs (s_audio_alsa.c:857) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== ==6884== Invalid read of size 1 ==6884== at 0x719F061: vfprintf (vfprintf.c:1630) ==6884== by 0x725D263: __vsprintf_chk (vsprintf_chk.c:86) ==6884== by 0x725D1AC: __sprintf_chk (sprintf_chk.c:33) ==6884== by 0x51414B: alsa_getdevs (stdio2.h:34) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== Address 0xc1ac488 is 40 bytes inside a block of size 376 free'd ==6884== at 0x4C2A82E: free (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==6884== by 0x51410F: alsa_getdevs (s_audio_alsa.c:857) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== ==6884== Invalid read of size 1 ==6884== at 0x719F061: vfprintf (vfprintf.c:1630) ==6884== by 0x725D263: __vsprintf_chk (vsprintf_chk.c:86) ==6884== by 0x725D1AC: __sprintf_chk (sprintf_chk.c:33) ==6884== by 0x51416A: alsa_getdevs (stdio2.h:34) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== Address 0xc1ac488 is 40 bytes inside a block of size 376 free'd ==6884== at 0x4C2A82E: free (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==6884== by 0x51410F: alsa_getdevs (s_audio_alsa.c:857) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== ==6884== Invalid read of size 1 ==6884== at 0x719F061: vfprintf (vfprintf.c:1630) ==6884== by 0x725D263: __vsprintf_chk (vsprintf_chk.c:86) ==6884== by 0x725D1AC: __sprintf_chk (sprintf_chk.c:33) ==6884== by 0x514192: alsa_getdevs (stdio2.h:34) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== Address 0xc1ac488 is 40 bytes inside a block of size 376 free'd ==6884== at 0x4C2A82E: free (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==6884== by 0x51410F: alsa_getdevs (s_audio_alsa.c:857) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== ==6884== Invalid read of size 8 ==6884== at 0x71CFD95: _IO_default_xsputn (genops.c:480) ==6884== by 0x719EC31: vfprintf (vfprintf.c:1630) ==6884== by 0x725D263: __vsprintf_chk (vsprintf_chk.c:86) ==6884== by 0x725D1AC: __sprintf_chk (sprintf_chk.c:33) ==6884== by 0x51412D: alsa_getdevs (stdio2.h:34) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== Address 0xc1ada58 is 40 bytes inside a block of size 376 free'd ==6884== at 0x4C2A82E: free (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==6884== by 0x51410F: alsa_getdevs (s_audio_alsa.c:857) ==6884== by 0x4D84DA: sys_set_audio_settings (s_audio.c:209) ==6884== by 0x4D156A: sys_loadpreferences (s_file.c:375) ==6884== by 0x4CD804: sys_main (s_main.c:288) ==6884== by 0x717576C: (below main) (libc-start.c:226) ==6884== The repeating error refers to the line 857 which is snd_ctl_card_info_free(info); If I read valgrind error report, it appears there is a double free (???) error taking place even though there is no other place in that code that the snd_ctl_card_info_free is being called. Now, the loop does cycle through all the available alsa devices. Could this be beccause some of them are invalid and if so, how would one go about detecting that before calling snd_ctl_card_info_free? If I comment that line (as it is currently in the linked source file on git), valgrind does not complain any more but I wonder if this means there is now a memory leak instead? Any assistance with this is most appreciated. NB: I am not an alsa dev, so my knowledge of alsa lib API is rather limited beyond what I've briefly studied to better understand the aforesaid code snippet. Best, -- Ivica Ico Bukvic, D.M.A. Associate Professor Computer Music ICAT Senior Fellow DISIS, L2Ork Virginia Tech School of Performing Arts - 0141 Blacksburg, VA 24061 (540) 231-6139 ico(a)vt.edu www.performingarts.vt.edu disis.music.vt.edu l2ork.music.vt.edu

3 2

[alsa-devel] [PATCH V3] ASoC: fsl_ssi: refine ipg clock usage in this module
by Shengjiu Wang 15 Sep '14

15 Sep '14

Check if ipg clock is in clock-names property, then we can move the ipg clock enable and disable operation to startup and shutdown, that is only enable ipg clock when ssi is working and keep clock is disabled when ssi is in idle. But when the checking is failed, remain the clock control as before. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)freescale.com> --- V3 change log: update patch according Nicolin and markus's comments sound/soc/fsl/fsl_ssi.c | 53 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 2fc3e66..6d1dfd5 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -169,6 +169,7 @@ struct fsl_ssi_private { u8 i2s_mode; bool use_dma; bool use_dual_fifo; + bool has_ipg_clk_name; unsigned int fifo_depth; struct fsl_ssi_rxtx_reg_val rxtx_reg_val; @@ -530,6 +531,11 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(rtd->cpu_dai); + int ret; + + ret = clk_prepare_enable(ssi_private->clk); + if (ret) + return ret; /* When using dual fifo mode, it is safer to ensure an even period * size. If appearing to an odd number while DMA always starts its @@ -544,6 +550,21 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream, } /** + * fsl_ssi_shutdown: shutdown the SSI + * + */ +static void fsl_ssi_shutdown(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct fsl_ssi_private *ssi_private = + snd_soc_dai_get_drvdata(rtd->cpu_dai); + + clk_disable_unprepare(ssi_private->clk); + +} + +/** * fsl_ssi_set_bclk - configure Digital Audio Interface bit clock * * Note: This function can be only called when using SSI as DAI master @@ -1043,6 +1064,7 @@ static int fsl_ssi_dai_probe(struct snd_soc_dai *dai) static const struct snd_soc_dai_ops fsl_ssi_dai_ops = { .startup = fsl_ssi_startup, + .shutdown = fsl_ssi_shutdown, .hw_params = fsl_ssi_hw_params, .hw_free = fsl_ssi_hw_free, .set_fmt = fsl_ssi_set_dai_fmt, @@ -1168,17 +1190,22 @@ static int fsl_ssi_imx_probe(struct platform_device *pdev, u32 dmas[4]; int ret; - ssi_private->clk = devm_clk_get(&pdev->dev, NULL); + if (ssi_private->has_ipg_clk_name) + ssi_private->clk = devm_clk_get(&pdev->dev, "ipg"); + else + ssi_private->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(ssi_private->clk)) { ret = PTR_ERR(ssi_private->clk); dev_err(&pdev->dev, "could not get clock: %d\n", ret); return ret; } - ret = clk_prepare_enable(ssi_private->clk); - if (ret) { - dev_err(&pdev->dev, "clk_prepare_enable failed: %d\n", ret); - return ret; + if (!ssi_private->has_ipg_clk_name) { + ret = clk_prepare_enable(ssi_private->clk); + if (ret) { + dev_err(&pdev->dev, "clk_prepare_enable failed: %d\n", ret); + return ret; + } } /* For those SLAVE implementations, we ingore non-baudclk cases @@ -1236,8 +1263,9 @@ static int fsl_ssi_imx_probe(struct platform_device *pdev, return 0; error_pcm: - clk_disable_unprepare(ssi_private->clk); + if (!ssi_private->has_ipg_clk_name) + clk_disable_unprepare(ssi_private->clk); return ret; } @@ -1246,7 +1274,8 @@ static void fsl_ssi_imx_clean(struct platform_device *pdev, { if (!ssi_private->use_dma) imx_pcm_fiq_exit(pdev); - clk_disable_unprepare(ssi_private->clk); + if (!ssi_private->has_ipg_clk_name) + clk_disable_unprepare(ssi_private->clk); } static int fsl_ssi_probe(struct platform_device *pdev) @@ -1321,8 +1350,16 @@ static int fsl_ssi_probe(struct platform_device *pdev) return -ENOMEM; } - ssi_private->regs = devm_regmap_init_mmio(&pdev->dev, iomem, + ret = of_property_match_string(np, "clock-names", "ipg"); + if (ret < 0) { + ssi_private->has_ipg_clk_name = false; + ssi_private->regs = devm_regmap_init_mmio(&pdev->dev, iomem, &fsl_ssi_regconfig); + } else { + ssi_private->has_ipg_clk_name = true; + ssi_private->regs = devm_regmap_init_mmio_clk(&pdev->dev, + "ipg", iomem, &fsl_ssi_regconfig); + } if (IS_ERR(ssi_private->regs)) { dev_err(&pdev->dev, "Failed to init register map\n"); return PTR_ERR(ssi_private->regs); -- 1.7.9.5

4 7

[alsa-devel] [PATCH] ALSA: Update document about PCM nonatomic ops
by Takashi Iwai 15 Sep '14

15 Sep '14

Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- Documentation/DocBook/writing-an-alsa-driver.tmpl | 28 +++++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl index 6f639d9530b5..784793df81ed 100644 --- a/Documentation/DocBook/writing-an-alsa-driver.tmpl +++ b/Documentation/DocBook/writing-an-alsa-driver.tmpl @@ -2742,7 +2742,9 @@ struct _snd_pcm_runtime { <para> Another note is that this callback is non-atomic - (schedulable). This is important, because the + (schedulable) as default, i.e. when no + <structfield>nonatomic</structfield> flag set. + This is important, because the <structfield>trigger</structfield> callback is atomic (non-schedulable). That is, mutexes or any schedule-related functions are not available in @@ -2900,8 +2902,9 @@ struct _snd_pcm_runtime { </para> <para> - As mentioned, this callback is atomic. You cannot call - functions which may sleep. + As mentioned, this callback is atomic as default unless + <structfield>nonatomic</structfield> flag set, and + you cannot call functions which may sleep. The trigger callback should be as minimal as possible, just really triggering the DMA. The other stuff should be initialized hw_params and prepare callbacks properly @@ -2936,7 +2939,7 @@ struct _snd_pcm_runtime { </para> <para> - This callback is also atomic. + This callback is also atomic as default. </para> </section> @@ -2972,7 +2975,7 @@ struct _snd_pcm_runtime { is useful only for such a purpose. </para> <para> - This callback is atomic. + This callback is atomic as default. </para> </section> @@ -3175,6 +3178,21 @@ struct _snd_pcm_runtime { called with local interrupts disabled. </para> + <para> + The recent changes in PCM core code, however, allow all PCM + operations to be non-atomic. This assumes that the all caller + sides are in non-atomic contexts. For example, the function + <function>snd_pcm_period_elapsed()</function> is called + typically from the interrupt handler. But, if you set up the + driver to use a threaded interrupt handler, this call can be in + non-atomic context, too. In such a case, you can set + <structfield>nonatomic</structfield> filed of + <structname>snd_pcm</structname> object after creating it. + When this flag is set, mutex and rwsem are used internally in + the PCM core instead of spin and rwlocks, so that you can call + all PCM functions safely in a non-atomic context. + </para> + </section> <section id="pcm-interface-constraints"> <title>Constraints</title> -- 2.1.0

1 0

[alsa-devel] [PATCH RFC v2 0/7] Allow multiple callbacks for hda_jack
by Takashi Iwai 15 Sep '14

15 Sep '14

Hi, here is a v2 patchset for allowing multiple callbacks for hda_jack. The difference from the previous patchset is typo fixes, more comments on the return value from snd_hda_jack_detect_enable_callback(), and the missing check of jack->jack_detect flag. Takashi

1 7

[alsa-devel] coverity fix in alsa-libs
by Renu Tyagi 15 Sep '14

15 Sep '14

Hi, I ran Coverity analysis tool on alsa and found some bugs. Bug and Patch description 1. Changed file : aserver.c Socket not closed before returning when bind fails Community Code: if (bind(sock, (struct sockaddr *) addr, size) < 0) { int result = -errno; SYSERROR("bind failed"); return result; } return sock; } Recommended Code : if (bind(sock, (struct sockaddr *) addr, size) < 0) { int result = -errno; SYSERROR("bind failed"); close(sock); return result; } return sock; } 2.Changed file : control_shm.c Socket not closed before returning when connect fails Community Code: if (connect(sock, (struct sockaddr *) addr, size) < 0) return -errno; return sock; } Recommended Code : if (connect(sock, (struct sockaddr *) addr, size) < 0){ SYSERR("connect failed"); close(sock); return -errno; } return sock; } 3.Changed file : pcm_shm.c Socket not closed before returning when connect fails Community Code: if (connect(sock, (struct sockaddr *) addr, size) < 0) { SYSERR("connect failed"); return -errno; } return sock; } Recommended Code : if (connect(sock, (struct sockaddr *) addr, size) < 0) { SYSERR("connect failed"); close(sock); return -errno; } return sock; } PFA patch. Thanks & Regards, Renu Tyagi

3 3

[alsa-devel] Possible fix for snd-hda-intel model=no-jd failing since ~linux-3.9-rc1
by Adam Richter 15 Sep '14

15 Sep '14

Hi. This is a bug and suggested temporary fix that I originally posted to the linux-sound mailing list about a month and a half ago. I am grateful to Takashi Awai for informing me after my follow-up inquiry about it today that I should submit it to the alsa-devel mailing list instead. Please feel free to redirect me further if appropriate. I did not notice any contact information for sound/pci/hda in linux-3.16-rc4/MAINATINERS. Anyhow, here is the bug report and a one line proposed temporary fix. The "model=no-jd" argument has not initialized the analog audio output jack correctly for me since linux-3.9-rc1 (if I recall correctly) through linux-3.17-rc4, although I have not tried every release candidate in between. The symptom is that, on a computer with an analog audio output jack that has incorrect jack sense (a hardware bug), audio output is completely muted until I physically replug the cable, even though I specified "model=no-jd" as an argument to the snd-hda-intel kernel module, which is supposed to cause the kernel to ignore the jack sense reported by hardware and just drive the audio output even if the hardware jack sense indicates nothing is plugged in. This problem did not occur until approximate Linux 3.9-rc1. I have found a few single line workarounds that work, of which my favorite is the following (also attached to this email, in case any mailer subjects this message to reformatting), because it does not add code to anything that gets called frequently. --- linux-3.17.0-rc4-64bit/sound/pci/hda/hda_jack.c.orig 2014-09-07 16:09:43.000000000 -0700 +++ linux-3.17.0-rc4-64bit/sound/pci/hda/hda_jack.c 2014-09-10 18:41:53.422900040 -0700 @@ -106,6 +106,7 @@ snd_hda_jack_tbl_new(struct hda_codec *c jack->nid = nid; jack->jack_dirty = 1; jack->tag = codec->jacktbl.used; + jack->phantom_jack = codec->no_jack_detect; return jack; } EXPORT_SYMBOL_GPL(snd_hda_jack_tbl_new); Signed-off-by: Adam J. Richter <adam_richter2004(a)yahoo.com> I consider this a workaround rather than than a perfect fix, because I think the underlying problem seems to be some kind of initialization order issue that I don't fully understand. Basically, by the time jack->phantom_jack was being set, some caller had already called jack_detect_update(), which loaded the incorrect jack sense result from hardware and cleared jack->jack_dirty, so the jack sense would not be set again. At least that is what I think the underlying problem probably is. Also, if a change like this is to be integrated, I'd like to know if it might be better for the line that I added to be: jack->phantom_jack = !is_jack_detectable(codec, nid); ...which is what add_jack_kctl does (not sure why add_jack_kctls does not, by the way, at the risk of making a spectacle of my ignorance). My doubt about this approach is that perhaps is_jack_detectable() relies on some initialization that has not occurred at that point. Anyhow, I'd like to get the process started of either pushing this change upstream or quickly developing a more correct fix. If a more correct fix does not become apparent in the next few days, I would recommend pushing the workaround upstream now until some future code cleanup, so people will no longer be effected by the bug. Any technical input or advice on how to proceed is welcome. Thanks for taking the time to consider this. Adam Richter

3 12

[alsa-devel] [PATCH] sound: pci: ctxfi: pr_* replaced with dev_*
by Sudip Mukherjee 15 Sep '14

15 Sep '14

pr_* macros replaced with dev_* as they are more preffered over pr_*. Signed-off-by: Sudip Mukherjee <sudip(a)vectorindia.org> --- sound/pci/ctxfi/ctamixer.c | 6 ++++-- sound/pci/ctxfi/ctatc.c | 23 ++++++++++++++--------- sound/pci/ctxfi/ctdaio.c | 3 ++- sound/pci/ctxfi/cthw20k1.c | 13 ++++++++----- sound/pci/ctxfi/cthw20k2.c | 22 ++++++++++++++-------- sound/pci/ctxfi/ctmixer.c | 6 ++++-- sound/pci/ctxfi/ctpcm.c | 3 ++- sound/pci/ctxfi/ctresource.c | 20 +++++++++++++------- sound/pci/ctxfi/ctsrc.c | 6 ++++-- sound/pci/ctxfi/xfi.c | 15 +++++++++------ 10 files changed, 74 insertions(+), 43 deletions(-) diff --git a/sound/pci/ctxfi/ctamixer.c b/sound/pci/ctxfi/ctamixer.c index fed6e6a..d08b8b6 100644 --- a/sound/pci/ctxfi/ctamixer.c +++ b/sound/pci/ctxfi/ctamixer.c @@ -258,7 +258,8 @@ static int get_amixer_rsc(struct amixer_mgr *mgr, } spin_unlock_irqrestore(&mgr->mgr_lock, flags); if (err) { - pr_err("ctxfi: Can't meet AMIXER resource request!\n"); + dev_err(&(((struct hw *)(mgr->mgr.hw))->pci->dev), + "ctxfi: Can't meet AMIXER resource request!\n"); goto error; } @@ -411,7 +412,8 @@ static int get_sum_rsc(struct sum_mgr *mgr, } spin_unlock_irqrestore(&mgr->mgr_lock, flags); if (err) { - pr_err("ctxfi: Can't meet SUM resource request!\n"); + dev_err(&(((struct hw *)(mgr->mgr.hw))->pci->dev), + "ctxfi: Can't meet SUM resource request!\n"); goto error; } diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c index d92a08c..131b8d4 100644 --- a/sound/pci/ctxfi/ctatc.c +++ b/sound/pci/ctxfi/ctatc.c @@ -1282,7 +1282,8 @@ static int atc_identify_card(struct ct_atc *atc, unsigned int ssid) p = snd_pci_quirk_lookup_id(vendor_id, device_id, list); if (p) { if (p->value < 0) { - pr_err("ctxfi: Device %04x:%04x is black-listed\n", + dev_err(&atc->pci->dev, + "ctxfi: Device %04x:%04x is black-listed\n", vendor_id, device_id); return -ENOENT; } @@ -1314,7 +1315,8 @@ int ct_atc_create_alsa_devs(struct ct_atc *atc) err = alsa_dev_funcs[i].create(atc, i, alsa_dev_funcs[i].public_name); if (err) { - pr_err("ctxfi: Creating alsa device %d failed!\n", i); + dev_err(&atc->pci->dev, + "ctxfi: Creating alsa device %d failed!\n", i); return err; } } @@ -1330,7 +1332,7 @@ static int atc_create_hw_devs(struct ct_atc *atc) err = create_hw_obj(atc->pci, atc->chip_type, atc->model, &hw); if (err) { - pr_err("Failed to create hw obj!!!\n"); + dev_err(&atc->pci->dev, "Failed to create hw obj!!!\n"); return err; } atc->hw = hw; @@ -1349,7 +1351,8 @@ static int atc_create_hw_devs(struct ct_atc *atc) err = rsc_mgr_funcs[i].create(atc->hw, &atc->rsc_mgrs[i]); if (err) { - pr_err("ctxfi: Failed to create rsc_mgr %d!!!\n", i); + dev_err(&atc->pci->dev, + "ctxfi: Failed to create rsc_mgr %d!!!\n", i); return err; } } @@ -1396,7 +1399,8 @@ static int atc_get_resources(struct ct_atc *atc) err = daio_mgr->get_daio(daio_mgr, &da_desc, (struct daio **)&atc->daios[i]); if (err) { - pr_err("ctxfi: Failed to get DAIO resource %d!!!\n", + dev_err(&atc->pci->dev, + "ctxfi: Failed to get DAIO resource %d!!!\n", i); return err; } @@ -1600,7 +1604,8 @@ static int atc_resume(struct ct_atc *atc) /* Do hardware resume. */ err = atc_hw_resume(atc); if (err < 0) { - pr_err("ctxfi: pci_enable_device failed, disabling device\n"); + dev_err(&atc->pci->dev, + "ctxfi: pci_enable_device failed, disabling device\n"); snd_card_disconnect(atc->card); return err; } @@ -1697,7 +1702,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci, /* Find card model */ err = atc_identify_card(atc, ssid); if (err < 0) { - pr_err("ctatc: Card not recognised\n"); + dev_err(&pci->dev, "ctatc: Card not recognised\n"); goto error1; } @@ -1713,7 +1718,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci, err = ct_mixer_create(atc, (struct ct_mixer **)&atc->mixer); if (err) { - pr_err("ctxfi: Failed to create mixer obj!!!\n"); + dev_err(&pci->dev, "ctxfi: Failed to create mixer obj!!!\n"); goto error1; } @@ -1740,6 +1745,6 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci, error1: ct_atc_destroy(atc); - pr_err("ctxfi: Something wrong!!!\n"); + dev_err(&pci->dev, "ctxfi: Something wrong!!!\n"); return err; } diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c index 6f0654e..fd64c95 100644 --- a/sound/pci/ctxfi/ctdaio.c +++ b/sound/pci/ctxfi/ctdaio.c @@ -541,7 +541,8 @@ static int get_daio_rsc(struct daio_mgr *mgr, err = daio_mgr_get_rsc(&mgr->mgr, desc->type); spin_unlock_irqrestore(&mgr->mgr_lock, flags); if (err) { - pr_err("Can't meet DAIO resource request!\n"); + dev_err(&(((struct hw *)(mgr->mgr.hw))->pci->dev), + "Can't meet DAIO resource request!\n"); return err; } diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c index 71d496f..a3d1dda 100644 --- a/sound/pci/ctxfi/cthw20k1.c +++ b/sound/pci/ctxfi/cthw20k1.c @@ -1268,7 +1268,8 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info) /* Set up device page table */ if ((~0UL) == info->vm_pgt_phys) { - pr_err("Wrong device page table page address!\n"); + dev_err(&hw->pci->dev, + "Wrong device page table page address!\n"); return -1; } @@ -1327,7 +1328,7 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr) mdelay(40); } if (i >= 3) { - pr_alert("PLL initialization failed!!!\n"); + dev_alert(&hw->pci->dev, "PLL initialization failed!!!\n"); return -EBUSY; } @@ -1351,7 +1352,7 @@ static int hw_auto_init(struct hw *hw) break; } if (!get_field(gctl, GCTL_AID)) { - pr_alert("Card Auto-init failed!!!\n"); + dev_alert(&hw->pci->dev, "Card Auto-init failed!!!\n"); return -EBUSY; } @@ -1911,7 +1912,8 @@ static int hw_card_start(struct hw *hw) /* Set DMA transfer mask */ if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 || pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) { - pr_err("architecture does not support PCI busmaster DMA with mask 0x%llx\n", + dev_err(&pci->dev, + "architecture does not support PCI busmaster DMA with mask 0x%llx\n", CT_XFI_DMA_MASK); err = -ENXIO; goto error1; @@ -1941,7 +1943,8 @@ static int hw_card_start(struct hw *hw) err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED, KBUILD_MODNAME, hw); if (err < 0) { - pr_err("XFi: Cannot get irq %d\n", pci->irq); + dev_err(&pci->dev, "XFi: Cannot get irq %d\n", + pci->irq); goto error2; } hw->irq = pci->irq; diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c index df2d8c5..a65f3bb 100644 --- a/sound/pci/ctxfi/cthw20k2.c +++ b/sound/pci/ctxfi/cthw20k2.c @@ -1187,7 +1187,8 @@ static int hw_daio_init(struct hw *hw, const struct daio_conf *info) hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x21212121); hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0); } else { - pr_alert("ctxfi: ERROR!!! Invalid sampling rate!!!\n"); + dev_alert(&hw->pci->dev, + "ctxfi: ERROR!!! Invalid sampling rate!!!\n"); return -EINVAL; } @@ -1246,7 +1247,8 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info) /* Set up device page table */ if ((~0UL) == info->vm_pgt_phys) { - pr_alert("ctxfi: Wrong device page table page address!!!\n"); + dev_alert(&hw->pci->dev, + "ctxfi: Wrong device page table page address!!!\n"); return -1; } @@ -1351,7 +1353,8 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr) break; } if (i >= 1000) { - pr_alert("ctxfi: PLL initialization failed!!!\n"); + dev_alert(&hw->pci->dev, + "ctxfi: PLL initialization failed!!!\n"); return -EBUSY; } @@ -1375,7 +1378,7 @@ static int hw_auto_init(struct hw *hw) break; } if (!get_field(gctl, GCTL_AID)) { - pr_alert("ctxfi: Card Auto-init failed!!!\n"); + dev_alert(&hw->pci->dev, "ctxfi: Card Auto-init failed!!!\n"); return -EBUSY; } @@ -1846,7 +1849,7 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info) /* Initialize I2C */ err = hw20k2_i2c_init(hw, 0x1A, 1, 1); if (err < 0) { - pr_alert("ctxfi: Failure to acquire I2C!!!\n"); + dev_alert(&hw->pci->dev, "ctxfi: Failure to acquire I2C!!!\n"); goto error; } @@ -1889,7 +1892,8 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info) hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_MMC, 0x0A), MAKE_WM8775_DATA(0x0A)); } else { - pr_alert("ctxfi: Invalid master sampling rate (msr %d)!!!\n", + dev_alert(&hw->pci->dev, + "ctxfi: Invalid master sampling rate (msr %d)!!!\n", info->msr); err = -EINVAL; goto error; @@ -2033,7 +2037,8 @@ static int hw_card_start(struct hw *hw) /* Set DMA transfer mask */ if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 || pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) { - pr_err("ctxfi: architecture does not support PCI busmaster DMA with mask 0x%llx\n", + dev_err(&pci->dev, + "ctxfi: architecture does not support PCI busmaster DMA with mask 0x%llx\n", CT_XFI_DMA_MASK); err = -ENXIO; goto error1; @@ -2062,7 +2067,8 @@ static int hw_card_start(struct hw *hw) err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED, KBUILD_MODNAME, hw); if (err < 0) { - pr_err("XFi: Cannot get irq %d\n", pci->irq); + dev_err(&pci->dev, "XFi: Cannot get irq %d\n", + pci->irq); goto error2; } hw->irq = pci->irq; diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c index 017fa91..6807ff1fc 100644 --- a/sound/pci/ctxfi/ctmixer.c +++ b/sound/pci/ctxfi/ctmixer.c @@ -854,7 +854,8 @@ static int ct_mixer_get_resources(struct ct_mixer *mixer) for (i = 0; i < (NUM_CT_SUMS * CHN_NUM); i++) { err = sum_mgr->get_sum(sum_mgr, &sum_desc, &sum); if (err) { - pr_err("ctxfi:Failed to get sum resources for front output!\n"); + dev_err(&mixer->atc->pci->dev, + "ctxfi:Failed to get sum resources for front output!\n"); break; } mixer->sums[i] = sum; @@ -868,7 +869,8 @@ static int ct_mixer_get_resources(struct ct_mixer *mixer) for (i = 0; i < (NUM_CT_AMIXERS * CHN_NUM); i++) { err = amixer_mgr->get_amixer(amixer_mgr, &am_desc, &amixer); if (err) { - pr_err("ctxfi:Failed to get amixer resources for mixer obj!\n"); + dev_err(&mixer->atc->pci->dev, + "ctxfi:Failed to get amixer resources for mixer obj!\n"); break; } mixer->amixers[i] = amixer; diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c index 6826c2c..48f58a5 100644 --- a/sound/pci/ctxfi/ctpcm.c +++ b/sound/pci/ctxfi/ctpcm.c @@ -435,7 +435,8 @@ int ct_alsa_pcm_create(struct ct_atc *atc, err = snd_pcm_new(atc->card, "ctxfi", device, playback_count, capture_count, &pcm); if (err < 0) { - pr_err("ctxfi: snd_pcm_new failed!! Err=%d\n", err); + dev_err(&atc->pci->dev, "ctxfi: snd_pcm_new failed!! Err=%d\n", + err); return err; } diff --git a/sound/pci/ctxfi/ctresource.c b/sound/pci/ctxfi/ctresource.c index e49d2be..80beecb 100644 --- a/sound/pci/ctxfi/ctresource.c +++ b/sound/pci/ctxfi/ctresource.c @@ -162,12 +162,14 @@ int rsc_init(struct rsc *rsc, u32 idx, enum RSCTYP type, u32 msr, void *hw) case DAIO: break; default: - pr_err("ctxfi: Invalid resource type value %d!\n", type); + dev_err(&(((struct hw *)hw)->pci->dev), + "ctxfi: Invalid resource type value %d!\n", type); return -EINVAL; } if (err) { - pr_err("ctxfi: Failed to get resource control block!\n"); + dev_err(&(((struct hw *)hw)->pci->dev), + "ctxfi: Failed to get resource control block!\n"); return err; } @@ -190,7 +192,8 @@ int rsc_uninit(struct rsc *rsc) case DAIO: break; default: - pr_err("ctxfi: Invalid resource type value %d!\n", + dev_err(&(((struct hw *)rsc->hw)->pci->dev), + "ctxfi: Invalid resource type value %d!\n", rsc->type); break; } @@ -233,13 +236,15 @@ int rsc_mgr_init(struct rsc_mgr *mgr, enum RSCTYP type, case SUM: break; default: - pr_err("ctxfi: Invalid resource type value %d!\n", type); + dev_err(&hw->pci->dev, + "ctxfi: Invalid resource type value %d!\n", type); err = -EINVAL; goto error; } if (err) { - pr_err("ctxfi: Failed to get manager control block!\n"); + dev_err(&hw->pci->dev, + "ctxfi: Failed to get manager control block!\n"); goto error; } @@ -282,8 +287,9 @@ int rsc_mgr_uninit(struct rsc_mgr *mgr) case SUM: break; default: - pr_err("ctxfi: Invalid resource type value %d!\n", - mgr->type); + dev_err(&(((struct hw *)mgr->hw)->pci->dev), + "ctxfi: Invalid resource type value %d!\n", + mgr->type); break; } diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c index 19df9b4..3a6e398 100644 --- a/sound/pci/ctxfi/ctsrc.c +++ b/sound/pci/ctxfi/ctsrc.c @@ -431,7 +431,8 @@ get_src_rsc(struct src_mgr *mgr, const struct src_desc *desc, struct src **rsrc) spin_unlock_irqrestore(&mgr->mgr_lock, flags); if (err) { - pr_err("ctxfi: Can't meet SRC resource request!\n"); + dev_err(&(((struct hw *)(mgr->mgr.hw))->pci->dev), + "ctxfi: Can't meet SRC resource request!\n"); return err; } @@ -739,7 +740,8 @@ static int get_srcimp_rsc(struct srcimp_mgr *mgr, } spin_unlock_irqrestore(&mgr->mgr_lock, flags); if (err) { - pr_err("ctxfi: Can't meet SRCIMP resource request!\n"); + dev_err(&(((struct hw *)(mgr->mgr.hw))->pci->dev), + "ctxfi: Can't meet SRCIMP resource request!\n"); goto error1; } diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c index 35e85ba..10c7896 100644 --- a/sound/pci/ctxfi/xfi.c +++ b/sound/pci/ctxfi/xfi.c @@ -76,15 +76,18 @@ ct_card_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) if (err) return err; if ((reference_rate != 48000) && (reference_rate != 44100)) { - pr_err("ctxfi: Invalid reference_rate value %u!!!\n", - reference_rate); - pr_err("ctxfi: The valid values for reference_rate are 48000 and 44100, Value 48000 is assumed.\n"); + dev_err(&pci->dev, + "ctxfi: Invalid reference_rate value %u!!\n", + reference_rate); + dev_err(&pci->dev, + "ctxfi: The valid values for reference_rate are 48000 and 44100, Value 48000 is assumed.\n"); reference_rate = 48000; } if ((multiple != 1) && (multiple != 2) && (multiple != 4)) { - pr_err("ctxfi: Invalid multiple value %u!!!\n", - multiple); - pr_err("ctxfi: The valid values for multiple are 1, 2 and 4, Value 2 is assumed.\n"); + dev_err(&pci->dev, "ctxfi: Invalid multiple value %u!!!\n", + multiple); + dev_err(&pci->dev, + "ctxfi: The valid values for multiple are 1, 2 and 4, Value 2 is assumed.\n"); multiple = 2; } err = ct_atc_create(card, pci, reference_rate, multiple, -- 1.8.1.2

2 1