September 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] Alsa Driver Scarlett
by Eugène Bandit 19 Sep '14

19 Sep '14

Hello, I've come across this earlier post from the alsa-devel mailing list : http://thread.gmane.org/gmane.linux.alsa.devel/126241/focus=126682 It deals with a kernel patch made to support some Focusrite Scarlett hardware, you can find the github project page is here : https://github.com/smilingthax/alsa-driver_scarlett I would be really interested in it being integrated into alsa. Unfortunately, it appears that the original developer of this patch cannot put any time into such a thing. Since I'm not skilled enough to perform this integration, i wanted to know if anyone was willing to work on this ? I own a Focusrite Scarlett 18i20 and can perform any test to help.

7 10

[alsa-devel] [PATCH] ASoC: max98090: Fix missing free_irq (part 2)
by Jarkko Nikula 19 Sep '14

19 Sep '14

I was blind to see interrupt was requested in codec probe instead of i2c probe when doing commit 4adeb0ccf86a ("ASoC: max98090: Fix missing free_irq") and there is still a case where interrupt is kept requested. Although not as fatal as original issue. Since codec can be reprobed while driver is loaded the subsequent max98090_probe() call will fail in interrupt request since it wasn't freed. Fix this by explicitly freeing irq in max98090_remove(). Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- for-next, I don't think this is critical enough for stable. --- sound/soc/codecs/max98090.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index f1543653a699..ccc1466c0440 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -2413,6 +2413,7 @@ static int max98090_remove(struct snd_soc_codec *codec) { struct max98090_priv *max98090 = snd_soc_codec_get_drvdata(codec); + devm_free_irq(codec->dev, max98090->irq, codec); cancel_delayed_work_sync(&max98090->jack_work); cancel_delayed_work_sync(&max98090->pll_det_enable_work); cancel_work_sync(&max98090->pll_det_disable_work); -- 2.1.0

2 2

Re: [alsa-devel] [PATCH 2/8 v2] coverity fix in alsa-libs
by Renu Tyagi 19 Sep '14

19 Sep '14

From 14668184bf5489a0a8398ba51a1a130654cb7d82 Mon Sep 17 00:00:00 2001 From: renu tyagi <renu.tyagi(a)samsung.com> Date: Fri, 19 Sep 2014 12:59:23 +0530 Subject: [PATCH] [pcm_file] : fixed missing free before return in case of error Signed-off-by: renu tyagi <renu.tyagi(a)samsung.com> --- src/pcm/pcm_file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index a0b8bf4..f6d222f 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -758,6 +758,7 @@ int snd_pcm_file_open(snd_pcm_t **pcmp, const char *name, ifd = open(ifname, O_RDONLY); /* TODO: mind blocking mode */ if (ifd < 0) { SYSERR("open %s for reading failed", ifname); + free(file->fname); free(file); return -errno; } @@ -772,6 +773,7 @@ int snd_pcm_file_open(snd_pcm_t **pcmp, const char *name, err = snd_pcm_new(&pcm, SND_PCM_TYPE_FILE, name, slave->stream, slave->mode); if (err < 0) { free(file->fname); + free(file->ifname); free(file); return err; } -- 1.7.1

1 0

[alsa-devel] [PATCH] ALSA: hda - Add fixup model name lookup for Lemote A1205
by Huacai Chen 19 Sep '14

19 Sep '14

Lemote A1004 is already added in commit a2dd933d01f (ALSA: hda - Add fixup name lookup for CX5051 and 5066 codecs), but Lemote A1205 has missing. Signed-off-by: Huacai Chen <chenhc(a)lemote.com> Cc: <stable(a)vger.kernel.org> # 3.15+ --- sound/pci/hda/patch_conexant.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 5f214f1..726b7c6 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -798,6 +798,7 @@ static const struct hda_model_fixup cxt5066_fixup_models[] = { { .id = CXT_PINCFG_LENOVO_TP410, .name = "tp410" }, { .id = CXT_FIXUP_THINKPAD_ACPI, .name = "thinkpad" }, { .id = CXT_PINCFG_LEMOTE_A1004, .name = "lemote-a1004" }, + { .id = CXT_PINCFG_LEMOTE_A1205, .name = "lemote-a1205" }, { .id = CXT_FIXUP_OLPC_XO, .name = "olpc-xo" }, {} }; -- 1.7.7.3

2 1

Re: [alsa-devel] [PATCH 6/8] coverity fix in alsa-libs
by Takashi Iwai 19 Sep '14

19 Sep '14

At Fri, 19 Sep 2014 04:56:12 +0000 (GMT), Renu Tyagi wrote: > > > From dc9aaa5d6d7a368dc34e1cbdf3fb79670eba1870 Mon Sep 17 00:00:00 2001 > From: renu tyagi <renu.tyagi(a)samsung.com> > Date: Fri, 19 Sep 2014 10:17:28 +0530 > Subject: [PATCH] [simple_abst] : adding null check for lib These are superfluous, but I don't care. Instead of hanging under the previous thread, could you resubmit your whole series again (after fixing the issues I suggested -- patch splitting, subject / changelog reformatting, etc). I have no idea which one to be taken any longer. thanks, Takashi

1 0

[alsa-devel] [PATCH] ASoC: samsung: Remove PCM support for WM8580 on SMDK
by Paul Bolle 18 Sep '14

18 Sep '14

On Thu, 2014-09-04 at 18:02 +0200, Arnd Bergmann wrote: > On Thursday 04 September 2014, Paul Bolle wrote: > > Ditto for [...] MACH_SMDKC110, and MACH_SMDKV210. Note that > > here SND_SOC_SMDK_WM8580_PCM can not be set anymore. >> > [...] > I think it would be nice if you could submit a patch to remove the > drivers from ASoC, then we can see if anybody complains. Also the same thing for v3.17-rc5 and next-20140918. So let's see if we can remove this driver too. Done on top of next-20140918. Again untested. -------->8-------- From: Paul Bolle <pebolle(a)tiscali.nl> Commit 28c8331d386a ("ARM: S5PV210: Remove support for board files") removed the Kconfig symbols MACH_SMDKC110 and MACH_SMDKV210. As a result the dependencies of SND_SOC_SMDK_WM8580_PCM can never be met. So remove the unbuildable "SoC PCM Audio support for WM8580 on SMDK". Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl> --- sound/soc/samsung/Kconfig | 9 -- sound/soc/samsung/Makefile | 2 - sound/soc/samsung/smdk_wm8580pcm.c | 186 ------------------------------------- 3 files changed, 197 deletions(-) delete mode 100644 sound/soc/samsung/smdk_wm8580pcm.c diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 9d9b149ad977..52fd0a446bdf 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -153,15 +153,6 @@ config SND_SOC_SAMSUNG_SMDK_SPDIF help Say Y if you want to add support for SoC S/PDIF audio on the SMDK. -config SND_SOC_SMDK_WM8580_PCM - tristate "SoC PCM Audio support for WM8580 on SMDK" - depends on SND_SOC_SAMSUNG && (MACH_SMDKV210 || MACH_SMDKC110) - depends on REGMAP_I2C - select SND_SOC_WM8580 - select SND_SAMSUNG_PCM - help - Say Y if you want to add support for SoC audio on the SMDK. - config SND_SOC_SMDK_WM8994_PCM tristate "SoC PCM Audio support for WM8994 on SMDK" depends on SND_SOC_SAMSUNG diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile index c30293a67176..51b471ace06f 100644 --- a/sound/soc/samsung/Makefile +++ b/sound/soc/samsung/Makefile @@ -36,7 +36,6 @@ snd-soc-snow-objs := snow.o snd-soc-smdk-wm9713-objs := smdk_wm9713.o snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o snd-soc-smdk-spdif-objs := smdk_spdif.o -snd-soc-smdk-wm8580pcm-objs := smdk_wm8580pcm.o snd-soc-smdk-wm8994pcm-objs := smdk_wm8994pcm.o snd-soc-speyside-objs := speyside.o snd-soc-tobermory-objs := tobermory.o @@ -61,7 +60,6 @@ obj-$(CONFIG_SND_SOC_SNOW) += snd-soc-snow.o obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM9713) += snd-soc-smdk-wm9713.o obj-$(CONFIG_SND_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF) += snd-soc-smdk-spdif.o -obj-$(CONFIG_SND_SOC_SMDK_WM8580_PCM) += snd-soc-smdk-wm8580pcm.o obj-$(CONFIG_SND_SOC_SMDK_WM8994_PCM) += snd-soc-smdk-wm8994pcm.o obj-$(CONFIG_SND_SOC_SPEYSIDE) += snd-soc-speyside.o obj-$(CONFIG_SND_SOC_TOBERMORY) += snd-soc-tobermory.o diff --git a/sound/soc/samsung/smdk_wm8580pcm.c b/sound/soc/samsung/smdk_wm8580pcm.c deleted file mode 100644 index 63d079303561..000000000000 --- a/sound/soc/samsung/smdk_wm8580pcm.c +++ /dev/null @@ -1,186 +0,0 @@ -/* - * sound/soc/samsung/smdk_wm8580pcm.c - * - * Copyright (c) 2011 Samsung Electronics Co. Ltd - * - * 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 the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ -#include <linux/module.h> -#include <sound/soc.h> -#include <sound/pcm_params.h> -#include <sound/pcm.h> - -#include <asm/mach-types.h> - -#include "../codecs/wm8580.h" -#include "dma.h" -#include "pcm.h" - -/* - * Board Settings: - * o '1' means 'ON' - * o '0' means 'OFF' - * o 'X' means 'Don't care' - * - * SMDK6410 Base B/D: CFG1-0000, CFG2-1111 - * SMDKC110, SMDKV210: CFGB11-100100, CFGB12-0000 - */ - -#define SMDK_WM8580_EXT_OSC 12000000 -#define SMDK_WM8580_EXT_MCLK 4096000 -#define SMDK_WM8580_EXT_VOICE 2048000 - -static unsigned long mclk_freq; -static unsigned long xtal_freq; - -/* - * If MCLK clock directly gets from XTAL, we don't have to use PLL - * to make MCLK, but if XTAL clock source connects with other codec - * pin (like XTI), we should have to set codec's PLL to make MCLK. - * Because Samsung SoC does not support pcmcdclk output like I2S. - */ - -static int smdk_wm8580_pcm_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *codec_dai = rtd->codec_dai; - struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - int rfs, ret; - - switch (params_rate(params)) { - case 8000: - break; - default: - printk(KERN_ERR "%s:%d Sampling Rate %u not supported!\n", - __func__, __LINE__, params_rate(params)); - return -EINVAL; - } - - rfs = mclk_freq / params_rate(params) / 2; - - /* Set the codec DAI configuration */ - ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B - | SND_SOC_DAIFMT_IB_NF - | SND_SOC_DAIFMT_CBS_CFS); - if (ret < 0) - return ret; - - /* Set the cpu DAI configuration */ - ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_B - | SND_SOC_DAIFMT_IB_NF - | SND_SOC_DAIFMT_CBS_CFS); - if (ret < 0) - return ret; - - if (mclk_freq == xtal_freq) { - ret = snd_soc_dai_set_sysclk(codec_dai, WM8580_CLKSRC_MCLK, - mclk_freq, SND_SOC_CLOCK_IN); - if (ret < 0) - return ret; - - ret = snd_soc_dai_set_clkdiv(codec_dai, WM8580_MCLK, - WM8580_CLKSRC_MCLK); - if (ret < 0) - return ret; - } else { - ret = snd_soc_dai_set_sysclk(codec_dai, WM8580_CLKSRC_PLLA, - mclk_freq, SND_SOC_CLOCK_IN); - if (ret < 0) - return ret; - - ret = snd_soc_dai_set_clkdiv(codec_dai, WM8580_MCLK, - WM8580_CLKSRC_PLLA); - if (ret < 0) - return ret; - - ret = snd_soc_dai_set_pll(codec_dai, WM8580_PLLA, 0, - xtal_freq, mclk_freq); - if (ret < 0) - return ret; - } - - /* Set PCM source clock on CPU */ - ret = snd_soc_dai_set_sysclk(cpu_dai, S3C_PCM_CLKSRC_MUX, - mclk_freq, SND_SOC_CLOCK_IN); - if (ret < 0) - return ret; - - /* Set SCLK_DIV for making bclk */ - ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C_PCM_SCLK_PER_FS, rfs); - if (ret < 0) - return ret; - - return 0; -} - -static struct snd_soc_ops smdk_wm8580_pcm_ops = { - .hw_params = smdk_wm8580_pcm_hw_params, -}; - -static struct snd_soc_dai_link smdk_dai[] = { - { - .name = "WM8580 PAIF PCM RX", - .stream_name = "Playback", - .cpu_dai_name = "samsung-pcm.0", - .codec_dai_name = "wm8580-hifi-playback", - .platform_name = "samsung-audio", - .codec_name = "wm8580.0-001b", - .ops = &smdk_wm8580_pcm_ops, - }, { - .name = "WM8580 PAIF PCM TX", - .stream_name = "Capture", - .cpu_dai_name = "samsung-pcm.0", - .codec_dai_name = "wm8580-hifi-capture", - .platform_name = "samsung-pcm.0", - .codec_name = "wm8580.0-001b", - .ops = &smdk_wm8580_pcm_ops, - }, -}; - -static struct snd_soc_card smdk_pcm = { - .name = "SMDK-PCM", - .owner = THIS_MODULE, - .dai_link = smdk_dai, - .num_links = 2, -}; - -/* - * After SMDKC110 Base Board's Rev is '0.1', 12MHz External OSC(X1) - * is absent (or not connected), so we connect EXT_VOICE_CLK(OSC4), - * 2.0484Mhz, directly with MCLK both Codec and SoC. - */ -static int snd_smdk_probe(struct platform_device *pdev) -{ - int ret = 0; - - xtal_freq = SMDK_WM8580_EXT_OSC; - mclk_freq = SMDK_WM8580_EXT_MCLK; - - if (machine_is_smdkc110() || machine_is_smdkv210()) - xtal_freq = mclk_freq = SMDK_WM8580_EXT_VOICE; - - smdk_pcm.dev = &pdev->dev; - ret = devm_snd_soc_register_card(&pdev->dev, &smdk_pcm); - if (ret) - dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret); - - return ret; -} - -static struct platform_driver snd_smdk_driver = { - .driver = { - .owner = THIS_MODULE, - .name = "samsung-smdk-pcm", - }, - .probe = snd_smdk_probe, -}; - -module_platform_driver(snd_smdk_driver); - -MODULE_AUTHOR("Sangbeom Kim, <sbkim73(a)samsung.com>"); -MODULE_DESCRIPTION("ALSA SoC SMDK WM8580 for PCM"); -MODULE_LICENSE("GPL"); -- 1.9.3

2 1

Re: [alsa-devel] [PATCH 6/8] coverity fix in alsa-libs
by Takashi Iwai 18 Sep '14

18 Sep '14

At Thu, 18 Sep 2014 11:29:51 +0000 (GMT), Renu Tyagi wrote: > > Hi, > Bug Type : If lib is NULL return error to avoid strlen of NULL string > File changed : simple_abst.c > PFA patch6 > > Thanks > Renu Tyagi > ---------------------------------------------------------------------------------------- > From 052755ef6fec398f4e49bd31e9e60fe42a14ba53 Mon Sep 17 00:00:00 2001 > From: renu tyagi <renu.tyagi(a)samsung.com> > Date: Thu, 18 Sep 2014 16:41:43 +0530 > Subject: [PATCH 6/8] [simple_abst] : If lib is NULL return error to avoid strlen of NULL string. > > > Signed-off-by: renu tyagi <renu.tyagi(a)samsung.com> > --- > src/mixer/simple_abst.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c > index 9e9aaf5..67330c2 100644 > --- a/src/mixer/simple_abst.c > +++ b/src/mixer/simple_abst.c > @@ -71,6 +71,8 @@ static int try_open(snd_mixer_class_t *class, const char *lib) > int err = 0; > > path = getenv("ALSA_MIXER_SIMPLE_MODULES"); > + if (!lib) > + return -ENXIO; This should be put before getenv() call. Please fix and resubmit? Takashi > if (!path) > path = SO_PATH; > xlib = malloc(strlen(lib) + strlen(path) + 1 + 1); > -- > 1.7.1

1 0

Re: [alsa-devel] [PATCH 4/8] coverity fix in alsa-libs
by Takashi Iwai 18 Sep '14

18 Sep '14

At Thu, 18 Sep 2014 11:24:41 +0000 (GMT), Renu Tyagi wrote: > > Hi, > Bug Type : Fixing Double free caused by calling snd_hctl_close(hctl) twice as it is called inside snd_mixer_attach_hctl also > File changed : mixer.c > PFA patch4 > ------------------------------------------------------- > From 685fba24eeb639e151f126026130cc631741bcad Mon Sep 17 00:00:00 2001 > From: renu tyagi <renu.tyagi(a)samsung.com> > Date: Thu, 18 Sep 2014 16:26:45 +0530 > Subject: [PATCH 4/8] [mixer] : Fixing Double free caused by calling snd_hctl_close(hctl) twice as it is called inside snd_mixer_attach_hctl also Please avoid too long subject line. Keep it concise, and put rather the detailed description in the patch changelog text. Takashi > > > Signed-off-by: renu tyagi <renu.tyagi(a)samsung.com> > --- > src/mixer/mixer.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c > index 56e023d..eee9875 100644 > --- a/src/mixer/mixer.c > +++ b/src/mixer/mixer.c > @@ -204,10 +204,8 @@ int snd_mixer_attach(snd_mixer_t *mixer, const char *name) > if (err < 0) > return err; > err = snd_mixer_attach_hctl(mixer, hctl); > - if (err < 0) { > - snd_hctl_close(hctl); > + if (err < 0) > return err; > - } > return 0; > } > > -- > 1.7.1 > > Thanks > Renu Tyagi

1 0

Re: [alsa-devel] [PATCH] coverity fix in alsa-libs
by Takashi Iwai 18 Sep '14

18 Sep '14

At Thu, 18 Sep 2014 11:15:50 +0000 (GMT), Renu Tyagi wrote: > > > Hi, > Bug type : missing freeing resources before returning in case of errors > Files changed : sbase.c pcm_file.c > PFA patch > > ------------------------------------------------------------------- > From f201df1f5c5d129f21c663c81fdb495d9a3ca51e Mon Sep 17 00:00:00 2001 > From: renu tyagi <renu.tyagi(a)samsung.com> > Date: Thu, 18 Sep 2014 16:17:55 +0530 > Subject: [PATCH 2/8] [sbase , pcm_file] : freeing resources before returning in case of errors Please just send the patch as is. We don't need any foreword. Also, if the changes cover over different areas, split the patch. thanks, Takashi > Signed-off-by: renu tyagi <renu.tyagi(a)samsung.com> > --- > modules/mixer/simple/sbase.c | 1 + > src/pcm/pcm_file.c | 2 ++ > 2 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/modules/mixer/simple/sbase.c b/modules/mixer/simple/sbase.c > index 97feee8..bb2f59d 100644 > --- a/modules/mixer/simple/sbase.c > +++ b/modules/mixer/simple/sbase.c > @@ -377,6 +377,7 @@ static int simple_event_add1(snd_mixer_class_t *class, > if (ctype != SND_CTL_ELEM_TYPE_BOOLEAN) { > __invalid_type: > snd_mixer_selem_id_free(id); > + free(hsimple); > return -EINVAL; > } > break; > diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c > index a0b8bf4..f6d222f 100644 > --- a/src/pcm/pcm_file.c > +++ b/src/pcm/pcm_file.c > @@ -758,6 +758,7 @@ int snd_pcm_file_open(snd_pcm_t **pcmp, const char *name, > ifd = open(ifname, O_RDONLY); /* TODO: mind blocking mode */ > if (ifd < 0) { > SYSERR("open %s for reading failed", ifname); > + free(file->fname); > free(file); > return -errno; > } > @@ -772,6 +773,7 @@ int snd_pcm_file_open(snd_pcm_t **pcmp, const char *name, > err = snd_pcm_new(&pcm, SND_PCM_TYPE_FILE, name, slave->stream, slave->mode); > if (err < 0) { > free(file->fname); > + free(file->ifname); > free(file); > return err; > } > -- > 1.7.1 > > Thanks > Renu Tyagi >

1 0

Re: [alsa-devel] [PATCH 8/8] coverity fix in alsa-libs
by Renu Tyagi 18 Sep '14

18 Sep '14

Hi, Bug Type : Null check before closing h Files changed : pcm_hooks.c PFA patch8 Thanks Renu Tyagi ------------------------------------------------------------------------- From 906a8b65911edfd9d8bef48450707685bf4b8980 Mon Sep 17 00:00:00 2001 From: renu tyagi <renu.tyagi(a)samsung.com> Date: Thu, 18 Sep 2014 16:45:59 +0530 Subject: [PATCH 8/8] [pcm_hooks] : Null check before closing h Signed-off-by: renu tyagi <renu.tyagi(a)samsung.com> --- src/pcm/pcm_hooks.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/pcm/pcm_hooks.c b/src/pcm/pcm_hooks.c index 0b93c64..ce1cf36 100644 --- a/src/pcm/pcm_hooks.c +++ b/src/pcm/pcm_hooks.c @@ -457,7 +457,8 @@ static int snd_pcm_hook_add_conf(snd_pcm_t *pcm, snd_config_t *root, snd_config_ err = hook_add_dlobj(pcm, h); if (err < 0) { - snd_dlclose(h); + if(h) + snd_dlclose(h); return err; } return 0; -- 1.7.1

1 0