October 2011 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] [PATCH] hda_hwdep: Fix possible buffer overflow
by Takashi Iwai 01 Nov '11

01 Nov '11

At Wed, 26 Oct 2011 15:15:24 +0200, Alexander Stein wrote: > > Hello, > > On Wednesday 26 October 2011 14:58:43 Takashi Iwai wrote: > > At Wed, 26 Oct 2011 09:48:12 +0200, > > > > Alexander Stein wrote: > > > If a line in the firmware file is larger than the given buffer size (and > > > so the firmware file size), size is set to a value larger than the actual > > > buffer size. This results in an overflow in the buffer passed. > > > Fix this by copying only up to 127 chars per line. > > > > Actually this check should have been > > > > if (size > fw->size) > > size = fw->size; > > > > Otherwise it doesn't make sense. > > If the change is OK, could you resend the patch with it? > > IMO this check isn't even needed. This case should be catched by this check > > for (len = 0; len < fw->size; len++) { > > already. > Opinions? Right, it's superfluous. Let's get rid of it. Takashi

2 2

[alsa-devel] [PATCH] ASoC: Fix return value of wm5100_gpio_direction_out()
by Mark Brown 31 Oct '11

31 Oct '11

We can't just pass back the return value of snd_soc_update_bits() as it will be 1 if a bit changed rather than zero. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm5100.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index 3ab725a..cf66209 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -2366,13 +2366,17 @@ static int wm5100_gpio_direction_out(struct gpio_chip *chip, { struct wm5100_priv *wm5100 = gpio_to_wm5100(chip); struct snd_soc_codec *codec = wm5100->codec; - int val; + int val, ret; val = (1 << WM5100_GP1_FN_SHIFT) | (!!value << WM5100_GP1_LVL_SHIFT); - return snd_soc_update_bits(codec, WM5100_GPIO_CTRL_1 + offset, - WM5100_GP1_FN_MASK | WM5100_GP1_DIR | - WM5100_GP1_LVL, val); + ret = snd_soc_update_bits(codec, WM5100_GPIO_CTRL_1 + offset, + WM5100_GP1_FN_MASK | WM5100_GP1_DIR | + WM5100_GP1_LVL, val); + if (ret < 0) + return ret; + else + return 0; } static int wm5100_gpio_get(struct gpio_chip *chip, unsigned offset) -- 1.7.7.1

1 0

[alsa-devel] No line out on latest Mac Mini
by John Frankish 31 Oct '11

31 Oct '11

I posted this to the alsa-user list a couple of weeks ago but did not get an answer I've been trying to get analog line out to work to headphones or powered speakers with the latest Mac Mini, but so far the best I've managed to achieve is to get the internal speaker to work. Line out works with the Mac OS. I've also tried the HDA analyser mentioned here: http://www.alsa-project.org/main/index.php/HDA_Analyzer but no matter what I do, there is no way to get sound from the line out jack to headphones or powered speakers. I'm guessing I need one or more obscure options to load the module snd-hda-intel, but nothing I've tried so far has worked. The kernel documentation does not mention the mac mini 5,3 the Intel Corporation 6 Series/C200 Series Chipset nor the combination of Cirrus Logic CS4206 and Intel CougarPoint HDMI - does anybody know where I might find more details? Details below: ---------- DMI: Apple Inc. Macmini5,3/Mac-7BA5B2794B2CDB12, BIOS MM51.88Z.0075.B00.1106271442 06/27/2011 Alsa modules from linux-3.0.3 Alsa-1.0.23 $ lspci -knn 00:1b.0 Audio device [0403]: Intel Corporation 6 Series/C200 Series Chipset Family High Definition Audio Controller [8086:1c20] (rev 05) Subsystem: Intel Corporation Device [8086:7270] Kernel driver in use: HDA Intel Kernel modules: snd-hda-intel $ aplay -l **** List of PLAYBACK Hardware Devices **** card 0: PCH [HDA Intel PCH], device 0: Cirrus Analog [Cirrus Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: PCH [HDA Intel PCH], device 1: Cirrus Digital [Cirrus Digital] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: PCH [HDA Intel PCH], device 3: HDMI 0 [HDMI 0] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: PCH [HDA Intel PCH], device 7: HDMI 1 [HDMI 1] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: PCH [HDA Intel PCH], device 8: HDMI 2 [HDMI 2] Subdevices: 1/1 Subdevice #0: subdevice #0 $ head -n 1 /proc/asound/card0/codec* ==> /proc/asound/card0/codec#0 <== Codec: Cirrus Logic CS4206 ==> /proc/asound/card0/codec#3 <== Codec: Intel CougarPoint HDMI

2 4

[alsa-devel] [PATCH] ASoC: WM8904: Set `invert' bit for Capture Switch
by Hong Xu 31 Oct '11

31 Oct '11

Set `invert' bit for Capture Switch. Otherwise analogue is muted when Capture Switch is ON. Signed-off-by: Hong Xu <hong.xu(a)atmel.com> --- sound/soc/codecs/wm8904.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index b085575..cbba0b1 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -868,7 +868,7 @@ SOC_ENUM("Right Capture Mode", rin_mode), SOC_DOUBLE_R("Capture Volume", WM8904_ANALOGUE_LEFT_INPUT_0, WM8904_ANALOGUE_RIGHT_INPUT_0, 0, 31, 0), SOC_DOUBLE_R("Capture Switch", WM8904_ANALOGUE_LEFT_INPUT_0, - WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 0), + WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 1), SOC_SINGLE("High Pass Filter Switch", WM8904_ADC_DIGITAL_0, 4, 1, 0), SOC_ENUM("High Pass Filter Mode", hpf_mode), -- 1.7.3.3

2 1

[alsa-devel] [PATCH 1/2] ASoC: wm8711: Fix wrong mask for setting input audio data bit length select
by Axel Lin 31 Oct '11

31 Oct '11

The Input Audio Data Bit Length Select is controlled by BIT[3:2] of WM8711_IFACE(07h) register. Current code incorrectly masks BIT[1:0] which is for Audio Data Format Select. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/wm8711.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c index 8d0347c..8ba49d8 100644 --- a/sound/soc/codecs/wm8711.c +++ b/sound/soc/codecs/wm8711.c @@ -151,7 +151,7 @@ static int wm8711_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_codec *codec = dai->codec; struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec); - u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfffc; + u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfff3; int i = get_coeff(wm8711->sysclk, params_rate(params)); u16 srate = (coeff_div[i].sr << 2) | (coeff_div[i].bosr << 1) | coeff_div[i].usb; -- 1.7.5.4

2 4

[alsa-devel] [PATCH 1/3] ALSA: hdspm - Fix MADI channel format in the status ioctl
by Adrian Knoth 31 Oct '11

31 Oct '11

SNDRV_HDSPM_IOCTL_GET_STATUS is supposed to query the current card status, so we have to return what we receive on the MADI wire (RX), not what we transmit (TX) to others. The latter is a config item to be queried via SNDRV_HDSPM_IOCTL_GET_CONFIG. Signed-off-by: Adrian Knoth <adi(a)drcomp.erfurt.thur.de> diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index 6e2f7ef..60a0b7d 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c @@ -6253,7 +6253,7 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, status.card_specific.madi.madi_input = (statusregister & HDSPM_AB_int) ? 1 : 0; status.card_specific.madi.channel_format = - (statusregister & HDSPM_TX_64ch) ? 1 : 0; + (statusregister & HDSPM_RX_64ch) ? 1 : 0; /* TODO: Mac driver sets it when f_s>48kHz */ status.card_specific.madi.frame_format = 0; -- 1.7.7.1

2 3

Re: [alsa-devel] [PATCH 1/1] intel8x0: [v3] Improve performance in virtual environment
by Takashi Iwai 31 Oct '11

31 Oct '11

At Wed, 26 Oct 2011 19:11:01 +0400, Konstantin Ozerkov wrote: > > v3: detection code is x86 and KVM specific, hide it under ifdef > v2: add detection for virtual environments (KVM and Parallels) > > This patch is intended to improve performance in virtualized environments > like Parallels Desktop or KVM/VirtualBox/QEMU (virtual ICH/AC97 audio). > > I/O access is very time-expensive operation in virtual world: VCPU > can be rescheduled and in the worst case we get more than 10ms delay on > each I/O access. > > In the virtual environment loop exit rule > (old_civ == current_civ && old_picb == current_picb) is never satisfied, > because old_picb is never the same as current_picb due to delay inspired > by reading current_civ. As a result loop ended by timeout and we get 10x > more I/O operations. > > Experimental data from Prallels Desktop 7, RHEL6 guest (I/O ops per > second): > > Original code: > In Port Counter Callback > f014 41550 fffff00000179d00 ac97_bm_read_civ+0x000 > f018 41387 fffff0000017a580 ac97_bm_read_picb+0x000 > > With patch: > In Port Counter Callback > f014 4090 fffff00000179d00 ac97_bm_read_civ+0x000 > f018 1964 fffff0000017a580 ac97_bm_read_picb+0x000 > > Signed-off-by: Konstantin Ozerkov <kozerkov(a)parallels.com> > Signed-off-by: Denis V. Lunev <den(a)openvz.org> Thanks, applied now. Takashi > > diff --git a/pci/intel8x0.c b/pci/intel8x0.c > index 6a5b387..6dc302c 100644 > --- a/pci/intel8x0.c > +++ b/pci/intel8x0.c > @@ -42,6 +42,12 @@ > #include <asm/pgtable.h> > #include <asm/cacheflush.h> > > +#ifdef CONFIG_KVM_GUEST > +#include <asm/kvm_para.h> > +#else > +#define kvm_para_available() (0) > +#endif > + > MODULE_AUTHOR("Jaroslav Kysela <perex(a)perex.cz>"); > MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455"); > MODULE_LICENSE("GPL"); > @@ -77,6 +83,7 @@ static int buggy_semaphore; > static int buggy_irq = -1; /* auto-check */ > static int xbox; > static int spdif_aclink = -1; > +static int inside_vm = -1; > > module_param(index, int, 0444); > MODULE_PARM_DESC(index, "Index value for Intel i8x0 soundcard."); > @@ -94,6 +101,8 @@ module_param(xbox, bool, 0444); > MODULE_PARM_DESC(xbox, "Set to 1 for Xbox, if you have problems with the AC'97 codec detection."); > module_param(spdif_aclink, int, 0444); > MODULE_PARM_DESC(spdif_aclink, "S/PDIF over AC-link."); > +module_param(inside_vm, bool, 0444); > +MODULE_PARM_DESC(inside_vm, "KVM/Parallels optimization."); > > /* just for backward compatibility */ > static int enable; > @@ -400,6 +409,7 @@ struct intel8x0 { > unsigned buggy_irq: 1; /* workaround for buggy mobos */ > unsigned xbox: 1; /* workaround for Xbox AC'97 detection */ > unsigned buggy_semaphore: 1; /* workaround for buggy codec semaphore */ > + unsigned inside_vm: 1; /* enable VM optimization */ > > int spdif_idx; /* SPDIF BAR index; *_SPBAR or -1 if use PCMOUT */ > unsigned int sdm_saved; /* SDM reg value */ > @@ -1065,8 +1075,11 @@ static snd_pcm_uframes_t snd_intel8x0_pcm_pointer(struct snd_pcm_substream *subs > udelay(10); > continue; > } > - if (civ == igetbyte(chip, ichdev->reg_offset + ICH_REG_OFF_CIV) && > - ptr1 == igetword(chip, ichdev->reg_offset + ichdev->roff_picb)) > + if (civ != igetbyte(chip, ichdev->reg_offset + ICH_REG_OFF_CIV)) > + continue; > + if (chip->inside_vm) > + break; > + if (ptr1 == igetword(chip, ichdev->reg_offset + ichdev->roff_picb)) > break; > } while (timeout--); > ptr = ichdev->last_pos; > @@ -2984,6 +2997,10 @@ static int __devinit snd_intel8x0_create(struct snd_card *card, > if (xbox) > chip->xbox = 1; > > + chip->inside_vm = inside_vm; > + if (inside_vm) > + printk(KERN_INFO "intel8x0: enable KVM optimization\n"); > + > if (pci->vendor == PCI_VENDOR_ID_INTEL && > pci->device == PCI_DEVICE_ID_INTEL_440MX) > chip->fix_nocache = 1; /* enable workaround */ > @@ -3226,6 +3243,14 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci, > buggy_irq = 0; > } > > + if (inside_vm < 0) { > + /* detect KVM and Parallels virtual environments */ > + inside_vm = kvm_para_available(); > +#if defined(__i386__) || defined(__x86_64__) > + inside_vm = inside_vm || boot_cpu_has(X86_FEATURE_HYPERVISOR); > +#endif > + } > + > if ((err = snd_intel8x0_create(card, pci, pci_id->driver_data, > &chip)) < 0) { > snd_card_free(card); > -- > 1.7.7 >

1 0

[alsa-devel] [patch v2] [ALSA] hwdep: silence integer overflow warning
by Dan Carpenter 31 Oct '11

31 Oct '11

Smatch complains that if device is INT_MAX then device + 1 can overflow. It just means we would have an annoying loop while we check all the devices from -2147483648 to SNDRV_MINOR_HWDEPS. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- v2: reshuffled it a bit per Walter Harms's suggestion. diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c index c7ceb28..75ea16f 100644 --- a/sound/core/hwdep.c +++ b/sound/core/hwdep.c @@ -273,7 +273,14 @@ static int snd_hwdep_control_ioctl(struct snd_card *card, if (get_user(device, (int __user *)arg)) return -EFAULT; mutex_lock(&register_mutex); - device = device < 0 ? 0 : device + 1; + + if (device < 0) + device = 0; + else if (device < SNDRV_MINOR_HWDEPS) + device++; + else + device = SNDRV_MINOR_HWDEPS; + while (device < SNDRV_MINOR_HWDEPS) { if (snd_hwdep_search(card, device)) break;

2 1

Re: [alsa-devel] [patch] [ALSA] hwdep: silence integer overflow warning
by Dan Carpenter 28 Oct '11

28 Oct '11

On Thu, Oct 20, 2011 at 09:39:23AM +0200, walter harms wrote: > I am not sure how SNDRV_MINOR_HWDEPS is used further Either device = SNDRV_MINOR_HWDEPS or device = SNDRV_MINOR_HWDEPS + 1 are fine (equivalent) but it's a fair point. Your version is nicer. I'll redo the patch. regards, dan carpenter

2 2

[alsa-devel] Aureal issues on resume
by Clemens Ladisch 27 Oct '11

27 Oct '11

(added recipients) -------- Original Message -------- Subject: Aureal issues on resume Date: Fri, 02 Sep 2011 13:41:42 +0200 From: Anders Eriksson <aeriksson(a)fastmail.fm> To: linux-kernel(a)vger.kernel.org, linux-sound(a)vger.kernel.org Hi, upon resuming from hibernation, I see this in my log: Sep 2 11:15:20 tippex kernel: [72436.287020] vortex_adb_addroutes: unending route! 0x10 Sep 2 11:15:20 tippex kernel: [72436.287127] vortex_adb_addroutes: unending route! 0x838 Sep 2 11:15:20 tippex kernel: [72436.287277] vortex_adb_addroutes: unending route! 0x11 Sep 2 11:15:20 tippex kernel: [72436.287418] vortex_adb_addroutes: unending route! 0x8b9 Sep 2 11:15:20 tippex kernel: [72436.292037] Vortex: vortex_fifo_setadbctrl fail Sep 2 11:15:55 tippex kernel: [72471.403490] vortex_adb_delroutes: route not found! 0x10 Sep 2 11:15:55 tippex kernel: [72471.403596] vortex_adb_delroutes: route not found! 0x838 Sep 2 11:15:55 tippex kernel: [72471.403710] vortex_adb_delroutes: route not found! 0x11 Sep 2 11:15:55 tippex kernel: [72471.403811] vortex_adb_delroutes: route not found! 0x8b9 And the sound is no more. I need to reboot to get it back. If memory serves, it's been there since 2.6.30 or so. Any ideas what can be triggering it? lspci says it's an 00:04.0 Multimedia audio controller: Aureal Semiconductor Vortex 1 (rev 02) Subsystem: Diamond Multimedia Systems Sonic Impact A3D Flags: bus master, medium devsel, latency 64, IRQ 11 Memory at 50000000 (32-bit, non-prefetchable) [size=128K] I/O ports at 10b0 [size=8] I/O ports at 10b8 [size=8] Capabilities: [dc] Power Management version 1 Kernel driver in use: snd_au8820 Kernel modules: snd-au8820 -Anders

3 10