February 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: Intel: Skylake: Set sample_type in base config
by Jenny TC 28 Feb '19

28 Feb '19

From: Jenny TC <jenny.tc(a)intel.com> sample_type defined in topology configuration is not getting reflected in the dsp param. This patch sets sample_type in base config so that the sample type defined in the topology is reflected int eh dsp params. This issues was uncovered while debugging the S24_LE format which require the MSB byte in 32 bit word to be skipped. Setting sample_type to 1 helps to fix this. Signed-off-by: Jenny TC <jenny.tc(a)intel.com> --- sound/soc/intel/skylake/skl-messages.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c index b0e6fb9..9260e9a 100644 --- a/sound/soc/intel/skylake/skl-messages.c +++ b/sound/soc/intel/skylake/skl-messages.c @@ -483,6 +483,7 @@ static void skl_set_base_module_format(struct skl_sst *ctx, base_cfg->audio_fmt.bit_depth = format->bit_depth; base_cfg->audio_fmt.valid_bit_depth = format->valid_bit_depth; base_cfg->audio_fmt.ch_cfg = format->ch_cfg; + base_cfg->audio_fmt.sample_type = format->sample_type; dev_dbg(ctx->dev, "bit_depth=%x valid_bd=%x ch_config=%x\n", format->bit_depth, format->valid_bit_depth, -- 1.9.1

3 2

[alsa-devel] [RFC PATCH 1/2] ASoC: simple-card: add support for bclk_ratio
by Sven Van Asbroeck 27 Feb '19

27 Feb '19

In some situations, codec configuration will depend on the bclk_ratio generated by the cpu dai. The tda998x hdmi transmitter is an example of this. Allow simple-card to set the bclk_ratio via the 'bclk-slot-ratio' devicetree property, which describes the bclk to slot rate ratio. This value is converted to the bclk to sample ratio before being passed into set_bclk_ratio(). Signed-off-by: Sven Van Asbroeck <TheSven73(a)gmail.com> --- sound/soc/generic/simple-card.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 3fe34417ec89..61e9ba4e9b58 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -25,6 +25,7 @@ struct simple_card_data { struct asoc_simple_card_data adata; struct snd_soc_codec_conf *codec_conf; unsigned int mclk_fs; + unsigned int bclk_slot_ratio; } *dai_props; struct asoc_simple_jack hp_jack; struct asoc_simple_jack mic_jack; @@ -97,7 +98,7 @@ static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream, struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num); - unsigned int mclk, mclk_fs = 0; + unsigned int mclk, bclk_ratio, mclk_fs = 0, bclk_slot_ratio = 0; int ret = 0; if (dai_props->mclk_fs) @@ -124,6 +125,23 @@ static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream, if (ret && ret != -ENOTSUPP) goto err; } + + if (dai_props->bclk_slot_ratio) + bclk_slot_ratio = dai_props->bclk_slot_ratio; + + if (bclk_slot_ratio) { + /* FIXME do we need to care about TDM slots here ? */ + bclk_ratio = snd_soc_calc_frame_size(bclk_slot_ratio, + params_channels(params), 1); + + ret = snd_soc_dai_set_bclk_ratio(codec_dai, bclk_ratio); + if (ret && ret != -ENOTSUPP) + goto err; + + ret = snd_soc_dai_set_bclk_ratio(cpu_dai, bclk_ratio); + if (ret && ret != -ENOTSUPP) + goto err; + } return 0; err: return ret; @@ -277,6 +295,12 @@ static int asoc_simple_card_dai_link_of_dpcm(struct device_node *top, of_property_read_u32(node, prop, &dai_props->mclk_fs); of_property_read_u32(np, prop, &dai_props->mclk_fs); + snprintf(prop, sizeof(prop), "%sbclk-slot-ratio", prefix); + of_property_read_u32(top, PREFIX "bclk-slot-ratio", + &dai_props->bclk_slot_ratio); + of_property_read_u32(node, prop, &dai_props->bclk_slot_ratio); + of_property_read_u32(np, prop, &dai_props->bclk_slot_ratio); + ret = asoc_simple_card_parse_daifmt(dev, node, codec, prefix, &dai_link->dai_fmt); if (ret < 0) @@ -349,6 +373,13 @@ static int asoc_simple_card_dai_link_of(struct device_node *top, of_property_read_u32(cpu, prop, &dai_props->mclk_fs); of_property_read_u32(codec, prop, &dai_props->mclk_fs); + snprintf(prop, sizeof(prop), "%sbclk-slot-ratio", prefix); + of_property_read_u32(top, PREFIX "bclk-slot-ratio", + &dai_props->bclk_slot_ratio); + of_property_read_u32(node, prop, &dai_props->bclk_slot_ratio); + of_property_read_u32(cpu, prop, &dai_props->bclk_slot_ratio); + of_property_read_u32(codec, prop, &dai_props->bclk_slot_ratio); + ret = asoc_simple_card_parse_cpu(cpu, dai_link, DAI, CELL, &single_cpu); if (ret < 0) -- 2.17.1

4 12

Re: [alsa-devel] increase number of alsa loopback
by Jaroslav Kysela 27 Feb '19

27 Feb '19

Dne 27. 02. 19 v 16:44 Olivier SCHMITT napsal(a): > Hello, > > Thanks for reply, > > I have configure /etc/modprobe.d/alsa-base.conf with: > > options snd-aloop > index=5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29 > id=lp0,lp1,lp2,lp3,lp4,lp5,lp6,lp7,lp8,lp9,lp10,lp11,lp12,lp13,lp14,lp15,lp16,lp17,lp18,lp19,lp20,lp21,lp22,lp23,lp24 > enable=1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 > pcm_substreams=2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 > > but when i use index more than 32, i have some message in syslog that > it's say alsa can't use index greather than 32... > > Maybe have your an idea for modify et recompiling kernel? I'm afraid, the ALSA card limit (32) is hardcoded and cannot be easily changed. The recompilation won't help. You may use up to 8 pcm substreams per the loop card. This limit can be increased by changing the value in aloop.c (kernel driver). Jaroslav > Le 27/02/2019 à 15:35, Jaroslav Kysela a écrit : >> Dne 27. 02. 19 v 15:20 Olivier SCHMITT napsal(a): >>> Hello All, >>> >>> First, thanks for your project! >>> >>> I search to increase the maximum number of 32 alsa loopback. >>> >>> Can someone say me how do this? >> There's hardcoded limit for the PCM substreams to 8, but you may enable >> more loopback cards (options snd-aloop enable=1,1,1,1). >> >> Jaroslav >> -- Jaroslav Kysela <perex(a)perex.cz> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.

1 0

[alsa-devel] increase number of alsa loopback
by Olivier SCHMITT 27 Feb '19

27 Feb '19

Hello All, First, thanks for your project! I search to increase the maximum number of 32 alsa loopback. Can someone say me how do this? Thanks in advance! Olivier.

2 1

[alsa-devel] [PATCH] ASoC: tlv320aix3x: fix reset gpio reference counting
by Philipp Puschmann 27 Feb '19

27 Feb '19

This patch fixes a bug that prevents freeing the reset gpio on unloading the module. aic3x_i2c_probe is called when loading the module and it calls list_add with a probably uninitialized list entry aic3x->list (next = prev = NULL)). So even if list_del is called it does nothing and in the end the gpio_reset is not freed. Then a repeated module probing fails silently because gpio_request fails. When moving INIT_LIST_HEAD to aic3x_i2c_probe we also have to move list_del to aic3x_i2c_remove because aic3x_remove may be called multiple times without aic3x_i2c_remove being called which leads to a NULL pointer dereference. Signed-off-by: Philipp Puschmann <philipp.puschmann(a)emlix.com> --- sound/soc/codecs/tlv320aic3x.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 6aa0edf8c5ef..cea3ebecdb12 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1609,7 +1609,6 @@ static int aic3x_probe(struct snd_soc_component *component) struct aic3x_priv *aic3x = snd_soc_component_get_drvdata(component); int ret, i; - INIT_LIST_HEAD(&aic3x->list); aic3x->component = component; for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++) { @@ -1692,7 +1691,6 @@ static void aic3x_remove(struct snd_soc_component *component) struct aic3x_priv *aic3x = snd_soc_component_get_drvdata(component); int i; - list_del(&aic3x->list); for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++) regulator_unregister_notifier(aic3x->supplies[i].consumer, &aic3x->disable_nb[i].nb); @@ -1890,6 +1888,7 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, if (ret != 0) goto err_gpio; + INIT_LIST_HEAD(&aic3x->list); list_add(&aic3x->list, &reset_list); return 0; @@ -1906,6 +1905,8 @@ static int aic3x_i2c_remove(struct i2c_client *client) { struct aic3x_priv *aic3x = i2c_get_clientdata(client); + list_del(&aic3x->list); + if (gpio_is_valid(aic3x->gpio_reset) && !aic3x_is_shared_reset(aic3x)) { gpio_set_value(aic3x->gpio_reset, 0); -- 2.20.1

1 0

[alsa-devel] [PATCH] ASoC: Intel: Skylake: Set sample_type in base config
by Jenny TC 27 Feb '19

27 Feb '19

sample_type defined in topology configuration is not getting reflected in the dsp param. This patch sets sample_type in base config so that the sample type defined in the topology is reflected int eh dsp params. This issues was uncovered while debugging the S24_LE format which require the MSB byte in 32 bit word to be skipped. Setting sample_type to 1 helps to fix this. Signed-off-by: Jenny TC <jenny.tc(a)intel.com> --- sound/soc/intel/skylake/skl-messages.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c index b0e6fb9..9260e9a 100644 --- a/sound/soc/intel/skylake/skl-messages.c +++ b/sound/soc/intel/skylake/skl-messages.c @@ -483,6 +483,7 @@ static void skl_set_base_module_format(struct skl_sst *ctx, base_cfg->audio_fmt.bit_depth = format->bit_depth; base_cfg->audio_fmt.valid_bit_depth = format->valid_bit_depth; base_cfg->audio_fmt.ch_cfg = format->ch_cfg; + base_cfg->audio_fmt.sample_type = format->sample_type; dev_dbg(ctx->dev, "bit_depth=%x valid_bd=%x ch_config=%x\n", format->bit_depth, format->valid_bit_depth, -- 1.9.1

1 0

[alsa-devel] [PATCH V3] ASoC: fsl_esai: fix channel swap issue when stream starts
by S.j. Wang 27 Feb '19

27 Feb '19

There is very low possibility ( < 0.1% ) that channel swap happened in beginning when multi output/input pin is enabled. The issue is that hardware can't send data to correct pin in the beginning with the normal enable flow. This is hardware issue, but there is no errata, the workaround flow is that: Each time playback/recording, firstly clear the xSMA/xSMB, then enable TE/RE, then enable xSMB and xSMA (xSMB must be enabled before xSMA). Which is to use the xSMA as the trigger start register, previously the xCR_TE or xCR_RE is the bit for starting. Fixes commit 43d24e76b698 ("ASoC: fsl_esai: Add ESAI CPU DAI driver") Cc: <stable(a)vger.kernel.org> Reviewed-by: Fabio Estevam <festevam(a)gmail.com> Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- changes in v3 - initialize tx_mask and rx_mask in probe sound/soc/fsl/fsl_esai.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index afe67c865330..7ee91c28b636 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -54,6 +54,8 @@ struct fsl_esai { u32 fifo_depth; u32 slot_width; u32 slots; + u32 tx_mask; + u32 rx_mask; u32 hck_rate[2]; u32 sck_rate[2]; bool hck_dir[2]; @@ -361,21 +363,13 @@ static int fsl_esai_set_dai_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, regmap_update_bits(esai_priv->regmap, REG_ESAI_TCCR, ESAI_xCCR_xDC_MASK, ESAI_xCCR_xDC(slots)); - regmap_update_bits(esai_priv->regmap, REG_ESAI_TSMA, - ESAI_xSMA_xS_MASK, ESAI_xSMA_xS(tx_mask)); - regmap_update_bits(esai_priv->regmap, REG_ESAI_TSMB, - ESAI_xSMB_xS_MASK, ESAI_xSMB_xS(tx_mask)); - regmap_update_bits(esai_priv->regmap, REG_ESAI_RCCR, ESAI_xCCR_xDC_MASK, ESAI_xCCR_xDC(slots)); - regmap_update_bits(esai_priv->regmap, REG_ESAI_RSMA, - ESAI_xSMA_xS_MASK, ESAI_xSMA_xS(rx_mask)); - regmap_update_bits(esai_priv->regmap, REG_ESAI_RSMB, - ESAI_xSMB_xS_MASK, ESAI_xSMB_xS(rx_mask)); - esai_priv->slot_width = slot_width; esai_priv->slots = slots; + esai_priv->tx_mask = tx_mask; + esai_priv->rx_mask = rx_mask; return 0; } @@ -596,6 +590,7 @@ static int fsl_esai_trigger(struct snd_pcm_substream *substream, int cmd, bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; u8 i, channels = substream->runtime->channels; u32 pins = DIV_ROUND_UP(channels, esai_priv->slots); + u32 mask; switch (cmd) { case SNDRV_PCM_TRIGGER_START: @@ -611,12 +606,23 @@ static int fsl_esai_trigger(struct snd_pcm_substream *substream, int cmd, regmap_update_bits(esai_priv->regmap, REG_ESAI_xCR(tx), tx ? ESAI_xCR_TE_MASK : ESAI_xCR_RE_MASK, tx ? ESAI_xCR_TE(pins) : ESAI_xCR_RE(pins)); + mask = tx ? esai_priv->tx_mask : esai_priv->rx_mask; + + regmap_update_bits(esai_priv->regmap, REG_ESAI_xSMB(tx), + ESAI_xSMB_xS_MASK, ESAI_xSMB_xS(mask)); + regmap_update_bits(esai_priv->regmap, REG_ESAI_xSMA(tx), + ESAI_xSMA_xS_MASK, ESAI_xSMA_xS(mask)); + break; case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: regmap_update_bits(esai_priv->regmap, REG_ESAI_xCR(tx), tx ? ESAI_xCR_TE_MASK : ESAI_xCR_RE_MASK, 0); + regmap_update_bits(esai_priv->regmap, REG_ESAI_xSMA(tx), + ESAI_xSMA_xS_MASK, 0); + regmap_update_bits(esai_priv->regmap, REG_ESAI_xSMB(tx), + ESAI_xSMB_xS_MASK, 0); /* Disable and reset FIFO */ regmap_update_bits(esai_priv->regmap, REG_ESAI_xFCR(tx), @@ -906,6 +912,15 @@ static int fsl_esai_probe(struct platform_device *pdev) return ret; } + esai_priv->tx_mask = 0xFFFFFFFF; + esai_priv->rx_mask = 0xFFFFFFFF; + + /* Clear the TSMA, TSMB, RSMA, RSMB */ + regmap_write(esai_priv->regmap, REG_ESAI_TSMA, 0); + regmap_write(esai_priv->regmap, REG_ESAI_TSMB, 0); + regmap_write(esai_priv->regmap, REG_ESAI_RSMA, 0); + regmap_write(esai_priv->regmap, REG_ESAI_RSMB, 0); + ret = devm_snd_soc_register_component(&pdev->dev, &fsl_esai_component, &fsl_esai_dai, 1); if (ret) { -- 1.9.1

2 2

[alsa-devel] [asoc:for-5.1 263/274] sound/soc/codecs/wm_adsp.c:3441:23: sparse: warning: restricted __be32 degrades to integer
by kbuild test robot 27 Feb '19

27 Feb '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.1 head: 7b6b0049e2b70d103adf1b7d0320802f70ddceca commit: 4f2d4eabf57718875b97363a3bd35de490f354c5 [263/274] ASoC: wm_adsp: Add support for multiple compressed buffers reproduce: # apt-get install sparse git checkout 4f2d4eabf57718875b97363a3bd35de490f354c5 make ARCH=x86_64 allmodconfig make C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' All warnings (new ones prefixed by >>): sound/soc/codecs/wm_adsp.c:880:19: sparse: warning: incorrect type in initializer (different base types) sound/soc/codecs/wm_adsp.c:880:19: sparse: expected unsigned int [usertype] val sound/soc/codecs/wm_adsp.c:880:19: sparse: got restricted __be32 [usertype] sound/soc/codecs/wm_adsp.c:1586:22: sparse: warning: restricted snd_ctl_elem_type_t degrades to integer sound/soc/codecs/wm_adsp.c:2057:54: sparse: warning: incorrect type in argument 8 (different base types) sound/soc/codecs/wm_adsp.c:2057:54: sparse: expected unsigned int type sound/soc/codecs/wm_adsp.c:2057:54: sparse: got restricted snd_ctl_elem_type_t [usertype] sound/soc/codecs/wm_adsp.c:2078:54: sparse: warning: incorrect type in argument 8 (different base types) sound/soc/codecs/wm_adsp.c:2078:54: sparse: expected unsigned int type sound/soc/codecs/wm_adsp.c:2078:54: sparse: got restricted snd_ctl_elem_type_t [usertype] sound/soc/codecs/wm_adsp.c:2171:54: sparse: warning: incorrect type in argument 8 (different base types) sound/soc/codecs/wm_adsp.c:2171:54: sparse: expected unsigned int type sound/soc/codecs/wm_adsp.c:2171:54: sparse: got restricted snd_ctl_elem_type_t [usertype] sound/soc/codecs/wm_adsp.c:2192:54: sparse: warning: incorrect type in argument 8 (different base types) sound/soc/codecs/wm_adsp.c:2192:54: sparse: expected unsigned int type sound/soc/codecs/wm_adsp.c:2192:54: sparse: got restricted snd_ctl_elem_type_t [usertype] sound/soc/codecs/wm_adsp.c:2213:54: sparse: warning: incorrect type in argument 8 (different base types) sound/soc/codecs/wm_adsp.c:2213:54: sparse: expected unsigned int type sound/soc/codecs/wm_adsp.c:2213:54: sparse: got restricted snd_ctl_elem_type_t [usertype] sound/soc/codecs/wm_adsp.c:3220:27: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3220:27: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3220:27: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3220:27: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3220:27: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3220:27: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3242:14: sparse: warning: incorrect type in assignment (different base types) sound/soc/codecs/wm_adsp.c:3242:14: sparse: expected unsigned int [usertype] data sound/soc/codecs/wm_adsp.c:3242:14: sparse: got restricted __be32 [usertype] sound/soc/codecs/wm_adsp.c:3420:29: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3420:29: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3420:29: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3420:29: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3420:29: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3420:29: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3440:27: sparse: warning: incorrect type in assignment (different base types) sound/soc/codecs/wm_adsp.c:3440:27: sparse: expected restricted __be32 [addressable] [usertype] versions sound/soc/codecs/wm_adsp.c:3440:27: sparse: got unsigned int >> sound/soc/codecs/wm_adsp.c:3441:23: sparse: warning: restricted __be32 degrades to integer sound/soc/codecs/wm_adsp.c:3452:34: sparse: warning: incorrect type in assignment (different base types) sound/soc/codecs/wm_adsp.c:3452:34: sparse: expected restricted __be32 sound/soc/codecs/wm_adsp.c:3452:34: sparse: got unsigned int sparse warnings: (new ones prefixed by >>) sound/soc/codecs/wm_adsp.c:880:19: sparse: warning: incorrect type in initializer (different base types) sound/soc/codecs/wm_adsp.c:880:19: sparse: expected unsigned int [usertype] val sound/soc/codecs/wm_adsp.c:880:19: sparse: got restricted __be32 [usertype] sound/soc/codecs/wm_adsp.c:1586:22: sparse: warning: restricted snd_ctl_elem_type_t degrades to integer sound/soc/codecs/wm_adsp.c:2057:54: sparse: warning: incorrect type in argument 8 (different base types) sound/soc/codecs/wm_adsp.c:2057:54: sparse: expected unsigned int type sound/soc/codecs/wm_adsp.c:2057:54: sparse: got restricted snd_ctl_elem_type_t [usertype] sound/soc/codecs/wm_adsp.c:2078:54: sparse: warning: incorrect type in argument 8 (different base types) sound/soc/codecs/wm_adsp.c:2078:54: sparse: expected unsigned int type sound/soc/codecs/wm_adsp.c:2078:54: sparse: got restricted snd_ctl_elem_type_t [usertype] sound/soc/codecs/wm_adsp.c:2171:54: sparse: warning: incorrect type in argument 8 (different base types) sound/soc/codecs/wm_adsp.c:2171:54: sparse: expected unsigned int type sound/soc/codecs/wm_adsp.c:2171:54: sparse: got restricted snd_ctl_elem_type_t [usertype] sound/soc/codecs/wm_adsp.c:2192:54: sparse: warning: incorrect type in argument 8 (different base types) sound/soc/codecs/wm_adsp.c:2192:54: sparse: expected unsigned int type sound/soc/codecs/wm_adsp.c:2192:54: sparse: got restricted snd_ctl_elem_type_t [usertype] sound/soc/codecs/wm_adsp.c:2213:54: sparse: warning: incorrect type in argument 8 (different base types) sound/soc/codecs/wm_adsp.c:2213:54: sparse: expected unsigned int type sound/soc/codecs/wm_adsp.c:2213:54: sparse: got restricted snd_ctl_elem_type_t [usertype] sound/soc/codecs/wm_adsp.c:3220:27: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3220:27: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3220:27: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3220:27: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3220:27: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3220:27: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3242:14: sparse: warning: incorrect type in assignment (different base types) sound/soc/codecs/wm_adsp.c:3242:14: sparse: expected unsigned int [usertype] data sound/soc/codecs/wm_adsp.c:3242:14: sparse: got restricted __be32 [usertype] sound/soc/codecs/wm_adsp.c:3420:29: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3420:29: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3420:29: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3420:29: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3420:29: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3420:29: sparse: warning: cast to restricted __be32 sound/soc/codecs/wm_adsp.c:3440:27: sparse: warning: incorrect type in assignment (different base types) >> sound/soc/codecs/wm_adsp.c:3440:27: sparse: expected restricted __be32 [addressable] [usertype] versions >> sound/soc/codecs/wm_adsp.c:3440:27: sparse: got unsigned int sound/soc/codecs/wm_adsp.c:3441:23: sparse: warning: restricted __be32 degrades to integer sound/soc/codecs/wm_adsp.c:3452:34: sparse: warning: incorrect type in assignment (different base types) >> sound/soc/codecs/wm_adsp.c:3452:34: sparse: expected restricted __be32 sound/soc/codecs/wm_adsp.c:3452:34: sparse: got unsigned int vim +3441 sound/soc/codecs/wm_adsp.c 3230 3231 static int wm_adsp_write_data_word(struct wm_adsp *dsp, int mem_type, 3232 unsigned int mem_addr, u32 data) 3233 { 3234 struct wm_adsp_region const *mem = wm_adsp_find_region(dsp, mem_type); 3235 unsigned int reg; 3236 3237 if (!mem) 3238 return -EINVAL; 3239 3240 reg = wm_adsp_region_to_reg(mem, mem_addr); 3241 > 3242 data = cpu_to_be32(data & 0x00ffffffu); 3243 3244 return regmap_raw_write(dsp->regmap, reg, &data, sizeof(data)); 3245 } 3246 3247 static inline int wm_adsp_buffer_read(struct wm_adsp_compr_buf *buf, 3248 unsigned int field_offset, u32 *data) 3249 { 3250 return wm_adsp_read_data_word(buf->dsp, buf->host_buf_mem_type, 3251 buf->host_buf_ptr + field_offset, data); 3252 } 3253 3254 static inline int wm_adsp_buffer_write(struct wm_adsp_compr_buf *buf, 3255 unsigned int field_offset, u32 data) 3256 { 3257 return wm_adsp_write_data_word(buf->dsp, buf->host_buf_mem_type, 3258 buf->host_buf_ptr + field_offset, data); 3259 } 3260 3261 static void wm_adsp_remove_padding(u32 *buf, int nwords, int data_word_size) 3262 { 3263 u8 *pack_in = (u8 *)buf; 3264 u8 *pack_out = (u8 *)buf; 3265 int i, j; 3266 3267 /* Remove the padding bytes from the data read from the DSP */ 3268 for (i = 0; i < nwords; i++) { 3269 for (j = 0; j < data_word_size; j++) 3270 *pack_out++ = *pack_in++; 3271 3272 pack_in += sizeof(*buf) - data_word_size; 3273 } 3274 } 3275 3276 static int wm_adsp_buffer_populate(struct wm_adsp_compr_buf *buf) 3277 { 3278 const struct wm_adsp_fw_caps *caps = wm_adsp_fw[buf->dsp->fw].caps; 3279 struct wm_adsp_buffer_region *region; 3280 u32 offset = 0; 3281 int i, ret; 3282 3283 buf->regions = kcalloc(caps->num_regions, sizeof(*buf->regions), 3284 GFP_KERNEL); 3285 if (!buf->regions) 3286 return -ENOMEM; 3287 3288 for (i = 0; i < caps->num_regions; ++i) { 3289 region = &buf->regions[i]; 3290 3291 region->offset = offset; 3292 region->mem_type = caps->region_defs[i].mem_type; 3293 3294 ret = wm_adsp_buffer_read(buf, caps->region_defs[i].base_offset, 3295 &region->base_addr); 3296 if (ret < 0) 3297 return ret; 3298 3299 ret = wm_adsp_buffer_read(buf, caps->region_defs[i].size_offset, 3300 &offset); 3301 if (ret < 0) 3302 return ret; 3303 3304 region->cumulative_size = offset; 3305 3306 adsp_dbg(buf->dsp, 3307 "region=%d type=%d base=%08x off=%08x size=%08x\n", 3308 i, region->mem_type, region->base_addr, 3309 region->offset, region->cumulative_size); 3310 } 3311 3312 return 0; 3313 } 3314 3315 static void wm_adsp_buffer_clear(struct wm_adsp_compr_buf *buf) 3316 { 3317 buf->irq_count = 0xFFFFFFFF; 3318 buf->read_index = -1; 3319 buf->avail = 0; 3320 } 3321 3322 static struct wm_adsp_compr_buf *wm_adsp_buffer_alloc(struct wm_adsp *dsp) 3323 { 3324 struct wm_adsp_compr_buf *buf; 3325 3326 buf = kzalloc(sizeof(*buf), GFP_KERNEL); 3327 if (!buf) 3328 return NULL; 3329 3330 buf->dsp = dsp; 3331 3332 wm_adsp_buffer_clear(buf); 3333 3334 list_add_tail(&buf->list, &dsp->buffer_list); 3335 3336 return buf; 3337 } 3338 3339 static int wm_adsp_buffer_parse_legacy(struct wm_adsp *dsp) 3340 { 3341 struct wm_adsp_alg_region *alg_region; 3342 struct wm_adsp_compr_buf *buf; 3343 u32 xmalg, addr, magic; 3344 int i, ret; 3345 3346 buf = wm_adsp_buffer_alloc(dsp); 3347 if (!buf) 3348 return -ENOMEM; 3349 3350 alg_region = wm_adsp_find_alg_region(dsp, WMFW_ADSP2_XM, dsp->fw_id); 3351 xmalg = sizeof(struct wm_adsp_system_config_xm_hdr) / sizeof(__be32); 3352 3353 addr = alg_region->base + xmalg + ALG_XM_FIELD(magic); 3354 ret = wm_adsp_read_data_word(dsp, WMFW_ADSP2_XM, addr, &magic); 3355 if (ret < 0) 3356 return ret; 3357 3358 if (magic != WM_ADSP_ALG_XM_STRUCT_MAGIC) 3359 return -ENODEV; 3360 3361 addr = alg_region->base + xmalg + ALG_XM_FIELD(host_buf_ptr); 3362 for (i = 0; i < 5; ++i) { 3363 ret = wm_adsp_read_data_word(dsp, WMFW_ADSP2_XM, addr, 3364 &buf->host_buf_ptr); 3365 if (ret < 0) 3366 return ret; 3367 3368 if (buf->host_buf_ptr) 3369 break; 3370 3371 usleep_range(1000, 2000); 3372 } 3373 3374 if (!buf->host_buf_ptr) 3375 return -EIO; 3376 3377 buf->host_buf_mem_type = WMFW_ADSP2_XM; 3378 3379 ret = wm_adsp_buffer_populate(buf); 3380 if (ret < 0) 3381 return ret; 3382 3383 adsp_dbg(dsp, "legacy host_buf_ptr=%x\n", buf->host_buf_ptr); 3384 3385 return 0; 3386 } 3387 3388 static int wm_adsp_buffer_parse_coeff(struct wm_coeff_ctl *ctl) 3389 { 3390 struct wm_adsp_host_buf_coeff_v1 coeff_v1; 3391 struct wm_adsp_compr_buf *buf; 3392 unsigned int val, reg; 3393 int ret, i; 3394 3395 ret = wm_coeff_base_reg(ctl, &reg); 3396 if (ret) 3397 return ret; 3398 3399 for (i = 0; i < 5; ++i) { 3400 ret = regmap_raw_read(ctl->dsp->regmap, reg, &val, sizeof(val)); 3401 if (ret < 0) 3402 return ret; 3403 3404 if (val) 3405 break; 3406 3407 usleep_range(1000, 2000); 3408 } 3409 3410 if (!val) { 3411 adsp_err(ctl->dsp, "Failed to acquire host buffer\n"); 3412 return -EIO; 3413 } 3414 3415 buf = wm_adsp_buffer_alloc(ctl->dsp); 3416 if (!buf) 3417 return -ENOMEM; 3418 3419 buf->host_buf_mem_type = ctl->alg_region.type; > 3420 buf->host_buf_ptr = be32_to_cpu(val); 3421 3422 ret = wm_adsp_buffer_populate(buf); 3423 if (ret < 0) 3424 return ret; 3425 3426 /* 3427 * v0 host_buffer coefficients didn't have versioning, so if the 3428 * control is one word, assume version 0. 3429 */ 3430 if (ctl->len == 4) { 3431 adsp_dbg(ctl->dsp, "host_buf_ptr=%x\n", buf->host_buf_ptr); 3432 return 0; 3433 } 3434 3435 ret = regmap_raw_read(ctl->dsp->regmap, reg, &coeff_v1, 3436 sizeof(coeff_v1)); 3437 if (ret < 0) 3438 return ret; 3439 > 3440 coeff_v1.versions = be32_to_cpu(coeff_v1.versions); > 3441 val = coeff_v1.versions & HOST_BUF_COEFF_COMPAT_VER_MASK; 3442 val >>= HOST_BUF_COEFF_COMPAT_VER_SHIFT; 3443 3444 if (val > HOST_BUF_COEFF_SUPPORTED_COMPAT_VER) { 3445 adsp_err(ctl->dsp, 3446 "Host buffer coeff ver %u > supported version %u\n", 3447 val, HOST_BUF_COEFF_SUPPORTED_COMPAT_VER); 3448 return -EINVAL; 3449 } 3450 3451 for (i = 0; i < ARRAY_SIZE(coeff_v1.name); i++) > 3452 coeff_v1.name[i] = be32_to_cpu(coeff_v1.name[i]); 3453 3454 wm_adsp_remove_padding((u32 *)&coeff_v1.name, 3455 ARRAY_SIZE(coeff_v1.name), 3456 WM_ADSP_DATA_WORD_SIZE); 3457 3458 buf->name = kasprintf(GFP_KERNEL, "%s-dsp-%s", ctl->dsp->part, 3459 (char *)&coeff_v1.name); 3460 3461 adsp_dbg(ctl->dsp, "host_buf_ptr=%x coeff version %u\n", 3462 buf->host_buf_ptr, val); 3463 3464 return val; 3465 } 3466 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH 0/7] ASoC: stm32: i2s: miscellaneous fixes
by Olivier Moysan 26 Feb '19

26 Feb '19

This patch-set is a collection of fixes for STM32 I2S driver. Olivier Moysan (7): ASoC: stm32: i2s: fix IRQ clearing ASoC: stm32: i2s: fix 16 bit format support ASoC: stm32: i2s: fix stream count management ASoC: stm32: i2s: fix dma configuration ASoC: stm32: i2s: remove useless callback ASoC: stm32: i2s: fix race condition in irq handler ASoC: stm32: i2s: skip useless write in slave mode sound/soc/stm/stm32_i2s.c | 73 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 38 deletions(-) -- 2.7.4

2 14

[alsa-devel] [PATCH] ASoC: cs35l36: Fix an IS_ERR() vs NULL checking bug
by Dan Carpenter 26 Feb '19

26 Feb '19

The irq_get_irq_data() function doesn't return error pointers, it returns NULL. Fixes: 6ba9dd6c893b ("ASoC: cs35l36: Add support for Cirrus CS35L36 Amplifier") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/soc/codecs/cs35l36.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/cs35l36.c b/sound/soc/codecs/cs35l36.c index e374fffb7e17..901d57491218 100644 --- a/sound/soc/codecs/cs35l36.c +++ b/sound/soc/codecs/cs35l36.c @@ -1845,9 +1845,9 @@ static int cs35l36_i2c_probe(struct i2c_client *i2c_client, cs35l36_apply_vpbr_config(cs35l36); irq_d = irq_get_irq_data(i2c_client->irq); - if (IS_ERR(irq_d)) { + if (!irq_d) { dev_err(&i2c_client->dev, "Invalid IRQ: %d\n", i2c_client->irq); - ret = PTR_ERR(irq_d); + ret = -ENODEV; goto err; } -- 2.17.1

4 3