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

[alsa-devel] [PATCH] ALSA: core: don't return uninitialized snd_compr_tstamp
by Mark Brown 04 Feb '13

04 Feb '13

From: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> The snd_compr_update_tstamp() can only fill in the snd_compr_tstamp if the codec implements the pointer() function. If that happened the code was previously returning uninitialized garbage in the tstamp because it wasn't initialized anywhere. This change zero-fills the tstamp in the two places it is used before calling snd_compr_update_tstamp(), and also has snd_compr_update_tstamp() return an error indication if it can't provide a tstamp. For the case of snd_compr_calc_avail() it ignores this error because we still need to return info on the available buffer space even if we can't provide tstamp info - when the tstamp is not valid all fields are now guaranteed to be zero. Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/core/compress_offload.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index ad11dc9..2d62068 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -144,16 +144,17 @@ static int snd_compr_free(struct inode *inode, struct file *f) return 0; } -static void snd_compr_update_tstamp(struct snd_compr_stream *stream, +static int snd_compr_update_tstamp(struct snd_compr_stream *stream, struct snd_compr_tstamp *tstamp) { if (!stream->ops->pointer) - return; + return -ENOTSUPP; stream->ops->pointer(stream, tstamp); pr_debug("dsp consumed till %d total %d bytes\n", tstamp->byte_offset, tstamp->copied_total); stream->runtime->hw_pointer = tstamp->byte_offset; stream->runtime->total_bytes_transferred = tstamp->copied_total; + return 0; } static size_t snd_compr_calc_avail(struct snd_compr_stream *stream, @@ -161,7 +162,9 @@ static size_t snd_compr_calc_avail(struct snd_compr_stream *stream, { long avail_calc; /*this needs to be signed variable */ + memset(avail, 0, sizeof(*avail)); snd_compr_update_tstamp(stream, &avail->tstamp); + /* Still need to return avail even if tstamp can't be filled in */ /* FIXME: This needs to be different for capture stream, available is # of compressed data, for playback it's @@ -517,11 +520,14 @@ out: static inline int snd_compr_tstamp(struct snd_compr_stream *stream, unsigned long arg) { - struct snd_compr_tstamp tstamp; + struct snd_compr_tstamp tstamp = {0}; + int ret; - snd_compr_update_tstamp(stream, &tstamp); - return copy_to_user((struct snd_compr_tstamp __user *)arg, - &tstamp, sizeof(tstamp)) ? -EFAULT : 0; + ret = snd_compr_update_tstamp(stream, &tstamp); + if (ret == 0) + ret = copy_to_user((struct snd_compr_tstamp __user *)arg, + &tstamp, sizeof(tstamp)) ? -EFAULT : 0; + return ret; } static int snd_compr_pause(struct snd_compr_stream *stream) -- 1.7.10.4

4 3

[alsa-devel] [PATCH] ASOC: imx: audmux: add a integrated configuration function
by Gary Zhang 04 Feb '13

04 Feb '13

based on imx_audmux_v2_configure_port(), add a integrated interface to configure audmux port conveniently Signed-off-by: Gary Zhang <b13634(a)freescale.com> --- sound/soc/fsl/imx-audmux.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c index 251f4d9..ebd38a0 100644 --- a/sound/soc/fsl/imx-audmux.c +++ b/sound/soc/fsl/imx-audmux.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Freescale Semiconductor, Inc. + * Copyright 2012-2013 Freescale Semiconductor, Inc. * Copyright 2012 Linaro Ltd. * Copyright 2009 Pengutronix, Sascha Hauer <s.hauer(a)pengutronix.de> * @@ -244,6 +244,47 @@ int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr, } EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port); +int imx_audmux_configure_port(unsigned int int_port, unsigned int ext_port) +{ + int ret; + + if ((int_port > 7) || (ext_port > 7)) + return -EINVAL; + + if (audmux_type != IMX31_AUDMUX) + return -EINVAL; + + if (!audmux_base) + return -ENOSYS; + + if (audmux_clk) + clk_prepare_enable(audmux_clk); + + int_port--; + ext_port--; + ret = imx_audmux_v2_configure_port(int_port, + IMX_AUDMUX_V2_PTCR_SYN | + IMX_AUDMUX_V2_PTCR_TFSEL(ext_port) | + IMX_AUDMUX_V2_PTCR_TCSEL(ext_port) | + IMX_AUDMUX_V2_PTCR_TFSDIR | + IMX_AUDMUX_V2_PTCR_TCLKDIR, + IMX_AUDMUX_V2_PDCR_RXDSEL(ext_port)); + if (ret) { + pr_err("audmux internal port setup failed\n"); + return ret; + } + imx_audmux_v2_configure_port(ext_port, + IMX_AUDMUX_V2_PTCR_SYN, + IMX_AUDMUX_V2_PDCR_RXDSEL(int_port)); + if (ret) { + pr_err("audmux external port setup failed\n"); + return ret; + } + + return 0; +} +EXPORT_SYMBOL_GPL(imx_audmux_configure_port); + static int imx_audmux_probe(struct platform_device *pdev) { struct resource *res; -- 1.7.0.4

3 5

[alsa-devel] Loopback interface: suspend/resume leads to a kernel crash
by El boulangero 04 Feb '13

04 Feb '13

Hi, I use the loopback device all the time. It works pretty good, except when I suspend my computer to RAM. On resume, I've got a kernel call trace. Here is the procedure to reproduce this behaviour, it's pretty easy. # Insert module if needed $ modprobe snd_aloop pcm_substreams=2 # Let's see how it looks like $ aplay -l **** Liste des Périphériques Matériels PLAYBACK **** carte 0: PCH [HDA Intel PCH], périphérique 0: VT1802 Analog [VT1802 Analog] Sous-périphériques: 1/1 Sous-périphérique #0: subdevice #0 carte 0: PCH [HDA Intel PCH], périphérique 2: VT1802 HP [VT1802 HP] Sous-périphériques: 1/1 Sous-périphérique #0: subdevice #0 carte 0: PCH [HDA Intel PCH], périphérique 3: HDMI 0 [HDMI 0] Sous-périphériques: 1/1 Sous-périphérique #0: subdevice #0 carte 1: Loopback [Loopback], périphérique 0: Loopback PCM [Loopback PCM] Sous-périphériques: 2/2 Sous-périphérique #0: subdevice #0 Sous-périphérique #1: subdevice #1 carte 1: Loopback [Loopback], périphérique 1: Loopback PCM [Loopback PCM] Sous-périphériques: 2/2 Sous-périphérique #0: subdevice #0 Sous-périphérique #1: subdevice #1 # Use the loopback device $ aplay -D hw:1,0,0 sound.wave & # Suspend computer $ pm-suspend # Wake up the computer That's enough to reproduce this bug. Here are the kernel logs: [ 181.994434] PM: resume of devices complete after 3301.753 msecs [ 182.006413] Restarting tasks ... done. [ 182.006590] ------------[ cut here ]------------ [ 182.006605] kernel BUG at kernel/timer.c:908! [ 182.006619] video LNXVIDEO:00: Restoring backlight state [ 182.006621] invalid opcode: 0000 [#1] PREEMPT SMP [ 182.006640] Modules linked in: snd_aloop af_packet nfsd auth_rpcgss nfs_acl nfs lockd fscache sunrpc ipv6 loop uvcvideo videobuf2_vmalloc videobuf2_memops videobuf2_core videodev media joydev hid_generic usbhid coretemp kvm_intel kvm crc32c_intel ghash_clmulni_intel aesni_intel xts aes_x86_64 lrw i915 gf128mul i2c_algo_bit intel_agp intel_gtt drm_kms_helper ablk_helper drm cryptd iTCO_wdt snd_hda_codec_hdmi i2c_i801 psmouse iTCO_vendor_support snd_hda_codec_via snd_hda_intel snd_hda_codec snd_hwdep snd_pcm snd_page_alloc iwlwifi cfg80211 snd_seq snd_seq_device snd_timer snd ehci_pci button battery ac rtc_cmos microcode video i2c_core soundcore lpc_ich evdev serio_raw mei wmi ehci_hcd rfkill ext4 crc16 jbd2 mbcache sg sr_mod sd_mod cdrom ahci libahci libata scsi_mod thermal r8169 mii xhci_hcd [ 182.006642] CPU 1 [ 182.006642] Pid: 2982, comm: aplay Not tainted 3.8.0-rc5-kdump #1 System76, Inc. Gazelle Professional/Gazelle Professional [ 182.006646] RIP: 0010:[<ffffffff81063f8f>] [<ffffffff81063f8f>] add_timer+0xf/0x20 [ 182.006647] RSP: 0018:ffff880214a93d40 EFLAGS: 00010082 [ 182.006647] RAX: 00000000fffe34c9 RBX: ffff88021570e200 RCX: 00000000fffe344c [ 182.006648] RDX: 000000000001f3ff RSI: 0000000000f42400 RDI: ffff88021492f350 [ 182.006648] RBP: ffff88021492f300 R08: 000000000001f400 R09: 0000000000000020 [ 182.006649] R10: ffff88021588f800 R11: 0000000000000206 R12: 00000000fffffffe [ 182.006649] R13: ffff880214a3cc00 R14: ffff880214bbc464 R15: ffff88021588f800 [ 182.006650] FS: 00007f3489ed0700(0000) GS:ffff88021f240000(0000) knlGS:0000000000000000 [ 182.006650] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 182.006651] CR2: 0000000000000000 CR3: 00000002148fe000 CR4: 00000000001407e0 [ 182.006652] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 182.006652] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 182.006653] Process aplay (pid: 2982, threadinfo ffff880214a92000, task ffff880215928000) [ 182.006653] Stack: [ 182.006654] ffffffffa0d0947c 00000000000000b4 00000b2c00000003 0000000000003e80 [ 182.006655] ffffffffa02fbe80 ffff880214a3cc00 0000000000000003 ffff880214a3cc00 [ 182.006656] 0000000000000000 0000000000000fa0 ffffffffa02f01b0 0000000000003e80 [ 182.006656] Call Trace: [ 182.006659] [<ffffffffa0d0947c>] ? loopback_trigger+0x20c/0x2e0 [snd_aloop] [ 182.006664] [<ffffffffa02f01b0>] ? snd_pcm_action_single+0x30/0x80 [snd_pcm] [ 182.006667] [<ffffffffa02f86d1>] ? snd_pcm_lib_write1+0x391/0x400 [snd_pcm] [ 182.006669] [<ffffffffa02f5ab0>] ? snd_pcm_lib_readv_transfer+0x170/0x170 [snd_pcm] [ 182.006672] [<ffffffffa02f3f05>] ? snd_pcm_playback_ioctl1+0x255/0x270 [snd_pcm] [ 182.006674] [<ffffffffa02f3f47>] ? snd_pcm_playback_ioctl+0x27/0x30 [snd_pcm] [ 182.006676] [<ffffffff8115f43f>] ? do_vfs_ioctl+0x8f/0x530 [ 182.006678] [<ffffffff8114e4de>] ? vfs_read+0xfe/0x180 [ 182.006679] [<ffffffff8115f980>] ? sys_ioctl+0xa0/0xc0 [ 182.006681] [<ffffffff814591ad>] ? system_call_fastpath+0x1a/0x1f [ 182.006691] Code: e9 4c fe ff ff 4d 89 f4 e9 d4 fe ff ff 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 48 83 3f 00 75 09 48 8b 77 10 e9 a1 fd ff ff <0f> 0b 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 48 83 ec 08 [ 182.006692] RIP [<ffffffff81063f8f>] add_timer+0xf/0x20 [ 182.006692] RSP <ffff880214a93d40> I tried to change a few things in the snd_aloop driver, but this code is way beyond my understanding. I can't fix that myself. Feel free to contact me if you need more information. Thanks ! Regards, Arnaud

2 4

[alsa-devel] [PATCH] UAC2 clock selector - fixed?
by Louis Gorenfeld 03 Feb '13

03 Feb '13

Hi, I'd been struggling with a UAC2 device that I couldn't set the clock on. I finally got in touch with a driver author who pointed me to some official documentation (the USB Device Class Definition for Audio Devices). Where the ALSA code always sends a 16-bit packet to control mixer settings, the docs say that the clock selector control uses layout 1 which is 8-bit. By changing the routine to send an 8-bit packet, that control now works. This is the patch that fixes the problem for me (for ALSA 1.0.25). Is this proper? --- a/linux-3.4/sound/usb/mixer.c 2012-05-20 15:29:13.000000000 -0700 +++ b/vanilla-3.4/sound/usb/mixer.c 2013-01-02 17:06:11.009660059 -0800 @@ -422,8 +422,13 @@ if (cval->mixer->protocol == UAC_VERSION_1) { val_len = cval->val_type >= USB_MIXER_S16 ? 2 : 1; } else { /* UAC_VERSION_2 */ - /* audio class v2 controls are always 2 bytes in size */ - val_len = sizeof(__u16); + /* audio class v2 controls are often but not always 2 bytes in size */ + /* For example, the clock selector (see 5.2.5.2.1 in the Universal Serial + * Bus Device Class Definition for Audio Devices document) */ + if (cval->control == UAC2_CX_CLOCK_SELECTOR) + val_len = sizeof(__u8); + else + val_len = sizeof(__u16); /* FIXME */ if (request != UAC_SET_CUR) { Thanks much! Louis

2 1

[alsa-devel] [PATCH - my module 1/1] Fix a memory access violation resulting from improper error propogation.
by allan＠allanwirth.com 01 Feb '13

01 Feb '13

From: Allan Wirth <allan(a)allanwirth.com> Fixes an issue where a variable is used undeclared, which can cause seg faults on some systems if the configuration file is not formatted properly. Signed-off-by: Allan Wirth <allan(a)allanwirth.com> diff --git a/src/conf.c b/src/conf.c index ecaa339..4ba5863 100644 --- a/src/conf.c +++ b/src/conf.c @@ -3530,7 +3530,7 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t if (err < 0) goto _err; } - } else if (config_file_open(root, fi[idx].name) < 0) + } else if ((err = config_file_open(root, fi[idx].name)) < 0) goto _err; } *dst = NULL; -- 1.7.10.4

2 1

[alsa-devel] [git pull] another usb-audio bugfix
by Clemens Ladisch 01 Feb '13

01 Feb '13

The following change since commit 949db153b6466c6f7cad5a427ecea94985927311: Linux 3.8-rc5 (2013-01-25 11:57:28 -0800) is available in the git repository at: git://git.alsa-project.org/alsa-kprivate.git usb-audio-fix for you to fetch changes up to 7da58046482fceb17c4a0d4afefd9507ec56de7f: ALSA: usb-audio: fix Roland A-PRO support (2013-01-31 21:21:59 +0100) ---------------------------------------------------------------- Clemens Ladisch (1): ALSA: usb-audio: fix Roland A-PRO support sound/usb/quirks-table.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------- ALSA: usb-audio: fix Roland A-PRO support The quirk for the Roland/Cakewalk A-PRO keyboards accidentally used the wrong interface number, which prevented the driver from attaching to the device. Signed-off-by: Clemens Ladisch <clemens(a)ladisch.de> Cc: 2.6.37+ <stable(a)vger.kernel.org> diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 64d25a7..820580a 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -1750,7 +1750,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { /* .vendor_name = "Roland", */ /* .product_name = "A-PRO", */ - .ifnum = 1, + .ifnum = 0, .type = QUIRK_MIDI_FIXED_ENDPOINT, .data = & (const struct snd_usb_midi_endpoint_info) { .out_cables = 0x0003,

2 1

[alsa-devel] crashes in namehint
by Harald Sitter 31 Jan '13

31 Jan '13

aloha, I am working on kde multimedia and we are getting a considerable amount of crash reports from x86 ubuntu and fedora users. https://bugs.kde.org/show_bug.cgi?id=268185 http://notes.kde.org/alsa-bugs these crashes appear to be somewhat limited to x86 with only about 2 reports seeing this happen on x86_64. most of the reports suggest that it happens at startup and in particular for applications that tend to query ALSA devices shortly after startup (in fact, out of main() via a direct call chain). there are 3 different reports of which a sigsev in strcpy and sprintf seem most concerning. both appear in try_config() which was called with a malformed `name` string. now at least the sprintf and the strcpy crashes I can somewhat reliably reproduce on kubuntu 12.10 x86 in a virtualbox vm using the command 'kcmshell4 phonon' with phonon-backend-vlc installed and selected as default. and it appears that those are somehow related to how ubuntu does the pulseaudio integration... in /usr/share/alsa/alsa.conf all of alsa.conf.d/* is included, then there is alsa.conf.d/pulse.conf which contains > hook_func.pulse_load_if_running { > lib "libasound_module_conf_pulse.so" > func "conf_pulse_hook_load_if_running" > } > > @hooks [ > { > func pulse_load_if_running > files [ > "/usr/share/alsa/pulse-alsa.conf" > ] > errors false > } > ] so they load /usr/share/alsa/pulse-alsa.conf after checking PA is running. that file in turn contains the default pulse setup as seen in alsa-plugins [1] now with that lineup I can crash the kcmshell binary about 9/10 times with the strcpy sigsev where name in try_config is 0. if I replace the conditional load in pulse.conf with an explicit one (func load) it crashes about half as often but with the sprintf sigsev in try_config (name now being out-of-bounds rather than 0). if the content of pulse-alsa.conf (i.e. the actual config) is copied into pulse.conf the binary does not crash *at all*. quite the mysterious problem. however, since the crash disappears entirely when removing the second load (i.e. instead of alsa.conf->alsa.conf.d/pulse.conf->pulse-alsa.conf one were to use alsa.conf->alsa.conf.d/pulse.conf), I am lead to believe that this is either a problem caused by the second level of loading in general or a timing problem at large. most likely it is a combination of both where the additional load() calls introduce sufficient overhead to trigger the timing problem. ideas/thoughts/fixes welcome :S HS [1] http://git.alsa-project.org/?p=alsa-plugins.git;a=blob;f=pulse/99-pulseaudi…

3 5

[alsa-devel] [PATCH] ASoC: wm2200: Add ANC source select for outputs
by Chris Rattray 31 Jan '13

31 Jan '13

Signed-off-by: Chris Rattray <crattray(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm2200.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index 0181444..a850d88 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -1162,6 +1162,14 @@ SOC_DOUBLE_R_TLV("OUT2 Digital Volume", WM2200_DAC_DIGITAL_VOLUME_2L, digital_tlv), SOC_DOUBLE("OUT2 Switch", WM2200_PDM_1, WM2200_SPK1L_MUTE_SHIFT, WM2200_SPK1R_MUTE_SHIFT, 1, 1), +SOC_SINGLE("OUT1L ANC Switch", WM2200_DAC_VOLUME_LIMIT_1L, + WM2200_OUT1L_ANC_SRC_SHIFT, 1, 0), +SOC_SINGLE("OUT1R ANC Switch", WM2200_DAC_VOLUME_LIMIT_1R, + WM2200_OUT1R_ANC_SRC_SHIFT, 1, 0), +SOC_SINGLE("OUT2L ANC Switch", WM2200_DAC_VOLUME_LIMIT_2L, + WM2200_OUT2L_ANC_SRC_SHIFT, 1, 0), +SOC_SINGLE("OUT2R ANC Switch", WM2200_DAC_VOLUME_LIMIT_2R, + WM2200_OUT2R_ANC_SRC_SHIFT, 1, 0), }; WM2200_MIXER_ENUMS(OUT1L, WM2200_OUT1LMIX_INPUT_1_SOURCE); -- 1.7.2.5

1 0

[alsa-devel] Previous Post on PandaBoard
by Brent Weatherall 31 Jan '13

31 Jan '13

Hello, My previous post about PandaBoardES audio had one mistake. The code regarding the min/max values was a result of stepping through the 'snd_pcm_hw_params' call and NOT the 'snd_pcm_set_rate_near' call. My apologies for the bad information. Thank you. Regards, Brent

1 0

[alsa-devel] [PATCH 0/3] Make snd_device_name_hint() reentrant
by Jerome Forissier 31 Jan '13

31 Jan '13

The following 3 patches ensure that snd_device_name_hint() does not mdify any global variable. They fix spurious error messages that may occur when the function is called from multiple threads simultaneously. Jerome Forissier (3): Add snd_lib_error_set_local() to install a thread-local error handler. snd_device_name_hint(): do not change the global error handler. snd_device_name_hint(): do not use global snd_config. configure.in | 10 ++++++++ include/error.h | 6 +++++ src/control/namehint.c | 67 ++++++++++++++++++++++++++++---------------------- src/error.c | 24 +++++++++++++++++- 4 files changed, 76 insertions(+), 31 deletions(-) -- 1.8.1.2

1 3