July 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: zte: spdif: constify snd_soc_dai_ops structure
by Gustavo A. R. Silva 17 Jul '17

17 Jul '17

This structure is only stored in the ops field of a snd_soc_dai_driver structure. That field is declared const, so snd_soc_dai_ops structures that have this property can be declared as const also. Signed-off-by: Gustavo A. R. Silva <garsilva(a)embeddedor.com> --- sound/soc/zte/zx-spdif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/zte/zx-spdif.c b/sound/soc/zte/zx-spdif.c index 9fa6463..b143f9f 100644 --- a/sound/soc/zte/zx-spdif.c +++ b/sound/soc/zte/zx-spdif.c @@ -264,7 +264,7 @@ static void zx_spdif_shutdown(struct snd_pcm_substream *substream, (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S18_3LE \ | SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE) -static struct snd_soc_dai_ops zx_spdif_dai_ops = { +static const struct snd_soc_dai_ops zx_spdif_dai_ops = { .trigger = zx_spdif_trigger, .startup = zx_spdif_startup, .shutdown = zx_spdif_shutdown, -- 2.5.0

2 1

[alsa-devel] [PATCH 1/2] ASoC: tlv320aic32x4: Add support for tlv320aic32x6
by Dan Murphy 17 Jul '17

17 Jul '17

Add support for the tlv320aic32x6 family of devices. These devices share the same register set as the tlv320aic32x4 and this driver can be re-used. TLV320aic32x6 data sheets are here: tlv320aic3256 - http://www.ti.com/lit/gpn/tlv320aic3256 tlv320aic3206 - http://www.ti.com/lit/gpn/tlv320aic3206 Signed-off-by: Dan Murphy <dmurphy(a)ti.com> --- Documentation/devicetree/bindings/sound/tlv320aic32x4.txt | 4 +++- sound/soc/codecs/tlv320aic32x4-i2c.c | 2 ++ sound/soc/codecs/tlv320aic32x4-spi.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt b/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt index 5e2741af27be..9651fc7503a4 100644 --- a/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt +++ b/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt @@ -3,7 +3,9 @@ Texas Instruments - tlv320aic32x4 Codec module The tlv320aic32x4 serial control bus communicates through I2C protocols Required properties: - - compatible: Should be "ti,tlv320aic32x4" + - compatible - "string" - One of: + "ti,tlv320aic32x4" TLV320AIC3204 + "ti,tlv320aic32x6" TLV320AIC3206, TLV320AIC3256 - reg: I2C slave address - supply-*: Required supply regulators are: "iov" - digital IO power supply diff --git a/sound/soc/codecs/tlv320aic32x4-i2c.c b/sound/soc/codecs/tlv320aic32x4-i2c.c index 59606cf3008f..385fa2e9525a 100644 --- a/sound/soc/codecs/tlv320aic32x4-i2c.c +++ b/sound/soc/codecs/tlv320aic32x4-i2c.c @@ -47,12 +47,14 @@ static int aic32x4_i2c_remove(struct i2c_client *i2c) static const struct i2c_device_id aic32x4_i2c_id[] = { { "tlv320aic32x4", 0 }, + { "tlv320aic32x6", 1 }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(i2c, aic32x4_i2c_id); static const struct of_device_id aic32x4_of_id[] = { { .compatible = "ti,tlv320aic32x4", }, + { .compatible = "ti,tlv320aic32x6", }, { /* senitel */ } }; MODULE_DEVICE_TABLE(of, aic32x4_of_id); diff --git a/sound/soc/codecs/tlv320aic32x4-spi.c b/sound/soc/codecs/tlv320aic32x4-spi.c index 724fcdd491b2..07d78ae51e05 100644 --- a/sound/soc/codecs/tlv320aic32x4-spi.c +++ b/sound/soc/codecs/tlv320aic32x4-spi.c @@ -48,12 +48,14 @@ static int aic32x4_spi_remove(struct spi_device *spi) static const struct spi_device_id aic32x4_spi_id[] = { { "tlv320aic32x4", 0 }, + { "tlv320aic32x6", 1 }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(spi, aic32x4_spi_id); static const struct of_device_id aic32x4_of_id[] = { { .compatible = "ti,tlv320aic32x4", }, + { .compatible = "ti,tlv320aic32x6", }, { /* senitel */ } }; MODULE_DEVICE_TABLE(of, aic32x4_of_id); -- 2.13.2.516.ge629a7d28

2 3

[alsa-devel] [PATCH 00/12] constify snd_soc_dai_ops structures
by Gustavo A. R. Silva 17 Jul '17

17 Jul '17

This patchset aims to constify all snd_soc_dai_ops structures that are only stored in the ops field of a snd_soc_dai_driver structure. That field is declared const, so snd_soc_dai_ops structures that have this property can be declared as const also. Thanks! Gustavo A. R. Silva (12): ASoC: cs42l42: constify snd_soc_dai_ops structure ASoC: rt5663: constify snd_soc_dai_ops structure ASoC: rt5616: constify snd_soc_dai_ops structure ASoC: msm8916-wcd-analog: constify snd_soc_dai_ops structure ASoC: max98926: constify snd_soc_dai_ops structure ASoC: rt5514: constify snd_soc_dai_ops structure ASoC: codecs: msm8916-wcd-digital: constify snd_soc_dai_ops structure ASoC: max9867: constify snd_soc_dai_ops structure ASoC: rk3036: constify snd_soc_dai_ops structure ASoC: hdac_hdmi: constify snd_soc_dai_ops structure ASoC: dwc: constify snd_soc_dai_ops structure ASoC: tas5720: constify snd_soc_dai_ops structure sound/soc/codecs/cs42l42.c | 2 +- sound/soc/codecs/hdac_hdmi.c | 2 +- sound/soc/codecs/inno_rk3036.c | 2 +- sound/soc/codecs/max9867.c | 2 +- sound/soc/codecs/max98926.c | 2 +- sound/soc/codecs/msm8916-wcd-analog.c | 2 +- sound/soc/codecs/msm8916-wcd-digital.c | 2 +- sound/soc/codecs/rt5514.c | 2 +- sound/soc/codecs/rt5616.c | 2 +- sound/soc/codecs/rt5663.c | 2 +- sound/soc/codecs/tas5720.c | 2 +- sound/soc/dwc/dwc-i2s.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) -- 2.5.0

2 24

[alsa-devel] Applied "ASoC: rsnd: remove unnecessary static in rsnd_ssiu_probe()" to the asoc tree
by Mark Brown 17 Jul '17

17 Jul '17

The patch ASoC: rsnd: remove unnecessary static in rsnd_ssiu_probe() has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 32e1b60d8f91be932c4a624d4153224895b65ec7 Mon Sep 17 00:00:00 2001 From: "Gustavo A. R. Silva" <gustavo(a)embeddedor.com> Date: Mon, 17 Jul 2017 10:30:20 -0500 Subject: [PATCH] ASoC: rsnd: remove unnecessary static in rsnd_ssiu_probe() Remove unnecessary static on local variable ops. Such variable is initialized before being used, on every execution path throughout the function. The static has no benefit and, removing it reduces the code size. This issue was detected using Coccinelle and the following semantic patch: @bad exists@ position p; identifier x; type T; @@ static T x@p; ... x = <+...x...+> @@ identifier x; expression e; type T; position p != bad.p; @@ -static T x@p; ... when != x when strict ?x = e; In the following log you can see the difference in the code size. Also, there is a significant difference in the bss segment. This log is the output of the size command, before and after the code change: before: text data bss dec hex filename 3211 680 64 3955 f73 sound/soc/sh/rcar/ssiu.o after: text data bss dec hex filename 3207 592 0 3799 ed7 sound/soc/sh/rcar/ssiu.o Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/sh/rcar/ssiu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index bed2c9c0004b..4d948757d300 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c @@ -250,7 +250,7 @@ int rsnd_ssiu_probe(struct rsnd_priv *priv) { struct device *dev = rsnd_priv_to_dev(priv); struct rsnd_ssiu *ssiu; - static struct rsnd_mod_ops *ops; + struct rsnd_mod_ops *ops; int i, nr, ret; /* same number to SSI */ -- 2.13.2

1 0

[alsa-devel] [PATCH 0/3] ASoC: codecs: msm8916-wcd-digital: Fix dmic support
by srinivas.kandagatla＠linaro.org 17 Jul '17

17 Jul '17

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> This patchset fixes dmic support in the codec driver, first and second patch fixes the mclk rate for the codec and the third patch adds few missing register writes to select dmic. Tested on DB410c with Audio Mezz board which has got dmic on it. Srinivas Kandagatla (3): ASoC: codecs: msm8916-wcd-digital: add support to set_sysclk ASoC: qcom: apq8016-sbc: set default mclk rate ASoC: codecs: msm8916-wcd-digital: fix dmic support sound/soc/codecs/msm8916-wcd-digital.c | 36 ++++++++++++++++++++++++++++++++++ sound/soc/qcom/apq8016_sbc.c | 6 ++++++ 2 files changed, 42 insertions(+) -- 2.11.0

3 7

[alsa-devel] ALC298 headset mode update
by Kailang 17 Jul '17

17 Jul '17

Hi Takashi, Dell new platform with new hardware layout. Old headset mode policy will cause headset mode check type has a chance to check fail. So, we update new headset mode to match new hardware layout. New headset mode policy also could suitable to old hardware layout. This patch was tested by Ubuntu QA team. BR, Kailang

2 1

Re: [alsa-devel] [PATCH] ASoC: fsl_asrc: constify snd_soc_dai_ops structure
by Gustavo A. R. Silva 17 Jul '17

17 Jul '17

Hi Mark, Joe, On 07/14/2017 06:25 AM, Mark Brown wrote: > On Fri, Jul 14, 2017 at 04:08:21AM -0700, Joe Perches wrote: >> On Fri, 2017-07-14 at 12:02 +0100, Mark Brown wrote: >>> On Thu, Jul 13, 2017 at 11:18:11AM -0700, Joe Perches wrote: >>>> I don't it's better. >>>> It's not that confusing if the 0/n patch cover letter is cc'd >>>> to all the appropriate mailing lists and all the [1..n]/n >>>> patches are sent with in-reply-to of the cover letter and >>>> send to the maintainers and appropriate mailing lists. >>> With large serieses like Gustavo is sending the CC list can easily hit >>> the points where mailing lists start blocking it, and the individual >>> pathces really do need to go to the relevant people so they have sight >>> of them. >> I agree and that's what I wrote. > The set of people who should have sight of the patches is wider than > just the maintainers. I'm running get_maintainer.pl in the following way in order to get all the supporters, maintainers and lists: $ scripts/get_maintainer.pl --nokeywords --nogit --nogit-fallback <file> Thank you -- Gustavo A. R. Silva

1 0

[alsa-devel] [PATCH 0/3] constify dev_pm_ops structures
by Gustavo A. R. Silva 17 Jul '17

17 Jul '17

This patchset aims to constify all dev_pm_ops structures that only stored in the pm field of a device_driver structure. This field is declared const, so dev_pm_ops structures that have this property can be declared as const also. Thanks! Gustavo A. R. Silva (3): ASoC: fsi: constify dev_pm_ops structure ASoC: psc-ac97: constify dev_pm_ops structure ASoC: au1x: psc-i2s: constify dev_pm_ops structure sound/soc/au1x/psc-ac97.c | 2 +- sound/soc/au1x/psc-i2s.c | 2 +- sound/soc/sh/fsi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.5.0

1 3

[alsa-devel] [PATCH] ALSA: hda - Add hdmi id for GeForce GT 1030
by Jan Andres 16 Jul '17

16 Jul '17

HDMI audio gets routed to the wrong HDMI/DP ports on the GT 1030. Fix this by adding a patch entry referring to patch_nvhdmi(), like we do for other NVidia cards. Signed-off-by: Jan Andres <jandres(a)gmx.net> --- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index d549f35f39d3..2a583c95edf6 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -3772,6 +3772,7 @@ HDA_CODEC_ENTRY(0x10de0071, "GPU 71 HDMI/DP", patch_nvhdmi), HDA_CODEC_ENTRY(0x10de0072, "GPU 72 HDMI/DP", patch_nvhdmi), HDA_CODEC_ENTRY(0x10de007d, "GPU 7d HDMI/DP", patch_nvhdmi), HDA_CODEC_ENTRY(0x10de0080, "GPU 80 HDMI/DP", patch_nvhdmi), +HDA_CODEC_ENTRY(0x10de0081, "GPU 81 HDMI/DP", patch_nvhdmi), HDA_CODEC_ENTRY(0x10de0082, "GPU 82 HDMI/DP", patch_nvhdmi), HDA_CODEC_ENTRY(0x10de0083, "GPU 83 HDMI/DP", patch_nvhdmi), HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI", patch_nvhdmi_2ch), -- 2.13.3

2 1

Re: [alsa-devel] [PATCH - alsa-lib 1/1] snd_user_file: avoid use wordexp
by Takashi Iwai 15 Jul '17

15 Jul '17

On Wed, 12 Jul 2017 09:53:08 +0200, Natanael Copa wrote: > > As suggested in POSIX[1], wordexp might execute the shell. If the libc > implementation does so, it will break the firefox sandbox which does > not allow exec. This happened on Alpine Linux with musl libc[2]. > > Since we cannot guarantee that the system wordexp implementation does > not execute shell, we cannot really use it, and need to implement the > ~/ expansion ourselves. > > Generally, wordexp is a large attack vector and it is better to avoid it > since only tilde expansion is needed. > > [1]: http://pubs.opengroup.org/onlinepubs/9699919799/functions/wordexp.html#tag_… > [2]: http://bugs.alpinelinux.org/issues/7454#note-2 > > Signed-off-by: Natanael Copa <ncopa(a)alpinelinux.org> Well, this may bring a functional regression, so I don't want to introduce this unconditionally. Instead, we may introduce configure option to explicitly control the usage of wordexp(), and add your extension to the fallback code, for example. If the security issue really matters, we can leave it disabled as default, too. thanks, Takashi > > diff --git a/configure.ac b/configure.ac > index 26e5d125..076c6bab 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -304,7 +304,7 @@ fi > AC_SUBST(ALSA_DEPLIBS) > > dnl Check for headers > -AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h sys/shm.h]) > +AC_CHECK_HEADERS([endian.h sys/endian.h sys/shm.h]) > > dnl Check for resmgr support... > AC_MSG_CHECKING(for resmgr support) > diff --git a/src/userfile.c b/src/userfile.c > index 72779da4..0e3f5fae 100644 > --- a/src/userfile.c > +++ b/src/userfile.c > @@ -21,6 +21,11 @@ > #include <config.h> > #include <string.h> > #include <errno.h> > +#include <sys/types.h> > +#include <unistd.h> > +#include <pwd.h> > +#include <stdio.h> > +#include <stdlib.h> > > /** > * \brief Get the full file name > @@ -28,46 +33,58 @@ > * \param result The pointer to store the resultant file name > * \return 0 if successful, or a negative error code > * > - * Parses the given file name with POSIX-Shell-like expansion and > - * stores the first matchine one. The returned string is strdup'ed. > + * Parses the given file name with POSIX-Shell-like expansion for ~/. > + * The returned string is strdup'ed. > */ > > -#ifdef HAVE_WORDEXP_H > -#include <wordexp.h> > #include <assert.h> > int snd_user_file(const char *file, char **result) > { > - wordexp_t we; > int err; > - > + size_t len; > + char *buf = NULL; > + > assert(file && result); > - err = wordexp(file, &we, WRDE_NOCMD); > - switch (err) { > - case WRDE_NOSPACE: > - wordfree(&we); > - return -ENOMEM; > - case 0: > - if (we.we_wordc == 1) > - break; > - wordfree(&we); > - /* fall thru */ > - default: > - return -EINVAL; > + *result = NULL; > + > + /* expand ~/ if needed */ > + if (file[0] == '~' && file[1] == '/') { > + const char *home = getenv("HOME"); > + if (home == NULL) { > + struct passwd pwent, *p = NULL; > + uid_t id = getuid(); > + size_t bufsize = 1024; > + > + buf = malloc(bufsize); > + if (buf == NULL) > + goto out; > + > + while ((err = getpwuid_r(id, &pwent, buf, bufsize, &p)) == ERANGE) { > + char *newbuf; > + bufsize += 1024; > + if (bufsize < 1024) > + break; > + newbuf = realloc(buf, bufsize); > + if (newbuf == NULL) > + goto out; > + buf = newbuf; > + } > + home = err ? "" : pwent.pw_dir; > + } > + len = strlen(home) + strlen(&file[2]) + 2; > + *result = malloc(len); > + if (*result) > + snprintf(*result, len, "%s/%s", home, &file[2]); > + } else { > + *result = strdup(file); > } > - *result = strdup(we.we_wordv[0]); > - wordfree(&we); > + > +out: > + if (buf) > + free(buf); > + > if (*result == NULL) > return -ENOMEM; > return 0; > } > > -#else /* !HAVE_WORDEXP_H */ > -/* just copy the string - would be nicer to expand by ourselves, though... */ > -int snd_user_file(const char *file, char **result) > -{ > - *result = strdup(file); > - if (! *result) > - return -ENOMEM; > - return 0; > -} > -#endif /* HAVE_WORDEXP_H */ > -- > 2.13.2 >

2 4