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

[alsa-devel] BUG: unable to handle kernel NULL pointer dereference at 0000000000000010, IP: [<ffffffff819865fb>] snd_info_get_line+0x3b/0xf0
by Tommi Rantala 02 Apr '13

02 Apr '13

Hello, Saw this while fuzzing with trinity in a qemu virtual machine: [6026] Random reseed: 625996896 [watchdog] 7640111 iterations. [F:6650299 S:989808] [6026] Random reseed: 472197910 [ 459.365417] misc rfkill: uevent: unknown action-string [ 459.521953] BUG: unable to handle kernel NULL pointer dereference at 0000000000000010 [ 459.522027] IP: [<ffffffff819865fb>] snd_info_get_line+0x3b/0xf0 [ 459.522027] PGD 52deb067 PUD 50bbc067 PMD 0 [ 459.522027] Oops: 0000 [#1] SMP [ 459.522027] CPU 0 [ 459.522027] Pid: 7781, comm: trinity-child53 Tainted: G W 3.9.0-rc1+ #103 Bochs Bochs [ 459.522027] RIP: 0010:[<ffffffff819865fb>] [<ffffffff819865fb>] snd_info_get_line+0x3b/0xf0 [ 459.522027] RSP: 0018:ffff880065455a88 EFLAGS: 00010202 [ 459.522027] RAX: 0000000000000001 RBX: ffff8800508e1760 RCX: 0000000000000000 [ 459.522027] RDX: ffff880065455b57 RSI: ffff880065455ad8 RDI: ffff8800599ceba0 [ 459.522027] RBP: ffff880065455a88 R08: 0000000000000010 R09: 0000000000000001 [ 459.522027] R10: ffff8800461f5630 R11: 0000000000000000 R12: ffff88007a470960 [ 459.522027] R13: ffff88007a43b980 R14: ffff88007a470000 R15: ffff88007a43b900 [ 459.522027] FS: 00007f9c07c94700(0000) GS:ffff88007f800000(0000) knlGS:0000000000000000 [ 459.522027] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 459.522027] CR2: 0000000000000010 CR3: 0000000060ee2000 CR4: 00000000000006f0 [ 459.522027] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 459.522027] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 459.522027] Process trinity-child53 (pid: 7781, threadinfo ffff880065454000, task ffff8800797c2290) [ 459.522027] Stack: [ 459.522027] ffff880065455b88 ffffffff819a3f7e ffff880065455ab8 ffff8800599ceba0 [ 459.522027] ffff8800508e1220 ffff8800508e1200 ffff880065455b48 ffffffff8136eafc [ 459.522027] ffff880065455ae8 ffffffff81091198 ffff88007cc01600 ffff8800508e1200 [ 459.522027] Call Trace: [ 459.522027] [<ffffffff819a3f7e>] snd_mixer_oss_proc_write+0x1ee/0x250 [ 459.522027] [<ffffffff8136eafc>] ? debug_check_no_obj_freed+0x17c/0x230 [ 459.522027] [<ffffffff81091198>] ? kmemcheck_shadow_lookup+0x28/0x80 [ 459.522027] [<ffffffff81985a38>] ? snd_info_entry_release+0x48/0xd0 [ 459.522027] [<ffffffff81199c0c>] ? kfree+0x1ac/0x1e0 [ 459.522027] [<ffffffff81985a50>] snd_info_entry_release+0x60/0xd0 [ 459.522027] [<ffffffff81211022>] proc_reg_release+0x132/0x180 [ 459.522027] [<ffffffff819859f0>] ? snd_info_entry_llseek+0x100/0x100 [ 459.522027] [<ffffffff811a807a>] __fput+0x11a/0x220 [ 459.522027] [<ffffffff811a8189>] ____fput+0x9/0x10 [ 459.522027] [<ffffffff810bcbbe>] task_work_run+0x9e/0xc0 [ 459.522027] [<ffffffff8109d85c>] do_exit+0x3ac/0xad0 [ 459.522027] [<ffffffff810afc29>] ? get_signal_to_deliver+0xf9/0x810 [ 459.522027] [<ffffffff8109e044>] do_group_exit+0x84/0xd0 [ 459.522027] [<ffffffff810b0269>] get_signal_to_deliver+0x739/0x810 [ 459.522027] [<ffffffff810583b2>] do_signal+0x52/0x570 [ 459.522027] [<ffffffff810cbaf3>] ? finish_task_switch+0x43/0x120 [ 459.522027] [<ffffffff810f3366>] ? trace_hardirqs_on_caller+0x16/0x1f0 [ 459.522027] [<ffffffff810f354d>] ? trace_hardirqs_on+0xd/0x10 [ 459.522027] [<ffffffff81fad85b>] ? _raw_spin_unlock_irq+0x2b/0x40 [ 459.522027] [<ffffffff810cbb30>] ? finish_task_switch+0x80/0x120 [ 459.522027] [<ffffffff810cbaf3>] ? finish_task_switch+0x43/0x120 [ 459.522027] [<ffffffff810588f7>] do_notify_resume+0x27/0x70 [ 459.522027] [<ffffffff813663fe>] ? trace_hardirqs_on_thunk+0x3a/0x3f [ 459.522027] [<ffffffff81faf0a2>] int_signal+0x12/0x17 [ 459.522027] Code: 00 8b 4f 14 85 c9 0f 85 cf 00 00 00 44 8b 5f 18 45 85 db 74 6b e9 c1 00 00 00 66 0f 1f 44 00 00 8b 47 08 4c 8b 07 89 c1 83 c0 01 <41> 0f b6 0c 08 89 47 08 44 0f be c1 41 83 f8 0a 75 2b 39 47 0c [ 459.522027] RIP [<ffffffff819865fb>] snd_info_get_line+0x3b/0xf0 [ 459.522027] RSP <ffff880065455a88> [ 459.522027] CR2: 0000000000000010 [ 459.652998] ---[ end trace a9ded493128a1bce ]--- [ 459.654880] Fixing recursive fault but reboot is needed! [6026] Random reseed: 807260652 [watchdog] pid 8469 hasn't made progress in 30 seconds! (last:2725563185 now:2725563215 diff:30). Stuck in syscall 70:msgrcv. Sending SIGKILL. [watchdog] 7677069 iterations. [F:6682605 S:994461] [6026] Random reseed: 575363686 [ 461.032969] misc ashmem: uevent: unknown action-string [6026] Random reseed: 1095114151 [6026] Regenerating random pages, fd's etc. Tommi

2 1

[alsa-devel] How to create and verify verb tables for coreboot?
by Paul Menzel 02 Apr '13

02 Apr '13

Dear ALSA folks, coreboot is a free replacement for the traditional BIOS [1]. Therefore coreboot is also responsible for providing the correct verb table [2]. According to Jens the Verb Table format is not documented and is created by for example Realtek [3]. Could you give some more information about the verb table and how this can be created from scratch? Our developer Rudolf suggests to take the values from /sys/class/sound/hwC1D0/init_pin_configs when running the vendor BIOS [2]. How can a correct verb table be verified? As for the ASRock E350M1 [4][5], I attach the output of `alsa-info.sh` [6] when running coreboot. The one running with the vendor BIOS is uploaded to the server [7] due to the size limit of this mailing list. $ wdiff vendorbios coreboot # init_pin_configs 0x11 [-0x411111f0-] {+0x411110f0+} 0x12 0x411111f0 0x14 [-0x01014010-] {+0x01014030+} 0x15 [-0x01011012-] {+0x01011031+} 0x16 [-0x01016011-] {+0x01016032+} 0x17 [-0x411111f0-] {+0x01012033+} 0x18 [-0x01a19840-] {+0x01a19850+} 0x19 [-0x02a19950-] {+0x02a19c80+} 0x1a [-0x0181304f-] {+0x01813051+} 0x1b [-0x02214120-] {+0x02214c40+} 0x1c [-0x411111f0-] {+0x9933105f+} 0x1d [-0x4005e601-] {+0x00000100+} 0x1e [-0x01452130-] {+0x01441070+} 0x1f [-0x411111f0-] {+0x41c46060+} Thanks, Paul [1] http://www.coreboot.org/ [2] http://www.coreboot.org/pipermail/coreboot/2013-March/075547.html [3] http://review.coreboot.org/#/c/2553/1/src/mainboard/lippert/frontrunner-af/… [4] http://www.coreboot.org/ASRock_E350M1 [5] http://www.coreboot.org/pipermail/coreboot/2013-March/075557.html [6] http://alsa-project.org/main/index.php/Help_To_Debug [7] http://www.alsa-project.org/db/?f=96ff75103a48ab8e58a216bd12f65d2755679cdc

2 1

[alsa-devel] [PATCH v2 2/2] ALSA: hda - bug fix on HDMI ELD debug message
by mengdong.lin＠intel.com 02 Apr '13

02 Apr '13

From: Mengdong Lin <mengdong.lin(a)intel.com> This patch let ELD debug message show 'pin_eld->monitor_present' which reflects the real pin response to verb GET_PIN_SENSE. 'eld->monitor_present' should not be used here because 'eld' is a temp structure now and so its "monitor_present" is not set. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 78e1827..de8ac5c 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1196,7 +1196,7 @@ static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) _snd_printd(SND_PR_VERBOSE, "HDMI status: Codec=%d Pin=%d Presence_Detect=%d ELD_Valid=%d\n", - codec->addr, pin_nid, eld->monitor_present, eld->eld_valid); + codec->addr, pin_nid, pin_eld->monitor_present, eld->eld_valid); if (eld->eld_valid) { if (snd_hdmi_get_eld(codec, pin_nid, eld->eld_buffer, -- 1.7.10.4

3 2

[alsa-devel] [PATCH v2 1/2] ALSA: hda - bug fix on return value when getting HDMI ELD info
by mengdong.lin＠intel.com 02 Apr '13

02 Apr '13

From: Mengdong Lin <mengdong.lin(a)intel.com> In function snd_hdmi_get_eld(), the variable 'ret' should be initialized to 0. Otherwise it will be returned uninitialized as non-zero after ELD info is got successfully. Thus hdmi_present_sense() will always assume ELD info is invalid by mistake, and /proc file system cannot show the proper ELD info. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c index 7dd8463..d0d7ac1 100644 --- a/sound/pci/hda/hda_eld.c +++ b/sound/pci/hda/hda_eld.c @@ -320,7 +320,7 @@ int snd_hdmi_get_eld(struct hda_codec *codec, hda_nid_t nid, unsigned char *buf, int *eld_size) { int i; - int ret; + int ret = 0; int size; /* -- 1.7.10.4

3 2

[alsa-devel] ASoC updates for v3.9
by Mark Brown 02 Apr '13

02 Apr '13

The following changes since commit 8bb9660418e05bb1845ac1a2428444d78e322cc7: Linux 3.9-rc4 (2013-03-23 16:52:44 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v3.9-rc4 for you to fetch changes up to 40bac28eb1e39f229a94ad72e2ca8cdeef3ba31a: Merge remote-tracking branch 'asoc/fix/spear' into asoc-next (2013-03-26 14:08:07 +0000) ---------------------------------------------------------------- ASoC: Fixes for v3.9 A few more fixes here and there, including quite a few nasty driver specific ones, but nothing that has a major general impact. ---------------------------------------------------------------- Axel Lin (1): ASoC: si476x: Add missing break for SNDRV_PCM_FORMAT_S8 switch case Joe Perches (1): ASoC:: max98090: Remove executable bit Lars-Peter Clausen (2): ASoC: spear_pcm: Update to new pcm_new() API ASoC: dma-sh7760: Fix compile error Mark Brown (9): ASoC: dapm: Fix handling of loops Merge remote-tracking branch 'asoc/fix/adsp' into asoc-next Merge remote-tracking branch 'asoc/fix/core' into asoc-next Merge remote-tracking branch 'asoc/fix/dapm' into asoc-next Merge remote-tracking branch 'asoc/fix/fsl' into asoc-next Merge remote-tracking branch 'asoc/fix/max98090' into asoc-next Merge remote-tracking branch 'asoc/fix/sh' into asoc-next Merge remote-tracking branch 'asoc/fix/si476x' into asoc-next Merge remote-tracking branch 'asoc/fix/spear' into asoc-next Markus Pargmann (1): ASoC: pcm030 audio fabric: remove __init from probe Peter Ujfalusi (1): ASoC: dapm: Fix pointer dereference in is_connected_output_ep() Sascha Hauer (1): ASoC: imx-ssi: Fix occasional AC97 reset failure Silviu-Mihai Popescu (1): ASoC: core: fix invalid free of devm_ allocated data Wei Yongjun (2): ASoC: wm_adsp: fix possible memory leak in wm_adsp_load_coeff() ASoC: core: fix possible memory leak in snd_soc_bytes_put() include/sound/soc-dapm.h | 1 + sound/soc/codecs/si476x.c | 1 + sound/soc/codecs/wm_adsp.c | 5 +++-- sound/soc/fsl/imx-ssi.c | 5 +++++ sound/soc/fsl/pcm030-audio-fabric.c | 2 +- sound/soc/sh/dma-sh7760.c | 4 ++-- sound/soc/soc-core.c | 8 ++++---- sound/soc/soc-dapm.c | 14 ++++++++++++++ sound/soc/spear/spear_pcm.c | 12 ++++++------ 9 files changed, 37 insertions(+), 15 deletions(-) mode change 100755 => 100644 include/sound/max98090.h mode change 100755 => 100644 sound/soc/codecs/max98090.c mode change 100755 => 100644 sound/soc/codecs/max98090.h

2 2

[alsa-devel] [PATCH] ALSA: hda/ca0132 - Delay HP amp turnon.
by Dylan Reid 02 Apr '13

02 Apr '13

From: Chih-Chung Chang <chihchung(a)chromium.org> Turing on the headphone amp interferes with the impedance measurement used to detect a TRRS style headset microphone. Delay the HP turn on until 500ms after the jack is detected, allowing the mic detection state machine to run to completion. Signed-off-by: Chih-Chung Chang <chihchung(a)chromium.org> Signed-off-by: Dylan Reid <dgreid(a)chromium.org> --- sound/pci/hda/patch_ca0132.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 0792b57..12eb21a 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -741,6 +741,9 @@ struct ca0132_spec { long voicefx_val; long cur_mic_boost; + struct hda_codec *codec; + struct delayed_work unsol_hp_work; + #ifdef ENABLE_TUNING_CONTROLS long cur_ctl_vals[TUNING_CTLS_COUNT]; #endif @@ -3227,6 +3230,14 @@ exit: return err < 0 ? err : 0; } +static void ca0132_unsol_hp_delayed(struct work_struct *work) +{ + struct ca0132_spec *spec = container_of( + to_delayed_work(work), struct ca0132_spec, unsol_hp_work); + ca0132_select_out(spec->codec); + snd_hda_jack_report_sync(spec->codec); +} + static void ca0132_set_dmic(struct hda_codec *codec, int enable); static int ca0132_mic_boost_set(struct hda_codec *codec, long val); static int ca0132_effects_set(struct hda_codec *codec, hda_nid_t nid, long val); @@ -4399,8 +4410,7 @@ static void ca0132_process_dsp_response(struct hda_codec *codec) static void ca0132_unsol_event(struct hda_codec *codec, unsigned int res) { - snd_printdd(KERN_INFO "ca0132_unsol_event: 0x%x\n", res); - + struct ca0132_spec *spec = codec->spec; if (((res >> AC_UNSOL_RES_TAG_SHIFT) & 0x3f) == UNSOL_TAG_DSP) { ca0132_process_dsp_response(codec); @@ -4412,8 +4422,13 @@ static void ca0132_unsol_event(struct hda_codec *codec, unsigned int res) switch (res) { case UNSOL_TAG_HP: - ca0132_select_out(codec); - snd_hda_jack_report_sync(codec); + /* Delay enabling the HP amp, to let the mic-detection + * state machine run. + */ + cancel_delayed_work_sync(&spec->unsol_hp_work); + queue_delayed_work(codec->bus->workq, + &spec->unsol_hp_work, + msecs_to_jiffies(500)); break; case UNSOL_TAG_AMIC1: ca0132_select_mic(codec); @@ -4588,6 +4603,7 @@ static void ca0132_free(struct hda_codec *codec) { struct ca0132_spec *spec = codec->spec; + cancel_delayed_work_sync(&spec->unsol_hp_work); snd_hda_power_up(codec); snd_hda_sequence_write(codec, spec->base_exit_verbs); ca0132_exit_chip(codec); @@ -4653,6 +4669,7 @@ static int patch_ca0132(struct hda_codec *codec) if (!spec) return -ENOMEM; codec->spec = spec; + spec->codec = codec; spec->num_mixers = 1; spec->mixers[0] = ca0132_mixer; @@ -4663,6 +4680,8 @@ static int patch_ca0132(struct hda_codec *codec) spec->init_verbs[1] = ca0132_init_verbs1; spec->num_init_verbs = 2; + INIT_DELAYED_WORK(&spec->unsol_hp_work, ca0132_unsol_hp_delayed); + ca0132_init_chip(codec); ca0132_config(codec); -- 1.8.1.3.605.g02339dd

2 1

[alsa-devel] [PATCH] USB-audio: Add "HP Digital Stereo Headset" to SPDIF blacklist
by David Henningsson 02 Apr '13

02 Apr '13

Yet another headset without digital I/O. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- src/conf/cards/USB-Audio.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index 177a7af..71c2971 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -39,7 +39,8 @@ USB-Audio.pcm.iec958_device { # The below don't have digital in/out, so prevent them from being opened. "Blue Snowball" 999 - "Logitech Speaker Lapdesk N700" 999 + "HP Digital Stereo Headset" 999 + "Logitech Speaker Lapdesk N700" 999 "Logitech USB Headset" 999 "Logitech Wireless Headset" 999 "Plantronics GameCom 780" 999 -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ASoC: dapm: Remove redundant clear_walk() for supply widgets
by Mark Brown 01 Apr '13

01 Apr '13

From: Ryo Tsutsui <Ryo.Tsutsui(a)wolfsonmicro.com> We already clear the walked state in dapm_widget_power_check(), no need to do it again. Signed-off-by: Ryo Tsutsui <Ryo.Tsutsui(a)wolfosonmicro.com> Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-dapm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 1896a70..0a395eb 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1179,8 +1179,6 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w) return 1; } - dapm_clear_walk(w->dapm); - return 0; } -- 1.7.10.4

2 1

[alsa-devel] [PATCH 00/13] mach-mxs header files cleanup
by Shawn Guo 01 Apr '13

01 Apr '13

The series cleans up mach-mxs headers files in order to support multiplatform build on mxs. Andrew, Jonathan, Mark, Can you please give your ACK on the patch you are copied, so that the series can go via arm-soc as a whole? Thanks. Shawn Shawn Guo (13): rtc: stmp3xxx: use stmp_reset_block() instead iio: mxs-lradc: remove unneeded mach header inclusion ASoC: mxs-saif: remove mach header inclusion ARM: mxs: remove empty hardware.h ARM: mxs: get reset address from device tree ARM: mxs: remove system.c ARM: mxs: get ocotp base address from device tree ARM: mxs: use debug_ll_io_init for low-level debug ARM: mxs: remove mm.c ARM: mxs: move mxs_get_ocotp() into mach-mxs.c ARM: mxs: remove common.h ARM: mxs: merge imx23 and imx28 into one machine_desc ARM: mxs: remove unused headers arch/arm/boot/dts/imx23.dtsi | 3 +- arch/arm/boot/dts/imx28.dtsi | 3 +- arch/arm/mach-mxs/Makefile | 4 - arch/arm/mach-mxs/include/mach/common.h | 25 --- arch/arm/mach-mxs/include/mach/debug-macro.S | 9 +- arch/arm/mach-mxs/include/mach/digctl.h | 22 --- arch/arm/mach-mxs/include/mach/hardware.h | 23 --- arch/arm/mach-mxs/include/mach/mx23.h | 169 ------------------- arch/arm/mach-mxs/include/mach/mx28.h | 225 -------------------------- arch/arm/mach-mxs/include/mach/mxs.h | 116 ------------- arch/arm/mach-mxs/mach-mxs.c | 182 +++++++++++++++++---- arch/arm/mach-mxs/mm.c | 52 ------ arch/arm/mach-mxs/ocotp.c | 93 ----------- arch/arm/mach-mxs/system.c | 139 ---------------- drivers/rtc/rtc-stmp3xxx.c | 6 +- drivers/staging/iio/adc/mxs-lradc.c | 3 - include/linux/clk/mxs.h | 16 ++ sound/soc/mxs/mxs-saif.c | 5 +- 18 files changed, 180 insertions(+), 915 deletions(-) delete mode 100644 arch/arm/mach-mxs/include/mach/common.h delete mode 100644 arch/arm/mach-mxs/include/mach/digctl.h delete mode 100644 arch/arm/mach-mxs/include/mach/hardware.h delete mode 100644 arch/arm/mach-mxs/include/mach/mx23.h delete mode 100644 arch/arm/mach-mxs/include/mach/mx28.h delete mode 100644 arch/arm/mach-mxs/include/mach/mxs.h delete mode 100644 arch/arm/mach-mxs/mm.c delete mode 100644 arch/arm/mach-mxs/ocotp.c delete mode 100644 arch/arm/mach-mxs/system.c create mode 100644 include/linux/clk/mxs.h -- 1.7.9.5

2 2

[alsa-devel] [PATCH V2] ASoC: Implement mixer control sharing
by Stephen Warren 31 Mar '13

31 Mar '13

From: Stephen Warren <swarren(a)nvidia.com> This is the equivalent of commit af46800 "ASoC: Implement mux control sharing", but applied to mixers instead of muxes. This allows a single control to affect multiple mixer widgets at once, which is useful when there is a single set of register bits that affects multiple mixers in HW, for example both the L and R mixers of a stereo path. Without this, you either: 1) End up with multiple controls that affect the same register bits, but whose DAPM state falls out of sync with HW, since the DAPM state is only updated for the specific control that is modified, and not for other paths that are affected by the register bit(s). 2) False paths through DAPM, since you end up merging unconnected stereo paths together into a single widget which hosts the single control, and then branching back out again, thus conjoining the enable states of the two input paths. Now that the kcontrol creation logic is split out into a separate function, dapm_create_or_share_mixmux_kcontrol(), also use that to replace most of the body of dapm_new_mux(). This should produce no functional change, but simply eliminates some mostly duplicated code. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v2: Split dapm_new_mixer()'s loop body into a separate function, dapm_create_or_share_mixmux_kcontrol, to avoid a nasty goto. Also use this for dapm_new_mux(). --- sound/soc/soc-dapm.c | 270 +++++++++++++++++++++++++------------------------- 1 file changed, 136 insertions(+), 134 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 33acd8b..c7cacf9 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -504,17 +504,27 @@ static int dapm_is_shared_kcontrol(struct snd_soc_dapm_context *dapm, return 0; } -/* create new dapm mixer control */ -static int dapm_new_mixer(struct snd_soc_dapm_widget *w) +/* + * Determine if a kcontrol is shared. If it is, look it up. If it isn't, + * create it. Either way, add the widget into the control's widget list + */ +static int dapm_create_or_share_mixmux_kcontrol(struct snd_soc_dapm_widget *w, + int kci, struct snd_soc_dapm_path *path) { struct snd_soc_dapm_context *dapm = w->dapm; - int i, ret = 0; - size_t name_len, prefix_len; - struct snd_soc_dapm_path *path; struct snd_card *card = dapm->card->snd_card; const char *prefix; + size_t prefix_len; + int shared; + struct snd_kcontrol *kcontrol; struct snd_soc_dapm_widget_list *wlist; + int wlistentries; size_t wlistsize; + bool wname_in_long_name, kcname_in_long_name; + size_t name_len; + char *long_name; + const char *name; + int ret; if (dapm->codec) prefix = dapm->codec->name_prefix; @@ -526,103 +536,141 @@ static int dapm_new_mixer(struct snd_soc_dapm_widget *w) else prefix_len = 0; - /* add kcontrol */ - for (i = 0; i < w->num_kcontrols; i++) { + shared = dapm_is_shared_kcontrol(dapm, w, &w->kcontrol_news[kci], + &kcontrol); - /* match name */ - list_for_each_entry(path, &w->sources, list_sink) { + if (kcontrol) { + wlist = kcontrol->private_data; + wlistentries = wlist->num_widgets + 1; + } else { + wlist = NULL; + wlistentries = 1; + } - /* mixer/mux paths name must match control name */ - if (path->name != (char *)w->kcontrol_news[i].name) - continue; + wlistsize = sizeof(struct snd_soc_dapm_widget_list) + + wlistentries * sizeof(struct snd_soc_dapm_widget *); + wlist = krealloc(wlist, wlistsize, GFP_KERNEL); + if (wlist == NULL) { + dev_err(dapm->dev, "ASoC: can't allocate widget list for %s\n", + w->name); + return -ENOMEM; + } + wlist->num_widgets = wlistentries; + wlist->widgets[wlistentries - 1] = w; - if (w->kcontrols[i]) { - path->kcontrol = w->kcontrols[i]; - continue; + if (!kcontrol) { + if (shared) { + wname_in_long_name = false; + kcname_in_long_name = true; + } else { + switch (w->id) { + case snd_soc_dapm_switch: + case snd_soc_dapm_mixer: + wname_in_long_name = true; + kcname_in_long_name = true; + break; + case snd_soc_dapm_mixer_named_ctl: + wname_in_long_name = false; + kcname_in_long_name = true; + break; + case snd_soc_dapm_mux: + case snd_soc_dapm_virt_mux: + case snd_soc_dapm_value_mux: + wname_in_long_name = true; + kcname_in_long_name = false; + break; + default: + kfree(wlist); + return -EINVAL; } + } + + if (wname_in_long_name && kcname_in_long_name) { + name_len = strlen(w->name) - prefix_len + 1 + + strlen(w->kcontrol_news[kci].name) + 1; - wlistsize = sizeof(struct snd_soc_dapm_widget_list) + - sizeof(struct snd_soc_dapm_widget *), - wlist = kzalloc(wlistsize, GFP_KERNEL); - if (wlist == NULL) { - dev_err(dapm->dev, - "ASoC: can't allocate widget list for %s\n", - w->name); + long_name = kmalloc(name_len, GFP_KERNEL); + if (long_name == NULL) { + kfree(wlist); return -ENOMEM; } - wlist->num_widgets = 1; - wlist->widgets[0] = w; - - /* add dapm control with long name. - * for dapm_mixer this is the concatenation of the - * mixer and kcontrol name. - * for dapm_mixer_named_ctl this is simply the - * kcontrol name. + + /* + * The control will get a prefix from the control + * creation process but we're also using the same + * prefix for widgets so cut the prefix off the + * front of the widget name. */ - name_len = strlen(w->kcontrol_news[i].name) + 1; - if (w->id != snd_soc_dapm_mixer_named_ctl) - name_len += 1 + strlen(w->name); + snprintf(long_name, name_len, "%s %s", + w->name + prefix_len, + w->kcontrol_news[kci].name); + long_name[name_len - 1] = '\0'; + + name = long_name; + } else if (wname_in_long_name) { + long_name = NULL; + name = w->name + prefix_len; + } else { + long_name = NULL; + name = w->kcontrol_news[kci].name; + } - path->long_name = kmalloc(name_len, GFP_KERNEL); + kcontrol = snd_soc_cnew(&w->kcontrol_news[kci], wlist, name, + prefix); + ret = snd_ctl_add(card, kcontrol); + if (ret < 0) { + dev_err(dapm->dev, + "ASoC: failed to add widget %s dapm kcontrol %s: %d\n", + w->name, name, ret); + kfree(wlist); + kfree(long_name); + return ret; + } - if (path->long_name == NULL) { - kfree(wlist); - return -ENOMEM; - } + path->long_name = long_name; + } - switch (w->id) { - default: - /* The control will get a prefix from - * the control creation process but - * we're also using the same prefix - * for widgets so cut the prefix off - * the front of the widget name. - */ - snprintf((char *)path->long_name, name_len, - "%s %s", w->name + prefix_len, - w->kcontrol_news[i].name); - break; - case snd_soc_dapm_mixer_named_ctl: - snprintf((char *)path->long_name, name_len, - "%s", w->kcontrol_news[i].name); - break; - } + kcontrol->private_data = wlist; + w->kcontrols[kci] = kcontrol; + path->kcontrol = kcontrol; - ((char *)path->long_name)[name_len - 1] = '\0'; + return 0; +} - path->kcontrol = snd_soc_cnew(&w->kcontrol_news[i], - wlist, path->long_name, - prefix); - ret = snd_ctl_add(card, path->kcontrol); - if (ret < 0) { - dev_err(dapm->dev, "ASoC: failed to add widget" - " %s dapm kcontrol %s: %d\n", - w->name, path->long_name, ret); - kfree(wlist); - kfree(path->long_name); - path->long_name = NULL; - return ret; +/* create new dapm mixer control */ +static int dapm_new_mixer(struct snd_soc_dapm_widget *w) +{ + int i, ret; + struct snd_soc_dapm_path *path; + + /* add kcontrol */ + for (i = 0; i < w->num_kcontrols; i++) { + /* match name */ + list_for_each_entry(path, &w->sources, list_sink) { + /* mixer/mux paths name must match control name */ + if (path->name != (char *)w->kcontrol_news[i].name) + continue; + + if (w->kcontrols[i]) { + path->kcontrol = w->kcontrols[i]; + continue; } - w->kcontrols[i] = path->kcontrol; + + ret = dapm_create_or_share_mixmux_kcontrol(w, i, path); + if (ret < 0) + return ret; } } - return ret; + + return 0; } /* create new dapm mux control */ static int dapm_new_mux(struct snd_soc_dapm_widget *w) { struct snd_soc_dapm_context *dapm = w->dapm; - struct snd_soc_dapm_path *path = NULL; - struct snd_kcontrol *kcontrol; - struct snd_card *card = dapm->card->snd_card; - const char *prefix; - size_t prefix_len; + struct snd_soc_dapm_path *path; int ret; - struct snd_soc_dapm_widget_list *wlist; - int shared, wlistentries; - size_t wlistsize; - const char *name; if (w->num_kcontrols != 1) { dev_err(dapm->dev, @@ -631,65 +679,19 @@ static int dapm_new_mux(struct snd_soc_dapm_widget *w) return -EINVAL; } - shared = dapm_is_shared_kcontrol(dapm, w, &w->kcontrol_news[0], - &kcontrol); - if (kcontrol) { - wlist = kcontrol->private_data; - wlistentries = wlist->num_widgets + 1; - } else { - wlist = NULL; - wlistentries = 1; - } - wlistsize = sizeof(struct snd_soc_dapm_widget_list) + - wlistentries * sizeof(struct snd_soc_dapm_widget *), - wlist = krealloc(wlist, wlistsize, GFP_KERNEL); - if (wlist == NULL) { - dev_err(dapm->dev, - "ASoC: can't allocate widget list for %s\n", w->name); - return -ENOMEM; - } - wlist->num_widgets = wlistentries; - wlist->widgets[wlistentries - 1] = w; - - if (!kcontrol) { - if (dapm->codec) - prefix = dapm->codec->name_prefix; - else - prefix = NULL; - - if (shared) { - name = w->kcontrol_news[0].name; - prefix_len = 0; - } else { - name = w->name; - if (prefix) - prefix_len = strlen(prefix) + 1; - else - prefix_len = 0; - } - - /* - * The control will get a prefix from the control creation - * process but we're also using the same prefix for widgets so - * cut the prefix off the front of the widget name. - */ - kcontrol = snd_soc_cnew(&w->kcontrol_news[0], wlist, - name + prefix_len, prefix); - ret = snd_ctl_add(card, kcontrol); - if (ret < 0) { - dev_err(dapm->dev, "ASoC: failed to add kcontrol %s: %d\n", - w->name, ret); - kfree(wlist); - return ret; - } + path = list_first_entry(&w->sources, struct snd_soc_dapm_path, + list_sink); + if (!path) { + dev_err(dapm->dev, "ASoC: mux %s has no paths\n", w->name); + return -EINVAL; } - kcontrol->private_data = wlist; - - w->kcontrols[0] = kcontrol; + ret = dapm_create_or_share_mixmux_kcontrol(w, 0, path); + if (ret < 0) + return ret; list_for_each_entry(path, &w->sources, list_sink) - path->kcontrol = kcontrol; + path->kcontrol = w->kcontrols[0]; return 0; } -- 1.7.10.4

2 1