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

[alsa-devel] [PATCH v5 1/1] ASoc: kirkwood: add DT support to the mvebu audio subsystem
by Jean-Francois Moine 22 Aug '13

22 Aug '13

This patch adds DT support to the audio subsystem of the mvebu family (Kirkwood, Dove, Armada 370). Signed-off-by: Jean-Francois Moine <moinejf(a)free.fr> --- This patch does not add any new function as S/PDIF or DPCM support. --- .../devicetree/bindings/sound/mvebu-audio.txt | 29 ++++++++++++++++++++++ sound/soc/kirkwood/kirkwood-i2s.c | 26 +++++++++++++++++----- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/mvebu-audio.txt b/Documentation/devicetree/bindings/sound/mvebu-audio.txt new file mode 100644 index 0000000..7e5fd37 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/mvebu-audio.txt @@ -0,0 +1,29 @@ +* mvebu (Kirkwood, Dove, Armada 370) audio controller + +Required properties: + +- compatible: "marvell,mvebu-audio" + +- reg: physical base address of the controller and length of memory mapped + region. + +- interrupts: list of two irq numbers. + The first irq is used for data flow and the second one is used for errors. + +- clocks: one or two phandles. + The first one is mandatory and defines the internal clock. + The second one is optional and defines an external clock. + +- clock-names: names associated to the clocks: + "internal" for the internal clock + "extclk" for the external clock + +Example: + +i2s1: audio-controller@b4000 { + compatible = "marvell,mvebu-audio"; + reg = <0xb4000 0x2210>; + interrupts = <21>, <22>; + clocks = <&gate_clk 13>; + clock-names = "internal"; +}; diff --git a/sound/soc/kirkwood/kirkwood-i2s.c.next b/sound/soc/kirkwood/kirkwood-i2s.c index e5f3f7a..a4170b4 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c.next +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -22,6 +22,8 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <linux/platform_data/asoc-kirkwood.h> +#include <linux/of.h> + #include "kirkwood.h" #define DRV_NAME "mvebu-audio" @@ -453,6 +455,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) struct snd_soc_dai_driver *soc_dai = &kirkwood_i2s_dai; struct kirkwood_dma_data *priv; struct resource *mem; + struct device_node *np = pdev->dev.of_node; int err; priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); @@ -473,14 +476,16 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) return -ENXIO; } - if (!data) { - dev_err(&pdev->dev, "no platform data ?!\n"); + if (np) { + priv->burst = 128; /* might be 32 or 128 */ + } else if (data) { + priv->burst = data->burst; + } else { + dev_err(&pdev->dev, "no DT nor platform data ?!\n"); return -EINVAL; } - priv->burst = data->burst; - - priv->clk = devm_clk_get(&pdev->dev, NULL); + priv->clk = devm_clk_get(&pdev->dev, np ? "internal" : NULL); if (IS_ERR(priv->clk)) { dev_err(&pdev->dev, "no clock\n"); return PTR_ERR(priv->clk); @@ -507,7 +512,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) priv->ctl_rec = KIRKWOOD_RECCTL_SIZE_24; /* Select the burst size */ - if (data->burst == 32) { + if (priv->burst == 32) { priv->ctl_play |= KIRKWOOD_PLAYCTL_BURST_32; priv->ctl_rec |= KIRKWOOD_RECCTL_BURST_32; } else { @@ -552,12 +557,21 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static struct of_device_id mvebu_audio_of_match[] = { + { .compatible = "marvell,mvebu-audio" }, + { } +}; +MODULE_DEVICE_TABLE(of, mvebu_audio_of_match); +#endif + static struct platform_driver kirkwood_i2s_driver = { .probe = kirkwood_i2s_dev_probe, .remove = kirkwood_i2s_dev_remove, .driver = { .name = DRV_NAME, .owner = THIS_MODULE, + .of_match_table = of_match_ptr(mvebu_audio_of_match), }, }; -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/

2 1

[alsa-devel] [PATCH] ASoC: samsung: Fix build error with dma function rename
by Tushar Behera 22 Aug '13

22 Aug '13

commit 85ff3c29d720 ("ASoC: samsung: Rename DMA platform registration functions") renames the DMA registration functions. Fix the places where it was left out. Signed-off-by: Tushar Behera <tushar.behera(a)linaro.org> --- sound/soc/samsung/pcm.c | 4 ++-- sound/soc/samsung/s3c2412-i2s.c | 4 ++-- sound/soc/samsung/s3c24xx-i2s.c | 4 ++-- sound/soc/samsung/spdif.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 1566afe..e54256f 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -594,7 +594,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) goto err5; } - ret = asoc_dma_platform_register(&pdev->dev); + ret = samsung_asoc_dma_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret); goto err6; @@ -623,7 +623,7 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev) struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id]; struct resource *mem_res; - asoc_dma_platform_unregister(&pdev->dev); + samsung_asoc_dma_platform_unregister(&pdev->dev); snd_soc_unregister_component(&pdev->dev); pm_runtime_disable(&pdev->dev); diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 47e2386..ea885cb 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -176,7 +176,7 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) return ret; } - ret = asoc_dma_platform_register(&pdev->dev); + ret = samsung_asoc_dma_platform_register(&pdev->dev); if (ret) { pr_err("failed to register the DMA: %d\n", ret); goto err; @@ -190,7 +190,7 @@ err: static int s3c2412_iis_dev_remove(struct platform_device *pdev) { - asoc_dma_platform_unregister(&pdev->dev); + samsung_asoc_dma_platform_unregister(&pdev->dev); snd_soc_unregister_component(&pdev->dev); return 0; } diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 8b34145..9c8ebd8 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -480,7 +480,7 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) return ret; } - ret = asoc_dma_platform_register(&pdev->dev); + ret = samsung_asoc_dma_platform_register(&pdev->dev); if (ret) { pr_err("failed to register the dma: %d\n", ret); goto err; @@ -494,7 +494,7 @@ err: static int s3c24xx_iis_dev_remove(struct platform_device *pdev) { - asoc_dma_platform_unregister(&pdev->dev); + samsung_asoc_dma_platform_unregister(&pdev->dev); snd_soc_unregister_component(&pdev->dev); return 0; } diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 5ea70ab..28487dc 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c @@ -442,7 +442,7 @@ static int spdif_probe(struct platform_device *pdev) spdif->dma_playback = &spdif_stereo_out; - ret = asoc_dma_platform_register(&pdev->dev); + ret = samsung_asoc_dma_platform_register(&pdev->dev); if (ret) { dev_err(&pdev->dev, "failed to register DMA: %d\n", ret); goto err5; @@ -468,7 +468,7 @@ static int spdif_remove(struct platform_device *pdev) struct samsung_spdif_info *spdif = &spdif_info; struct resource *mem_res; - asoc_dma_platform_unregister(&pdev->dev); + samsung_asoc_dma_platform_unregister(&pdev->dev); snd_soc_unregister_component(&pdev->dev); iounmap(spdif->regs); -- 1.7.9.5

2 1

[alsa-devel] ice1712 suspend/resume for M-Audio Audiophile 2496
by Tommi Uimonen 22 Aug '13

22 Aug '13

Hello, the lack of suspend/resume support for ice1712 driver has been bugging me a lot, and I was wondering if it's possible to implement it by following how it's done in 1724.c? I don't really know much about the driver, but after some comparison between 1712.c and 1724.c it seems doable. At least the suspend part seems straightforward, just changing ICEMT1724 with ICEMT and ICEREG1724 with ICEREG. To resume, I should add some new functions like snd_ice1712_chip_reset (I guess it follows the same logic as in 1724.c, just use ICE1712_RESET instead) and maybe some spdif stuff but I think the 1724 has different spdif options. I don't have any 1724 cards so can't be sure, but 1712 does not have spdif rate. Maybe it will work without those, at least for me since I don't use spdif. And then add this to the pci_driver ice1712_driver struct: .driver = { .pm = SND_ICE1712_PM_OPS, } and define the SIMPLE_DEV_PM_OPS accordingly. Or is this already under work by someone? Tommi

1 1

[alsa-devel] [PATCH 1/2] ALSA: hda - Fix ALC283 headphone pop-noise better
by Takashi Iwai 22 Aug '13

22 Aug '13

From: Kailang Yang <kailang(a)realtek.com> Fixed ALC283 D3 to D0 and D0 to D3 Headphone pop noise. The previous fix [c5177c86: ALSA: hda - Fix the noise after suspend on ALC283 codec] doesn't work sufficiently for some laptops. Signed-off-by: Kailang Yang <kailang(a)realtek.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 111 +++++++++++++++++++++++++++++------------- 1 file changed, 76 insertions(+), 35 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7d00639..4bdccd1 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2527,6 +2527,7 @@ enum { ALC269_TYPE_ALC269VD, ALC269_TYPE_ALC280, ALC269_TYPE_ALC282, + ALC269_TYPE_ALC283, ALC269_TYPE_ALC284, ALC269_TYPE_ALC286, }; @@ -2552,6 +2553,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec) case ALC269_TYPE_ALC269VB: case ALC269_TYPE_ALC269VD: case ALC269_TYPE_ALC282: + case ALC269_TYPE_ALC283: case ALC269_TYPE_ALC286: ssids = alc269_ssids; break; @@ -2586,6 +2588,74 @@ static void alc269_shutup(struct hda_codec *codec) snd_hda_shutup_pins(codec); } +static void alc283_init(struct hda_codec *codec) +{ + struct alc_spec *spec = codec->spec; + hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0]; + bool hp_pin_sense; + int val; + + if (!hp_pin) + return; + hp_pin_sense = snd_hda_jack_detect(codec, hp_pin); + + /* Index 0x43 Direct Drive HP AMP LPM Control 1 */ + /* Headphone capless set to high power mode */ + alc_write_coef_idx(codec, 0x43, 0x9004); + + snd_hda_codec_write(codec, hp_pin, 0, + AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE); + + if (hp_pin_sense) + msleep(85); + + snd_hda_codec_write(codec, hp_pin, 0, + AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT); + + if (hp_pin_sense) + msleep(85); + /* Index 0x46 Combo jack auto switch control 2 */ + /* 3k pull low control for Headset jack. */ + val = alc_read_coef_idx(codec, 0x46); + alc_write_coef_idx(codec, 0x46, val & ~(3 << 12)); + /* Headphone capless set to normal mode */ + alc_write_coef_idx(codec, 0x43, 0x9614); +} + +static void alc283_shutup(struct hda_codec *codec) +{ + struct alc_spec *spec = codec->spec; + hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0]; + bool hp_pin_sense; + int val; + + if (!hp_pin) { + alc269_shutup(codec); + return; + } + + hp_pin_sense = snd_hda_jack_detect(codec, hp_pin); + + alc_write_coef_idx(codec, 0x43, 0x9004); + + snd_hda_codec_write(codec, hp_pin, 0, + AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE); + + if (hp_pin_sense) + msleep(85); + + snd_hda_codec_write(codec, hp_pin, 0, + AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); + + val = alc_read_coef_idx(codec, 0x46); + alc_write_coef_idx(codec, 0x46, val | (3 << 12)); + + if (hp_pin_sense) + msleep(85); + snd_hda_shutup_pins(codec); + alc_write_coef_idx(codec, 0x43, 0x9614); +} + static void alc5505_coef_set(struct hda_codec *codec, unsigned int index_reg, unsigned int val) { @@ -2715,12 +2785,6 @@ static int alc269_resume(struct hda_codec *codec) if (spec->has_alc5505_dsp) alc5505_dsp_resume(codec); - /* clear the power-save mode for ALC283 */ - if (codec->vendor_id == 0x10ec0283) { - alc_write_coef_idx(codec, 0x4, 0xaf01); - alc_write_coef_idx(codec, 0x6, 0x2104); - } - return 0; } #endif /* CONFIG_PM */ @@ -3815,30 +3879,6 @@ static void alc269_fill_coef(struct hda_codec *codec) alc_write_coef_idx(codec, 0x4, val | (1<<11)); } -/* don't clear mic pin; otherwise it results in noise in D3 */ -static void alc283_headset_shutup(struct hda_codec *codec) -{ - int i; - - if (codec->bus->shutdown) - return; - - for (i = 0; i < codec->init_pins.used; i++) { - struct hda_pincfg *pin = snd_array_elem(&codec->init_pins, i); - /* use read here for syncing after issuing each verb */ - if (pin->nid != 0x19) - snd_hda_codec_read(codec, pin->nid, 0, - AC_VERB_SET_PIN_WIDGET_CONTROL, 0); - } - - alc_write_coef_idx(codec, 0x4, 0x0f01); /* power save */ - alc_write_coef_idx(codec, 0x6, 0x2100); /* power save */ - snd_hda_codec_write(codec, 0x19, 0, - AC_VERB_SET_PIN_WIDGET_CONTROL, - PIN_VREFHIZ); - codec->pins_shutup = 1; -} - /* */ static int patch_alc269(struct hda_codec *codec) @@ -3853,9 +3893,6 @@ static int patch_alc269(struct hda_codec *codec) spec = codec->spec; spec->gen.shared_mic_vref_pin = 0x18; - if (codec->vendor_id == 0x10ec0283) - spec->shutup = alc283_headset_shutup; - snd_hda_pick_fixup(codec, alc269_fixup_models, alc269_fixup_tbl, alc269_fixups); snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); @@ -3897,11 +3934,15 @@ static int patch_alc269(struct hda_codec *codec) case 0x10ec0290: spec->codec_variant = ALC269_TYPE_ALC280; break; - case 0x10ec0233: case 0x10ec0282: - case 0x10ec0283: spec->codec_variant = ALC269_TYPE_ALC282; break; + case 0x10ec0233: + case 0x10ec0283: + spec->codec_variant = ALC269_TYPE_ALC283; + spec->shutup = alc283_shutup; + spec->init_hook = alc283_init; + break; case 0x10ec0284: case 0x10ec0292: spec->codec_variant = ALC269_TYPE_ALC284; -- 1.8.3.4

2 3

Re: [alsa-devel] [PATCH -next] ASoC: mmp-pcm: remove duplicated include from mmp-pcm.c
by Mark Brown 22 Aug '13

22 Aug '13

On Thu, Aug 22, 2013 at 10:37:20AM +0800, Wei Yongjun wrote: > From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> > > Remove duplicated include. Sorry, I already applied a patch for this which I saw first (though yours was actually sent sooner). Thanks.

1 0

[alsa-devel] [PATCH 1/1] ASoC: pxa: Remove duplicate inclusion of dmaengine.h
by Sachin Kamat 22 Aug '13

22 Aug '13

dmaengine.h header file was included twice. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> --- sound/soc/pxa/mmp-pcm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c index 9a97843..8235e23 100644 --- a/sound/soc/pxa/mmp-pcm.c +++ b/sound/soc/pxa/mmp-pcm.c @@ -17,7 +17,6 @@ #include <linux/dmaengine.h> #include <linux/platform_data/dma-mmp_tdma.h> #include <linux/platform_data/mmp_audio.h> -#include <linux/dmaengine.h> #include <sound/pxa2xx-lib.h> #include <sound/core.h> -- 1.7.9.5

2 1

[alsa-devel] [PATCH] rme96 synchronization support
by Knut Petersen 22 Aug '13

22 Aug '13

Hi everybody! As I need support for synchronized pcm streams on an RME Digi96/8 PAD I wrote the attached patch. It does work here. My own program, trying to get synchronized capture/playback streams, succeeds. Programs that use either the playback or the capture part of the hardware are not affected by start / pause/ stop operations of applications using the other part of the hardware (tested with aplay, arecord, and ecasound). I wrote the test code and the patch, so it is not impossible that I acted on wrong assumptions in both places. Please have a close look at the patch. cu, knut

3 15

[alsa-devel] [PATCH] Update iatomic.h functions definitions for mips
by jiashuo.kang＠gmail.com 22 Aug '13

22 Aug '13

From: Kai Kang <jiashuo.kang at gmail.com> Functions atomic_add(s) and atomic_sub(s) are defined with 'extern __inline__' that may cause compile fails when cross compile for mips. The error message looks like: | pcm/.libs/libpcm.a(pcm_meter.o): In function `snd_pcm_meter_update_scope': | .../alsa-lib-1.0.27.2/src/pcm/pcm_meter.c:139: undefined reference to `atomic_sub' Replace the 'extern __inline__' with 'static __inline__' to fix this issue. Signed-off-by: Kai Kang <jiashuo.kang at gmail.com> --- include/iatomic.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/iatomic.h b/include/iatomic.h index 5711fe8..2393297 100644 --- a/include/iatomic.h +++ b/include/iatomic.h @@ -720,7 +720,7 @@ typedef struct { volatile int counter; } atomic_t; * Atomically adds @i to @v. Note that the guaranteed useful range * of an atomic_t is only 24 bits. */ -extern __inline__ void atomic_add(int i, atomic_t * v) +static __inline__ void atomic_add(int i, atomic_t * v) { unsigned long temp; @@ -744,7 +744,7 @@ extern __inline__ void atomic_add(int i, atomic_t * v) * Atomically subtracts @i from @v. Note that the guaranteed * useful range of an atomic_t is only 24 bits. */ -extern __inline__ void atomic_sub(int i, atomic_t * v) +static __inline__ void atomic_sub(int i, atomic_t * v) { unsigned long temp; @@ -763,7 +763,7 @@ extern __inline__ void atomic_sub(int i, atomic_t * v) /* * Same as above, but return the result value */ -extern __inline__ int atomic_add_return(int i, atomic_t * v) +static __inline__ int atomic_add_return(int i, atomic_t * v) { unsigned long temp, result; @@ -784,7 +784,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v) return result; } -extern __inline__ int atomic_sub_return(int i, atomic_t * v) +static __inline__ int atomic_sub_return(int i, atomic_t * v) { unsigned long temp, result; -- 1.8.1.2

3 2

Re: [alsa-devel] oops during boot with CONFIG_SND_DYNAMIC_MINORS not set
by Takashi Iwai 22 Aug '13

22 Aug '13

At Thu, 22 Aug 2013 00:42:41 +0300, Stratos Karafotis wrote: > > Hi, > > I get the following oops during boot when build with CONFIG_SND_DYNAMIC_MINORS > not set (3.11-rc6). > The issue is vanished building the kernel with CONFIG_SND_DYNAMIC_MINORS=y > as suggested in printk message. > > Regards, > Stratos > > > [ 8.670497] ALSA sound/pci/hda/hda_codec.c:4506 Too many HDMI devices > [ 8.670500] ALSA sound/pci/hda/hda_codec.c:4508 Consider building the kernel with CONFIG_SND_DYNAMIC_MINORS=y > [ 8.670501] ALSA sound/pci/hda/hda_codec.c:4506 Too many HDMI devices > [ 8.670502] ALSA sound/pci/hda/hda_codec.c:4508 Consider building the kernel with CONFIG_SND_DYNAMIC_MINORS=y > [ 8.688015] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 > [ 8.688609] IP: [<ffffffffa0086992>] snd_pcm_add_chmap_ctls+0xd2/0x160 [snd_pcm] > [ 8.689191] PGD 0 > [ 8.689762] Oops: 0000 [#1] SMP > [ 8.690326] Modules linked in: snd_hda_codec_hdmi snd_hda_codec_realtek arc4 rt2800pci eeprom_93cx6 rt2x00pci rt2800lib crc_ccitt rt2x00mmio rt2x00lib mac80211 cfg80211 eeepc_wmi asus_wmi sparse_keymap rfkill snd_hda_intel(+) snd_hda_codec snd_hwdep snd_seq iTCO_wdt iTCO_vendor_support r8169 mii i2c_i801 i2c_core snd_seq_device snd_pcm serio_raw pcspkr lpc_ich mfd_core snd_page_alloc snd_timer snd soundcore binfmt_misc uinput usb_storage wmi video > [ 8.692808] CPU: 1 PID: 417 Comm: systemd-udevd Not tainted 3.11.0-rc6 #3 > [ 8.693424] Hardware name: ASUSTeK COMPUTER INC. CM6870/CM6870, BIOS 0606 08/27/2012 > [ 8.694044] task: ffff880210091750 ti: ffff880210598000 task.ti: ffff880210598000 > [ 8.694666] RIP: 0010:[<ffffffffa0086992>] [<ffffffffa0086992>] snd_pcm_add_chmap_ctls+0xd2/0x160 [snd_pcm] > [ 8.695310] RSP: 0018:ffff880210599968 EFLAGS: 00010246 > [ 8.695954] RAX: ffffffffa008c51e RBX: ffff880212d20b80 RCX: 0000000000000000 > [ 8.696607] RDX: ffffffffa008c533 RSI: ffff880212d20b80 RDI: ffff880210599980 > [ 8.697261] RBP: ffff8802105999f8 R08: 0000000000000000 R09: ffff880216003b00 > [ 8.697923] R10: 0000000000000000 R11: ffff8802133d93c0 R12: 0000000000000000 > [ 8.698585] R13: ffff880210599a10 R14: 0000000000000000 R15: ffff880210599980 > [ 8.699255] FS: 00007fe8eb8ea880(0000) GS:ffff88021ec40000(0000) knlGS:0000000000000000 > [ 8.699936] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ 8.700619] CR2: 0000000000000018 CR3: 00000002101c2000 CR4: 00000000001407e0 > [ 8.701310] Stack: > [ 8.702005] 0000000000000000 000000000b5a4000 0000000000000000 0000000000000003 > [ 8.702715] 0000000000000000 ffffffffa008c51e 1000001100000000 0000000000000000 > [ 8.703422] ffffffffa0084a80 ffffffffa0086cd0 0000000000000000 ffffffffa0085b30 > [ 8.704132] Call Trace: > [ 8.704836] [<ffffffffa0084a80>] ? snd_pcm_hw_rule_msbits+0x50/0x50 [snd_pcm] > [ 8.705558] [<ffffffffa0086cd0>] ? snd_pcm_hw_rule_ratdens+0x2b0/0x2b0 [snd_pcm] > [ 8.706281] [<ffffffffa0085b30>] ? snd_pcm_hw_param_last+0x240/0x240 [snd_pcm] > [ 8.707008] [<ffffffffa02af7ed>] generic_hdmi_build_controls+0x14d/0x1e0 [snd_hda_codec_hdmi] > [ 8.707748] [<ffffffffa02ae827>] ? generic_hdmi_init+0xb7/0xd0 [snd_hda_codec_hdmi] > [ 8.708493] [<ffffffffa013a812>] snd_hda_codec_build_controls+0x1c2/0x220 [snd_hda_codec] > [ 8.709242] [<ffffffffa0135255>] ? snd_hda_codec_configure+0x295/0x450 [snd_hda_codec] > [ 8.709990] [<ffffffffa013a898>] snd_hda_build_controls+0x28/0x80 [snd_hda_codec] > [ 8.710728] [<ffffffffa00fbbed>] azx_probe_continue+0x84d/0xcc0 [snd_hda_intel] > [ 8.711456] [<ffffffffa00fb060>] ? perf_trace_azx_pcm_trigger+0xe0/0xe0 [snd_hda_intel] > [ 8.712187] [<ffffffffa00f9ee0>] ? azx_resume+0x130/0x130 [snd_hda_intel] > [ 8.712916] [<ffffffffa00fac20>] ? azx_pcm_prepare+0x5f0/0x5f0 [snd_hda_intel] > [ 8.713646] [<ffffffffa00f98f0>] ? azx_runtime_suspend+0x40/0x40 [snd_hda_intel] > [ 8.714377] [<ffffffffa00f8800>] ? azx_remove+0x30/0x30 [snd_hda_intel] > [ 8.715111] [<ffffffffa00fc4bf>] azx_probe+0x3bf/0x7e0 [snd_hda_intel] > [ 8.715845] [<ffffffff8130b3ee>] local_pci_probe+0x3e/0x70 > [ 8.716574] [<ffffffff8130c6d1>] pci_device_probe+0x121/0x130 > [ 8.717303] [<ffffffff813bf3c7>] driver_probe_device+0x87/0x390 > [ 8.718033] [<ffffffff813bf7a3>] __driver_attach+0x93/0xa0 > [ 8.718762] [<ffffffff813bf710>] ? __device_attach+0x40/0x40 > [ 8.719481] [<ffffffff813bd303>] bus_for_each_dev+0x63/0xa0 > [ 8.720189] [<ffffffff813bee1e>] driver_attach+0x1e/0x20 > [ 8.720886] [<ffffffff813be9b8>] bus_add_driver+0x1e8/0x2a0 > [ 8.721578] [<ffffffffa016a169>] ? ftrace_define_fields_azx_get_position+0xcd/0xcd [snd_hda_intel] > [ 8.722277] [<ffffffff813bfdc4>] driver_register+0x74/0x150 > [ 8.722980] [<ffffffffa016a169>] ? ftrace_define_fields_azx_get_position+0xcd/0xcd [snd_hda_intel] > [ 8.723682] [<ffffffff8130b27b>] __pci_register_driver+0x4b/0x50 > [ 8.724368] [<ffffffffa016a187>] azx_driver_init+0x1e/0xe97 [snd_hda_intel] > [ 8.725043] [<ffffffff810002c2>] do_one_initcall+0xf2/0x1a0 > [ 8.725706] [<ffffffff8103f183>] ? set_memory_nx+0x43/0x50 > [ 8.726360] [<ffffffff810b9f3d>] load_module+0x1b9d/0x2640 > [ 8.726999] [<ffffffff810b6270>] ? store_uevent+0x40/0x40 > [ 8.727631] [<ffffffff810bab56>] SyS_finit_module+0x86/0xb0 > [ 8.728250] [<ffffffff81621782>] system_call_fastpath+0x16/0x1b > [ 8.728856] Code: ff 48 89 de 4c 89 ff 48 89 43 18 8b 85 7c ff ff ff 89 43 20 48 c7 c0 1e c5 08 a0 4c 89 45 d0 48 0f 45 c2 49 c1 e2 07 48 89 45 98 <41> 8b 44 24 18 4f 8d 34 14 89 45 8c 41 8b 86 c8 00 00 00 89 45 > [ 8.730268] RIP [<ffffffffa0086992>] snd_pcm_add_chmap_ctls+0xd2/0x160 [snd_pcm] > [ 8.730932] RSP <ffff880210599968> > [ 8.731585] CR2: 0000000000000018 > [ 8.732240] ---[ end trace 92e1db8c3a6c8fab ]--- Could you check the patch below? Thanks! Takashi --- From: Takashi Iwai <tiwai(a)suse.de> Subject: [PATCH] ALSA: hda - Fix NULL dereference with CONFIG_SND_DYNAMIC_MINORS=n Without the dynamic minor assignment, HDMI codec may have less PCM instances than the number of pins, which eventually leads to Oops. Reported-by: Stratos Karafotis <stratosk(a)semaphore.gr> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_hdmi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 030ca86..e2cb92b 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1781,6 +1781,9 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) struct snd_pcm_chmap *chmap; struct snd_kcontrol *kctl; int i; + + if (pin_idx >= codec->num_pcms) + break; err = snd_pcm_add_chmap_ctls(codec->pcm_info[pin_idx].pcm, SNDRV_PCM_STREAM_PLAYBACK, NULL, 0, pin_idx, &chmap); -- 1.8.3.4

1 0

[alsa-devel] alsa-lib bug tracking
by Cornel Spinu 22 Aug '13

22 Aug '13

Hi, I'm looking for a list of bugs for alsa-lib. It seems that https://bugtrack.alsa-project.org/alsa-bug is not working. Do you have any clue where I can find this list? Thank you, Cornel

2 1