March 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH - IOPLUG DRAIN 0/2]
by twischer＠de.adit-jv.com 29 Mar '18

29 Mar '18

Hi Takashi, > Why not poll()? > IOW, why ioplug must be handled specially regarding the non-blocking >operation? The normal kernel driver behaves like that (returning > -EAGAIN, and let apps to sync with poll()). What do you think about the following solution? (I thought the whole time that you have to use snd_pcm_wait() to wait for drain in nonblocking mode but you have to use the poll_descriptors directly.) Know I am expecting that the user is calling poll() if snd_pcm_drain() returns -EAGAIN and the user has to call snd_pcm_drain() again after poll returns to check if drain is done. Thanks for your help so far. Best regards Timo

3 19

[alsa-devel] [PATCH v2] media: i2c: wm9090: replace codec to component
by Kuninori Morimoto 29 Mar '18

29 Mar '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Now we can replace Codec to Component. Let's do it. Note: xxx_codec_xxx() -> xxx_component_xxx() .idle_bias_off = 0 -> .idle_bias_on = 1 .ignore_pmdown_time = 0 -> .use_pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- v1 -> v2 - fixup .remove return drivers/media/i2c/tda1997x.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c index 3021913..2dc4df5 100644 --- a/drivers/media/i2c/tda1997x.c +++ b/drivers/media/i2c/tda1997x.c @@ -2444,7 +2444,7 @@ static int tda1997x_pcm_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct tda1997x_state *state = snd_soc_dai_get_drvdata(dai); - struct snd_soc_codec *codec = dai->codec; + struct snd_soc_component *component = dai->component; struct snd_pcm_runtime *rtd = substream->runtime; int rate, err; @@ -2452,11 +2452,11 @@ static int tda1997x_pcm_startup(struct snd_pcm_substream *substream, err = snd_pcm_hw_constraint_minmax(rtd, SNDRV_PCM_HW_PARAM_RATE, rate, rate); if (err < 0) { - dev_err(codec->dev, "failed to constrain samplerate to %dHz\n", + dev_err(component->dev, "failed to constrain samplerate to %dHz\n", rate); return err; } - dev_info(codec->dev, "set samplerate constraint to %dHz\n", rate); + dev_info(component->dev, "set samplerate constraint to %dHz\n", rate); return 0; } @@ -2479,20 +2479,22 @@ static int tda1997x_pcm_startup(struct snd_pcm_substream *substream, .ops = &tda1997x_dai_ops, }; -static int tda1997x_codec_probe(struct snd_soc_codec *codec) +static int tda1997x_codec_probe(struct snd_soc_component *component) { return 0; } -static int tda1997x_codec_remove(struct snd_soc_codec *codec) +static void tda1997x_codec_remove(struct snd_soc_component *component) { - return 0; } -static struct snd_soc_codec_driver tda1997x_codec_driver = { +static struct snd_soc_component_driver tda1997x_codec_driver = { .probe = tda1997x_codec_probe, .remove = tda1997x_codec_remove, - .reg_word_size = sizeof(u16), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static int tda1997x_probe(struct i2c_client *client, @@ -2737,7 +2739,7 @@ static int tda1997x_probe(struct i2c_client *client, else formats = SNDRV_PCM_FMTBIT_S16_LE; tda1997x_audio_dai.capture.formats = formats; - ret = snd_soc_register_codec(&state->client->dev, + ret = devm_snd_soc_register_component(&state->client->dev, &tda1997x_codec_driver, &tda1997x_audio_dai, 1); if (ret) { @@ -2782,7 +2784,6 @@ static int tda1997x_remove(struct i2c_client *client) struct tda1997x_platform_data *pdata = &state->pdata; if (pdata->audout_format) { - snd_soc_unregister_codec(&client->dev); mutex_destroy(&state->audio_lock); } -- 1.9.1

1 0

Re: [alsa-devel] [PATCH v2] pcm_native: Remove VLA usage
by Takashi Iwai 29 Mar '18

29 Mar '18

On Thu, 29 Mar 2018 00:24:00 +0200, Kyle Spiers wrote: > > As part of the effort to remove VLAs from the kernel[1], this changes > the allocation of the rstamps array from being on the stack to being > kcalloc()ed. This also allows for the removal of the explicit zeroing > loop. > > Signed-off-by: Kyle Spiers <kyle(a)spiers.me> It's been already fixed weeks ago... thanks, Takashi

1 0

[alsa-devel] [PATCH] media: i2c: wm9090: replace codec to component
by Kuninori Morimoto 29 Mar '18

29 Mar '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Now we can replace Codec to Component. Let's do it. Note: xxx_codec_xxx() -> xxx_component_xxx() .idle_bias_off = 0 -> .idle_bias_on = 1 .ignore_pmdown_time = 0 -> .use_pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- Hi Mark, Tim, Mauro ALSA SoC had replaced codec to component, thus, we can't use it anymore. This patch fixes it. But, I don't know who/how can handle it. drivers/media/i2c/tda1997x.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c index 3021913..5c5de3e 100644 --- a/drivers/media/i2c/tda1997x.c +++ b/drivers/media/i2c/tda1997x.c @@ -2444,7 +2444,7 @@ static int tda1997x_pcm_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct tda1997x_state *state = snd_soc_dai_get_drvdata(dai); - struct snd_soc_codec *codec = dai->codec; + struct snd_soc_component *component = dai->component; struct snd_pcm_runtime *rtd = substream->runtime; int rate, err; @@ -2452,11 +2452,11 @@ static int tda1997x_pcm_startup(struct snd_pcm_substream *substream, err = snd_pcm_hw_constraint_minmax(rtd, SNDRV_PCM_HW_PARAM_RATE, rate, rate); if (err < 0) { - dev_err(codec->dev, "failed to constrain samplerate to %dHz\n", + dev_err(component->dev, "failed to constrain samplerate to %dHz\n", rate); return err; } - dev_info(codec->dev, "set samplerate constraint to %dHz\n", rate); + dev_info(component->dev, "set samplerate constraint to %dHz\n", rate); return 0; } @@ -2479,20 +2479,23 @@ static int tda1997x_pcm_startup(struct snd_pcm_substream *substream, .ops = &tda1997x_dai_ops, }; -static int tda1997x_codec_probe(struct snd_soc_codec *codec) +static int tda1997x_codec_probe(struct snd_soc_component *component) { return 0; } -static int tda1997x_codec_remove(struct snd_soc_codec *codec) +static int tda1997x_codec_remove(struct snd_soc_component *component) { return 0; } -static struct snd_soc_codec_driver tda1997x_codec_driver = { +static struct snd_soc_component_driver tda1997x_codec_driver = { .probe = tda1997x_codec_probe, .remove = tda1997x_codec_remove, - .reg_word_size = sizeof(u16), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static int tda1997x_probe(struct i2c_client *client, @@ -2737,7 +2740,7 @@ static int tda1997x_probe(struct i2c_client *client, else formats = SNDRV_PCM_FMTBIT_S16_LE; tda1997x_audio_dai.capture.formats = formats; - ret = snd_soc_register_codec(&state->client->dev, + ret = devm_snd_soc_register_component(&state->client->dev, &tda1997x_codec_driver, &tda1997x_audio_dai, 1); if (ret) { @@ -2782,7 +2785,6 @@ static int tda1997x_remove(struct i2c_client *client) struct tda1997x_platform_data *pdata = &state->pdata; if (pdata->audout_format) { - snd_soc_unregister_codec(&client->dev); mutex_destroy(&state->audio_lock); } -- 1.9.1

2 2

[alsa-devel] [PATCH v2] ALSA: core api: define offsets for TLV items
by Ranjani Sridharan 29 Mar '18

29 Mar '18

This patch defines accessor offsets for the type, length, min, mute and step items in TLV data. These will be used by drivers to extract the TLV data while loading topology. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- V2: removed redundant redefinitions and updated prefix --- include/uapi/sound/tlv.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/uapi/sound/tlv.h b/include/uapi/sound/tlv.h index be5371f09a62..1fd786a5e57b 100644 --- a/include/uapi/sound/tlv.h +++ b/include/uapi/sound/tlv.h @@ -98,4 +98,12 @@ #define SNDRV_CTL_TLVD_DB_GAIN_MUTE -9999999 +/* Accessor offsets for TLV data items */ +#define SNDRV_CTL_TLV_OFFSET_TYPE 0 +#define SNDRV_CTL_TLV_OFFSET_LEN 1 + +/* Accessor offsets for min, mute and step items in dB scale type TLV */ +#define SNDRV_CTL_TLV_OFFSET_DB_MIN 2 +#define SNDRV_CTL_TLV_OFFSET_DB_MUTE_AND_STEP 3 + #endif -- 2.14.1

2 3

[alsa-devel] [PATCH -next] ASoC: amd: acp-da7219-max98357: Make symbol da7219_dai_clk static
by Wei Yongjun 29 Mar '18

29 Mar '18

Fixes the following sparse warning: sound/soc/amd/acp-da7219-max98357a.c:46:12: warning: symbol 'da7219_dai_clk' was not declared. Should it be static? Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- sound/soc/amd/acp-da7219-max98357a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index b205c78..f41560e 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -43,7 +43,7 @@ #define DUAL_CHANNEL 2 static struct snd_soc_jack cz_jack; -struct clk *da7219_dai_clk; +static struct clk *da7219_dai_clk; static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) {

1 0

Re: [alsa-devel] [PATCH v2] pcm_native: Remove VLA usage
by Takashi Sakamoto 29 Mar '18

29 Mar '18

Hi, On Mar 29 2018 07:24, Kyle Spiers wrote: > As part of the effort to remove VLAs from the kernel[1], this changes > the allocation of the rstamps array from being on the stack to being > kcalloc()ed. This also allows for the removal of the explicit zeroing > loop. > > Signed-off-by: Kyle Spiers <kyle(a)spiers.me> > --- > sound/core/pcm_native.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) This bug was already fixed at a commit 5730f9f744cf (' ALSA: pcm: Remove VLA usage')[1][2]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/commit/soun… [2] http://mailman.alsa-project.org/pipermail/alsa-devel/2018-March/133268.html Thanks Takashi Sakamoto

1 0

Re: [alsa-devel] [PATCH] pcm_native: Remove VLA usage
by Kees Cook 29 Mar '18

29 Mar '18

On Wed, Mar 28, 2018 at 3:11 PM, Kyle Spiers <kyle(a)spiers.me> wrote: > As part of the effort to remove VLAs from the kernel[1], this changes > the allocation of the rstamps array from being on the stack to being > kcalloc()ed. This also allows for the removal of the explicit zeroing > loop. > > [1] https://lkml.org/lkml/2018/3/7/621 > > Signed-off-by: Kyle Spiers <kyle(a)spiers.me> > --- > sound/core/pcm_native.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c > index 77ba50d..57240b8 100644 > --- a/sound/core/pcm_native.c > +++ b/sound/core/pcm_native.c > @@ -323,7 +323,7 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream, > struct snd_pcm_hw_constraints *constrs = > &substream->runtime->hw_constraints; > unsigned int k; > - unsigned int rstamps[constrs->rules_num]; > + unsigned int *rstamps; > unsigned int vstamps[SNDRV_PCM_HW_PARAM_LAST_INTERVAL + 1]; > unsigned int stamp; > struct snd_pcm_hw_rule *r; > @@ -339,8 +339,8 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream, > * Each member of 'rstamps' array represents the sequence number of > * recent application of corresponding rule. > */ > - for (k = 0; k < constrs->rules_num; k++) > - rstamps[k] = 0; > + > + rstamps = kcalloc(constrs->rules_num, sizeof(*rstamps), GFP_KERNEL); > > /* > * Each member of 'vstamps' array represents the sequence number of > @@ -399,6 +399,7 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream, > > changed = r->func(params, r); > if (changed < 0) > + kfree(rstamps); > return changed; Whoops, this needs { } s: if (changed < 0) { kfree(rstamps); return changed; } Otherwise, looks good! Once that's fixed: Reviewed-by: Kees Cook <keescook(a)chromium.org> -Kees > > /* > @@ -430,6 +431,7 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream, > if (again) > goto retry; > > + kfree(rstamps); > return 0; > } > > -- > 2.7.4 > -- Kees Cook Pixel Security

1 0

[alsa-devel] [PATCH][next] ASoC: topology: fix memory leak on se when kstrdup fails
by Colin King 28 Mar '18

28 Mar '18

From: Colin Ian King <colin.king(a)canonical.com> In the case when kstrdup fails to allocation memory for kc[i].name the error exit path does not free up 'se' leading to a small leak. Fix this by kfree'ing 'se' before jumping to err_se and since kc[i].private_value is zero we end up avoiding kfree'ing the rest of the unallocated objects in se. Detected by CoverityScan, CID#1466991 ("Reseource leak") Fixes: 267e2c6fd7ca ("ASoC: topology: Fix kcontrol name string handling") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/soc-topology.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index fa27d0fca6dc..71b20d795b51 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1325,8 +1325,10 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_denum_create( ec->hdr.name); kc[i].name = kstrdup(ec->hdr.name, GFP_KERNEL); - if (kc[i].name == NULL) + if (kc[i].name == NULL) { + kfree(se); goto err_se; + } kc[i].private_value = (long)se; kc[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER; kc[i].access = ec->hdr.access; -- 2.15.1

1 0

[alsa-devel] [PATCH 2/3 v3] ASoC: TSCS42xx: Cleanup private data members
by Steven Eckhoff 28 Mar '18

28 Mar '18

Remove blrcm from private data Remove dev from private data Signed-off-by: Steven Eckhoff <steven.eckhoff.opensource(a)gmail.com> --- sound/soc/codecs/tscs42xx.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c index 37636d6efe60..d41852a37ac6 100644 --- a/sound/soc/codecs/tscs42xx.c +++ b/sound/soc/codecs/tscs42xx.c @@ -31,7 +31,6 @@ struct tscs42xx { int bclk_ratio; int samplerate; - unsigned int blrcm; struct mutex audio_params_lock; u8 coeff_ram[COEFF_RAM_SIZE]; @@ -41,8 +40,6 @@ struct tscs42xx { struct mutex pll_lock; struct regmap *regmap; - - struct device *dev; }; struct coeff_ram_ctl { @@ -1404,12 +1401,11 @@ static int tscs42xx_i2c_probe(struct i2c_client *i2c, return ret; } i2c_set_clientdata(i2c, tscs42xx); - tscs42xx->dev = &i2c->dev; tscs42xx->regmap = devm_regmap_init_i2c(i2c, &tscs42xx_regmap); if (IS_ERR(tscs42xx->regmap)) { ret = PTR_ERR(tscs42xx->regmap); - dev_err(tscs42xx->dev, "Failed to allocate regmap (%d)\n", ret); + dev_err(&i2c->dev, "Failed to allocate regmap (%d)\n", ret); return ret; } @@ -1417,21 +1413,21 @@ static int tscs42xx_i2c_probe(struct i2c_client *i2c, ret = part_is_valid(tscs42xx); if (ret <= 0) { - dev_err(tscs42xx->dev, "No valid part (%d)\n", ret); + dev_err(&i2c->dev, "No valid part (%d)\n", ret); ret = -ENODEV; return ret; } ret = regmap_write(tscs42xx->regmap, R_RESET, RV_RESET_ENABLE); if (ret < 0) { - dev_err(tscs42xx->dev, "Failed to reset device (%d)\n", ret); + dev_err(&i2c->dev, "Failed to reset device (%d)\n", ret); return ret; } ret = regmap_register_patch(tscs42xx->regmap, tscs42xx_patch, ARRAY_SIZE(tscs42xx_patch)); if (ret < 0) { - dev_err(tscs42xx->dev, "Failed to apply patch (%d)\n", ret); + dev_err(&i2c->dev, "Failed to apply patch (%d)\n", ret); return ret; } @@ -1439,10 +1435,10 @@ static int tscs42xx_i2c_probe(struct i2c_client *i2c, mutex_init(&tscs42xx->coeff_ram_lock); mutex_init(&tscs42xx->pll_lock); - ret = devm_snd_soc_register_component(tscs42xx->dev, + ret = devm_snd_soc_register_component(&i2c->dev, &soc_codec_dev_tscs42xx, &tscs42xx_dai, 1); if (ret) { - dev_err(tscs42xx->dev, "Failed to register codec (%d)\n", ret); + dev_err(&i2c->dev, "Failed to register codec (%d)\n", ret); return ret; } -- 2.15.1

1 0