April 2015 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] [PATCH 3/8] mfd: arizona: Add support for WM8998 and WM1814
by Mark Brown 27 Apr '15

27 Apr '15

On Tue, Apr 21, 2015 at 01:33:51PM +0100, Richard Fitzgerald wrote: > + switch (arizona->type) { > + case WM8998: > + case WM1814: > + /* Some bits are shifted on WM8998, > + * rearrange to match the standard bit layout > + */ > + val[0] = ((val[0] & 0x60e0) >> 1) | > + ((val[0] & 0x1e00) >> 2) | > + (val[0] & 0x000f); > + break; Are you sure this approach is going to scale (and avoid confusion)?

2 1

[alsa-devel] [PATCH] ALSA: emu10k1: Fix card shortname string buffer overflow
by Takashi Iwai 27 Apr '15

27 Apr '15

Some models provide too long string for the shortname that has 32bytes including the terminator, and it results in a non-terminated string exposed to the user-space. This isn't too critical, though, as the string is stopped at the succeeding longname string. This patch fixes such entries by dropping "SB" prefix (it's enough to fit within 32 bytes, so far). Meanwhile, it also changes strcpy() with strlcpy() to make sure that this kind of problem won't happen in future, too. Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/emu10k1/emu10k1.c | 6 ++++-- sound/pci/emu10k1/emu10k1_main.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index 37d0220a094c..db7a2e5e4a14 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c @@ -183,8 +183,10 @@ static int snd_card_emu10k1_probe(struct pci_dev *pci, } #endif - strcpy(card->driver, emu->card_capabilities->driver); - strcpy(card->shortname, emu->card_capabilities->name); + strlcpy(card->driver, emu->card_capabilities->driver, + sizeof(card->driver)); + strlcpy(card->shortname, emu->card_capabilities->name, + sizeof(card->shortname)); snprintf(card->longname, sizeof(card->longname), "%s (rev.%d, serial:0x%x) at 0x%lx, irq %i", card->shortname, emu->revision, emu->serial, emu->port, emu->irq); diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 54079f5d5673..4f8cf5e7e45f 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1446,7 +1446,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { * */ {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x20011102, - .driver = "Audigy2", .name = "SB Audigy 2 ZS Notebook [SB0530]", + .driver = "Audigy2", .name = "Audigy 2 ZS Notebook [SB0530]", .id = "Audigy2", .emu10k2_chip = 1, .ca0108_chip = 1, @@ -1596,7 +1596,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { .adc_1361t = 1, /* 24 bit capture instead of 16bit */ .ac97_chip = 1} , {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102, - .driver = "Audigy2", .name = "SB Audigy 2 Platinum EX [SB0280]", + .driver = "Audigy2", .name = "Audigy 2 Platinum EX [SB0280]", .id = "Audigy2", .emu10k2_chip = 1, .ca0102_chip = 1, -- 2.3.5

1 0

[alsa-devel] [PATCH 1/2] sound: Close holes in struct snd_pcm_hw_rule
by Lars-Peter Clausen 27 Apr '15

27 Apr '15

On a 64-bit system there are two 32-bit holes due to the alignment of 64-bit fields. Reordering things slightly gets rid of those holes, reducing the size of the struct by 17% percent of its original size. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- include/sound/pcm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 0cb7f3f..d632809 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -224,9 +224,10 @@ typedef int (*snd_pcm_hw_rule_func_t)(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule { unsigned int cond; - snd_pcm_hw_rule_func_t func; int var; int deps[4]; + + snd_pcm_hw_rule_func_t func; void *private; }; -- 1.8.0

2 3

[alsa-devel] [PATCH 1/2] ALSA: hda - Fix mute-LED fixed mode
by Takashi Iwai 27 Apr '15

27 Apr '15

The mute-LED mode control has the fixed on/off states that are supposed to remain on/off regardless of the master switch. However, this doesn't work actually because the vmaster hook is called in the vmaster code itself. This patch fixes it by calling the hook indirectly after checking the mute LED mode. Reported-and-tested-by: Pali Rohár <pali.rohar(a)gmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_codec.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 873ed1bce12b..27333e0d8ebe 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -2082,6 +2082,16 @@ static struct snd_kcontrol_new vmaster_mute_mode = { .put = vmaster_mute_mode_put, }; +/* meta hook to call each driver's vmaster hook */ +static void vmaster_hook(void *private_data, int enabled) +{ + struct hda_vmaster_mute_hook *hook = private_data; + + if (hook->mute_mode != HDA_VMUTE_FOLLOW_MASTER) + enabled = hook->mute_mode; + hook->hook(hook->codec, enabled); +} + /** * snd_hda_add_vmaster_hook - Add a vmaster hook for mute-LED * @codec: the HDA codec @@ -2100,9 +2110,9 @@ int snd_hda_add_vmaster_hook(struct hda_codec *codec, if (!hook->hook || !hook->sw_kctl) return 0; - snd_ctl_add_vmaster_hook(hook->sw_kctl, hook->hook, codec); hook->codec = codec; hook->mute_mode = HDA_VMUTE_FOLLOW_MASTER; + snd_ctl_add_vmaster_hook(hook->sw_kctl, vmaster_hook, hook); if (!expose_enum_ctl) return 0; kctl = snd_ctl_new1(&vmaster_mute_mode, hook); @@ -2128,14 +2138,7 @@ void snd_hda_sync_vmaster_hook(struct hda_vmaster_mute_hook *hook) */ if (hook->codec->bus->shutdown) return; - switch (hook->mute_mode) { - case HDA_VMUTE_FOLLOW_MASTER: - snd_ctl_sync_vmaster_hook(hook->sw_kctl); - break; - default: - hook->hook(hook->codec, hook->mute_mode); - break; - } + snd_ctl_sync_vmaster_hook(hook->sw_kctl); } EXPORT_SYMBOL_GPL(snd_hda_sync_vmaster_hook); -- 2.3.5

1 1

[alsa-devel] Pop noise on startup when headphones are plugged in (Dell XPS13 9333)
by Gabriele Mazzotta 27 Apr '15

27 Apr '15

Hi, I've recently found that commit a551d91473 ("ALSA: hda - Use regmap for command verb caches, too") is somehow causing a pop noise on startup when headphones are plugged in, but I couldn't figure out the exact cause. Was this observed on other systems (mine is a Dell XPS13 9333, Realtek ALC3661)? Does anyone have any idea of what the cause might be? Regards, Gabriele

3 17

[alsa-devel] [PATCH] ASoC: Intel: fix Coccinelle kfree warning
by Firo Yang 27 Apr '15

27 Apr '15

It's not necessary to use kfree() to free memory allocated with devm_kzalloc in a probe function and using kfree leads to a double free. Signed-off-by: Firo Yang <firogm(a)gmail.com> --- sound/soc/intel/haswell/sst-haswell-ipc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/haswell/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c index 344a1e9..324eceb 100644 --- a/sound/soc/intel/haswell/sst-haswell-ipc.c +++ b/sound/soc/intel/haswell/sst-haswell-ipc.c @@ -2201,7 +2201,6 @@ dma_err: dsp_new_err: sst_ipc_fini(ipc); ipc_init_err: - kfree(hsw); return ret; } EXPORT_SYMBOL_GPL(sst_hsw_dsp_init); -- 2.1.0

2 3

[alsa-devel] [PATCH] rajeev-dlh.kumar@st.com email-id doesn't exist anymore as I have left the company. Replace ST's id with Rajeev Kumar <rajeevkumar.linux@gmail.com>
by Rajeev Kumar 27 Apr '15

27 Apr '15

It also updates .mailmap file to fix address for 'git shortlog' Signed-off-by: Rajeev Kumar <rajeevkumar.linux(a)gmail.com> --- .mailmap | 1 + arch/arm/mach-spear/generic.h | 2 +- arch/arm/mach-spear/include/mach/irqs.h | 2 +- arch/arm/mach-spear/include/mach/spear.h | 2 +- arch/arm/mach-spear/spear6xx.c | 2 +- drivers/input/keyboard/spear-keyboard.c | 2 +- drivers/rtc/rtc-spear.c | 4 ++-- include/linux/platform_data/keyboard-spear.h | 2 +- include/sound/designware_i2s.h | 2 +- include/sound/spear_dma.h | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.mailmap b/.mailmap index 0d971cf..c570755 100644 --- a/.mailmap +++ b/.mailmap @@ -96,6 +96,7 @@ Peter A Jonsson <pj(a)ludd.ltu.se> Peter Oruba <peter(a)oruba.de> Peter Oruba <peter.oruba(a)amd.com> Praveen BP <praveenbp(a)ti.com> +Rajeev Kumar <rajeevkumar.linux(a)gmail.com> Rajesh Shah <rajesh.shah(a)intel.com> Ralf Baechle <ralf(a)linux-mips.org> Ralf Wildenhues <Ralf.Wildenhues(a)gmx.de> diff --git a/arch/arm/mach-spear/generic.h b/arch/arm/mach-spear/generic.h index a99d90a..0bfd2ea 100644 --- a/arch/arm/mach-spear/generic.h +++ b/arch/arm/mach-spear/generic.h @@ -2,7 +2,7 @@ * spear machine family generic header file * * Copyright (C) 2009-2012 ST Microelectronics - * Rajeev Kumar <rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * Viresh Kumar <viresh.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-spear/include/mach/irqs.h b/arch/arm/mach-spear/include/mach/irqs.h index 92da0a8..022cf98 100644 --- a/arch/arm/mach-spear/include/mach/irqs.h +++ b/arch/arm/mach-spear/include/mach/irqs.h @@ -2,7 +2,7 @@ * IRQ helper macros for spear machine family * * Copyright (C) 2009-2012 ST Microelectronics - * Rajeev Kumar <rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * Viresh Kumar <viresh.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-spear/include/mach/spear.h b/arch/arm/mach-spear/include/mach/spear.h index f2d6a01..0d2f14d 100644 --- a/arch/arm/mach-spear/include/mach/spear.h +++ b/arch/arm/mach-spear/include/mach/spear.h @@ -2,7 +2,7 @@ * SPEAr3xx/6xx Machine family specific definition * * Copyright (C) 2009,2012 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * Viresh Kumar <viresh.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c index da26fa5b..c6dcb0d 100644 --- a/arch/arm/mach-spear/spear6xx.c +++ b/arch/arm/mach-spear/spear6xx.c @@ -4,7 +4,7 @@ * SPEAr6XX machines common source file * * Copyright (C) 2009 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * * Copyright 2012 Stefan Roese <sr(a)denx.de> * diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c index f42a543..623d451 100644 --- a/drivers/input/keyboard/spear-keyboard.c +++ b/drivers/input/keyboard/spear-keyboard.c @@ -3,7 +3,7 @@ * Based on omap-keypad driver * * Copyright (C) 2010 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c index d2cdb98..d14be33 100644 --- a/drivers/rtc/rtc-spear.c +++ b/drivers/rtc/rtc-spear.c @@ -2,7 +2,7 @@ * drivers/rtc/rtc-spear.c * * Copyright (C) 2010 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -504,6 +504,6 @@ static struct platform_driver spear_rtc_driver = { module_platform_driver(spear_rtc_driver); MODULE_ALIAS("platform:rtc-spear"); -MODULE_AUTHOR("Rajeev Kumar <rajeev-dlh.kumar(a)st.com>"); +MODULE_AUTHOR("Rajeev Kumar <rajeevkumar.linux(a)gmail.com>"); MODULE_DESCRIPTION("ST SPEAr Realtime Clock Driver (RTC)"); MODULE_LICENSE("GPL"); diff --git a/include/linux/platform_data/keyboard-spear.h b/include/linux/platform_data/keyboard-spear.h index 9248e3a..5e3ff65 100644 --- a/include/linux/platform_data/keyboard-spear.h +++ b/include/linux/platform_data/keyboard-spear.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2010 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/include/sound/designware_i2s.h b/include/sound/designware_i2s.h index 26f406e..3a8fca9 100644 --- a/include/sound/designware_i2s.h +++ b/include/sound/designware_i2s.h @@ -1,5 +1,5 @@ /* - * Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar(a)st.com) + * Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux(a)gmail.com) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/sound/spear_dma.h b/include/sound/spear_dma.h index 65aca51..e290de4 100644 --- a/include/sound/spear_dma.h +++ b/include/sound/spear_dma.h @@ -1,7 +1,7 @@ /* * linux/spear_dma.h * -* Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar(a)st.com) +* Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux(a)gmail.com) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- 1.7.9.5

1 0

[alsa-devel] [PATCH v3 0/2] Add support for select accessory detect mode to HPDETL or HPDETR
by Inha Song 27 Apr '15

27 Apr '15

This set of patches adds support for select accessory detect mode to HPDETL or HPDETR. Changes in v3: - Set the hpdet_channel default value to HPDETL If the value is unknown or invalid. Changes in v2: - Use the value in pdata instead of hpdet_channel in extcon_info. - Wrap arizona_extcon_of_get in IS_ENABLED(CONFIG_OF). - Change hpdet_channel type to unsigned from signed in pdata. - Move ARIZONA_ACCDET_MODE_* define to dt-binding header and directly set it to pdata. Inha Song (2): extcon: arizona: Add support for select accessory detect mode when headphone detection mfd: arizona: Update DT binding to support hpdet channel Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++ drivers/extcon/extcon-arizona.c | 38 ++++++++++++++++++----- include/dt-bindings/mfd/arizona.h | 8 +++++ include/linux/mfd/arizona/pdata.h | 3 ++ 4 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 include/dt-bindings/mfd/arizona.h -- 2.0.0.390.gcb682f8

2 5

Re: [alsa-devel] snd-bebob and PrismSound Orpheus fails with snd_pcm_hw_params_set_channels
by Mike Ood 25 Apr '15

25 Apr '15

Takashi Sakamoto wrote: > I do not understand techinical details, but the sound was > > perfect even with 192kHz/24bit audio using libffado. > > Ditto. libffado works with such broken stream by ignoring its packet > index. I guess that you've continued to use your device with > uns-ynchronized state for several years because no one reports it. > Well, one reason I believed I was doing fine with my Orpheus is one of the experiments I did in November 2010. ------------------------------------------------------------------------- I copied a 44.1kHz/16bit sound file into a USB memory, and played it on PS3. The optical output (SPDIF) of PS3 is fed into the optical input of Orpheus, and the data is captured using ffado and jackd. Two files, the original and the captured, are compared and showed perfect match. https://spinorlab.wordpress.com/2015/04/25/orpheus-and-bit-perfect/ (see https://spinorlab.files.wordpress.com/2015/04/orpheusbitperfect.jpg) ------------------------------------------------------------------------- I know I should have compared by not only capturing by Orpheus but playing by Orpheus, but I saved my effort assuming the reverse way should also be OK. (Actually, I did not expect any negative results. Was I too optimistic?) *** Therefore, I still can not believe I am experiencing packet losses (without noticing). I mean not with juju+libffado+jackd. I really don't know what is happening with snd-bebob. *** > So if it's only a > > #define TIMER_SOMETHING value_anything > > type of things... > > I cannot understand what you mean. > Never mind. I am not a very technical person anyway. I just thought if it is due to a VERY STRICT timeout checking policy, relaxing the value of timeout might help. > Unless fully understanding specifications about your device, you cannot > make firm statement about it, I think. The drivers installed in Windows > or OS X can set the synchronization when plugging-in. > You are correct! (See the item 8 below.) I did some experiment today, although I am not sure if it has any technical meaning. --------------- My PC runnging on Windows 7 --------------- 1. Run Control Panel, and set Sync Source to PC DAW. 2. Play music with Audacity -> O.K. -> Stop music. 3. Kill Control panel. 4. Set Orpheus to Stand-by Mode 5. Remove Firewire Cable 6. Recover from Stand-by Mode 7. Connect Firewire Cable 8. Run Control Panel, and Sync Source now reads Local, /*** this is not what I expected, but it is so. ***/ so set Sync Source to PC DAW again. 9. Play music with Audacity -> O.K. -> Keep playing 10. Kill Control Panel. -> Music still playing O.K. -> Stop Music 11. Set Orpheus to Stand-by Mode 12. Remove Firewire Cable --------------- Reboot My PC to start Linux --------------- 13. Recover from Stand-by Mode 14. Connect Firewire Cable 15. Enter the following CLIs. % dmesg [ 21.838971] r8169 0000:02:00.0 eth0: link down [ 24.281647] r8169 0000:02:00.0 eth0: link up [ 281.110728] irq_handler: 36 callbacks suppressed [ 281.110737] firewire_ohci 0000:08:00.0: isochronous cycle inconsistent [ 281.612586] firewire_core 0000:08:00.0: created device fw1: GUID 00119800010001f9, S400 [ 281.612747] firewire_core 0000:08:00.0: phy config: new root=ffc1, gap_count=5 % ls -l /proc/asound lrwxrwxrwx 1 root root 5 Apr 25 21:55 Orpheus -> card3 % cat /proc/asound/card3/firewire/clock Sampling rate: 44100 Clock Source: External (MSU-dest: 7) % aplay -D plughw:3,0 test.wav Playing WAVE 'test.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Stereo aplay: set_params:1297: Unable to install hw params: ACCESS: RW_INTERLEAVED FORMAT: S16_LE SUBFORMAT: STD SAMPLE_BITS: 16 FRAME_BITS: 32 CHANNELS: 2 RATE: 44100 PERIOD_TIME: (46439 46440) PERIOD_SIZE: 2048 PERIOD_BYTES: 8192 PERIODS: 4 BUFFER_TIME: (185759 185760) BUFFER_SIZE: 8192 BUFFER_BYTES: 32768 TICK_TIME: 0 % dmesg [ 21.838971] r8169 0000:02:00.0 eth0: link down [ 24.281647] r8169 0000:02:00.0 eth0: link up [ 281.110728] irq_handler: 36 callbacks suppressed [ 281.110737] firewire_ohci 0000:08:00.0: isochronous cycle inconsistent [ 281.612586] firewire_core 0000:08:00.0: created device fw1: GUID 00119800010001f9, S400 [ 281.612747] firewire_core 0000:08:00.0: phy config: new root=ffc1, gap_count=5 *** Regards, Mike Ood

1 0

[alsa-devel] [RFC] dice: simplifying address registration
by Takashi Sakamoto 25 Apr '15

25 Apr '15

Clemens, Would I request your comments about an attached patch? Currently Dice driver keeps address ranges for each unit instance. But there's a way to reuse the same address range. I think this idea can simplify driver probe processing and save resources of host controller. Regards Takashi Sakamoto

2 2