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

[PATCH v2 1/2] ASoC: tlv320aic32x4: Increase maximum register in regmap
by Annaliese McDermond 31 Mar '21

31 Mar '21

AIC32X4_REFPOWERUP was added as a register, but the maximum register value in the regmap and regmap range was not correspondingly increased. This caused an error when this register was attempted to be written. Fixes: ec96690de82c ("ASoC: tlv320aic32x4: Enable fast charge") Cc: stable(a)vger.kernel.org Signed-off-by: Annaliese McDermond <nh6z(a)nh6z.net> --- sound/soc/codecs/tlv320aic32x4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index f04f88c8d425..1ac3b3b12dc6 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -577,12 +577,12 @@ static const struct regmap_range_cfg aic32x4_regmap_pages[] = { .window_start = 0, .window_len = 128, .range_min = 0, - .range_max = AIC32X4_RMICPGAVOL, + .range_max = AIC32X4_REFPOWERUP, }, }; const struct regmap_config aic32x4_regmap_config = { - .max_register = AIC32X4_RMICPGAVOL, + .max_register = AIC32X4_REFPOWERUP, .ranges = aic32x4_regmap_pages, .num_ranges = ARRAY_SIZE(aic32x4_regmap_pages), }; -- 2.27.0

1 0

[PATCH v2 2/2] ASoC: tlv320aic32x4: Register clocks before registering component
by Annaliese McDermond 31 Mar '21

31 Mar '21

Clock registration must be performed before the component is registered. aic32x4_component_probe attempts to get all the clocks right off the bat. If the component is registered before the clocks there is a race condition where the clocks may not be registered by the time aic32x4_componet_probe actually runs. Fixes: d1c859d314d8 ("ASoC: codec: tlv3204: Increased maximum supported channels") Cc: stable(a)vger.kernel.org Signed-off-by: Annaliese McDermond <nh6z(a)nh6z.net> --- sound/soc/codecs/tlv320aic32x4.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index 1ac3b3b12dc6..b689f26fc4be 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -1243,6 +1243,10 @@ int aic32x4_probe(struct device *dev, struct regmap *regmap) if (ret) goto err_disable_regulators; + ret = aic32x4_register_clocks(dev, aic32x4->mclk_name); + if (ret) + goto err_disable_regulators; + ret = devm_snd_soc_register_component(dev, &soc_component_dev_aic32x4, &aic32x4_dai, 1); if (ret) { @@ -1250,10 +1254,6 @@ int aic32x4_probe(struct device *dev, struct regmap *regmap) goto err_disable_regulators; } - ret = aic32x4_register_clocks(dev, aic32x4->mclk_name); - if (ret) - goto err_disable_regulators; - return 0; err_disable_regulators: -- 2.27.0

1 0

re: ALSA: control - add layer registration routines
by Colin Ian King 31 Mar '21

31 Mar '21

Hi, Static analysis on linux-next with Coverity has detected a potential issue in the following commit: commit 3f0638a0333bfdd0549985aa620f2ab69737af47 Author: Jaroslav Kysela <perex(a)perex.cz> Date: Wed Mar 17 18:29:41 2021 +0100 ALSA: control - add layer registration routines The static analysis is as follows: 2072 void snd_ctl_disconnect_layer(struct snd_ctl_layer_ops *lops) 2073 { 2074 struct snd_ctl_layer_ops *lops2, *prev_lops2; 2075 2076 down_write(&snd_ctl_layer_rwsem); assignment: Assigning: prev_lops2 = NULL. 2077 for (lops2 = snd_ctl_layer, prev_lops2 = NULL; lops2; lops2 = lops2->next) 2078 if (lops2 == lops) { null: At condition prev_lops2, the value of prev_lops2 must be NULL. dead_error_condition: The condition !prev_lops2 must be true. 2079 if (!prev_lops2) 2080 snd_ctl_layer = lops->next; 2081 else 'Constant' variable guards dead code (DEADCODE) dead_error_line: Execution cannot reach this statement: prev_lops2->next = lops->next;. Local variable prev_lops2 is assigned only once, to a constant value, making it effectively constant throughout its scope. If this is not the intent, examine the logic to see if there is a missing assignment that would make prev_lops2 not remain constant. 2082 prev_lops2->next = lops->next; 2083 break; 2084 } 2085 up_write(&snd_ctl_layer_rwsem); 2086 } I couldn't quite figure out the original intent of the prev_lops use, so I'd thought I'd report this issue as the code does look incorrect. Colin

2 1

[PATCH V2] soundwire: qcom: use signed variable for error return
by Vinod Koul 31 Mar '21

31 Mar '21

We get warning of using a unsigned variable being compared to less than zero. The comparison is correct as it checks for errors from previous call to qcom_swrm_get_alert_slave_dev_num(), so we should use a signed variable here. While at it, drop the superfluous initialization as well drivers/soundwire/qcom.c: qcom_swrm_irq_handler() warn: impossible condition '(devnum < 0) => (0-255 < 0)' Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Vinod Koul <vkoul(a)kernel.org> --- drivers/soundwire/qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index b08ecb9b418c..ec86c4e53fdb 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -428,7 +428,7 @@ static irqreturn_t qcom_swrm_irq_handler(int irq, void *dev_id) struct qcom_swrm_ctrl *swrm = dev_id; u32 value, intr_sts, intr_sts_masked, slave_status; u32 i; - u8 devnum = 0; + int devnum; int ret = IRQ_HANDLED; swrm->reg_read(swrm, SWRM_INTERRUPT_STATUS, &intr_sts); -- 2.26.3

3 2

[PATCH] soundwire: qcom: use signed variable for error return
by Vinod Koul 31 Mar '21

31 Mar '21

We get warning for using a unsigned variable being compared to less than zero. The comparison is correct as it checks for errors from previous call to qcom_swrm_get_alert_slave_dev_num(), so we should use a signed variable instead. drivers/soundwire/qcom.c: qcom_swrm_irq_handler() warn: impossible condition '(devnum < 0) => (0-255 < 0)' Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Vinod Koul <vkoul(a)kernel.org> --- drivers/soundwire/qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index b08ecb9b418c..55ed133c6704 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -428,7 +428,7 @@ static irqreturn_t qcom_swrm_irq_handler(int irq, void *dev_id) struct qcom_swrm_ctrl *swrm = dev_id; u32 value, intr_sts, intr_sts_masked, slave_status; u32 i; - u8 devnum = 0; + s8 devnum = 0; int ret = IRQ_HANDLED; swrm->reg_read(swrm, SWRM_INTERRUPT_STATUS, &intr_sts); -- 2.26.3

3 3

Re: [PATCH] ASoC: sunxi: sun4i-codec: fill ASoC card owner
by Mark Brown 31 Mar '21

31 Mar '21

On Wed, Mar 31, 2021 at 04:59:15PM +0200, bage(a)linutronix.de wrote: > From: Bastian Germann <bage(a)linutronix.de> > > card->owner is a required property and since commit 81033c6b584b ("ALSA: > core: Warn on empty module") a warning is issued if it is empty. Add it. > This fixes following warning observed on Lamobo R1: > > WARNING: CPU: 1 PID: 190 at sound/core/init.c:207 snd_card_new+0x430/0x480 [snd] > Modules linked in: sun4i_codec(E+) sun4i_backend(E+) snd_soc_core(E) ... > CPU: 1 PID: 190 Comm: systemd-udevd Tainted: G C E 5.10.0-1-armmp #1 Debian 5.10.4-1 > Hardware name: Allwinner sun7i (A20) Family > [<c0ce8544>] (dump_backtrace) from [<c0ce88f0>] (show_stack+0x20/0x24) > [<c0ce88d0>] (show_stack) from [<c0ceda20>] (dump_stack+0xc8/0xdc) > [<c0ced958>] (dump_stack) from [<c034d49c>] (__warn+0xfc/0x158) > [<c034d3a0>] (__warn) from [<c0ce966c>] (warn_slowpath_fmt+0x70/0xe4) Please think hard before including complete backtraces in upstream reports, they are very large and contain almost no useful information relative to their size so often obscure the relevant content in your message. If part of the backtrace is usefully illustrative (it often is for search engines if nothing else) then it's usually better to pull out the relevant sections.

1 0

Re: [PATCH -next] ASoC: cs35l35: Remove unused including <linux/version.h>
by Mark Brown 31 Mar '21

31 Mar '21

On Fri, Mar 26, 2021 at 02:13:31PM +0800, Zheng Yongjun wrote: > Remove including <linux/version.h> that don't need it. This doesn't apply against current code, please check and resend: Applying: ASoC: cs35l35: Remove unused including <linux/version.h> Using index info to reconstruct a base tree... error: patch failed: sound/soc/codecs/cs35l35.c:9 error: sound/soc/codecs/cs35l35.c: patch does not apply error: Did you hand edit your patch? It does not apply to blobs recorded in its index. Patch failed at 0006 ASoC: cs35l35: Remove unused including <linux/version.h>

1 0

Re: [PATCH -next] ASoC: cs42l42: Remove unused including <linux/version.h>
by Mark Brown 31 Mar '21

31 Mar '21

On Fri, Mar 26, 2021 at 02:13:35PM +0800, Zheng Yongjun wrote: > Remove including <linux/version.h> that don't need it. This doesn't apply against current code, please check and resend: Applying: ASoC: cs42l42: Remove unused including <linux/version.h> Using index info to reconstruct a base tree... error: patch failed: sound/soc/codecs/cs42l42.c:11 error: sound/soc/codecs/cs42l42.c: patch does not apply error: Did you hand edit your patch? It does not apply to blobs recorded in its index. Patch failed at 0006 ASoC: cs42l42: Remove unused including <linux/version.h>

1 0

Bus error with alsaloop
by GitHub issues - opened 31 Mar '21

31 Mar '21

alsa-project/alsa-utils issue #85 was opened from philipp-fischer: ## Behaviour alsaloop crashes with a bus error (SIGBUS) immediately ``` pi@pi-snapserver:~ $ alsaloop -C hw:2,0 -P hw:3,0 Bus error ``` ## Analysis and debugging Very verbose output: ``` pi@pi-snapserver:~ $ alsaloop -C hw:2,0 -P hw:3,0 -vvvvvvvvvvvvvvvvv !!!Scheduler set to Round Robin with priority 99 FAILED! playback hw:3,0: buffer_size=1920 playback hw:3,0: period_size=240 capture hw:2,0: buffer_size=1920 capture hw:2,0: period_size=240 playback hw:3,0: avail_min2=1560 capture hw:2,0: avail_min2=120 Hardware PCM card 3 'ICUSBAUDIO7D' device 0 subdevice 0 Its setup is: stream : PLAYBACK access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 1920 period_size : 240 period_time : 5000 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 1560 period_event : 0 start_threshold : 2147483647 stop_threshold : 1920 silence_threshold: 0 silence_size : 0 boundary : 2013265920 appl_ptr : 0 hw_ptr : 0 Hardware PCM card 2 'ICUSBAUDIO7D' device 0 subdevice 0 Its setup is: stream : CAPTURE access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 1920 period_size : 240 period_time : 5000 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 240 period_event : 0 start_threshold : 2147483647 stop_threshold : 1920 silence_threshold: 0 silence_size : 0 boundary : 2013265920 appl_ptr : 0 hw_ptr : 0 Latency 480 frames, 10000.000us, 10.000000ms (100.0000Hz) playback hw:3,0/capture hw:2,0 sync type: SAMPLERATE (SRC_SINC_FASTEST) playback hw:3,0/capture hw:2,0: capt->buffer_size = 3840, play->buffer_size = 3840 playback hw:3,0/capture hw:2,0: Samplerate src_ratio update1: 1.00000000 New pitch for playback hw:3,0/capture hw:2,0: 1.00000000 (min/max samples = 0/0) playback hw:3,0/capture hw:2,0: silence queued 480 samples pool took 3074us playback hw:3,0/capture hw:2,0: pollfds handle playback hw:3,0: delay 480 / 3840 / 0 capture hw:2,0: delay 0 / 3840 / 0 playback hw:3,0/capture hw:2,0: prevents = 0x4, crevents = 0x0 playback hw:3,0/capture hw:2,0: queued 480/0 samples playback hw:3,0: end delay 480 / 3840 / 0 capture hw:2,0: end delay 0 / 3840 / 0 playback hw:3,0/capture hw:2,0: processing time 59us pool took 13us [...] playback hw:3,0/capture hw:2,0: pollfds handle playback hw:3,0: delay 323 / 3840 / 0 capture hw:2,0: delay 0 / 3840 / 0 playback hw:3,0/capture hw:2,0: prevents = 0x4, crevents = 0x0 playback hw:3,0/capture hw:2,0: queued 323/0 samples playback hw:3,0: end delay 323 / 3840 / 0 capture hw:2,0: end delay 0 / 3840 / 0 playback hw:3,0/capture hw:2,0: processing time 212us pool took 5us playback hw:3,0/capture hw:2,0: pollfds handle playback hw:3,0: delay 323 / 3840 / 0 capture hw:2,0: delay 48 / 3840 / 0 playback hw:3,0/capture hw:2,0: prevents = 0x4, crevents = 0x0 Bus error ``` Debugging with backtrace (binary without dbg symbols): ``` [...] Program received signal SIGBUS, Bus error. 0xb6dbd394 in src_short_to_float_array () from /lib/arm-linux-gnueabihf/libsamplerate.so.0 (gdb) bt #0 0xb6dbd394 in src_short_to_float_array () from /lib/arm-linux-gnueabihf/libsamplerate.so.0 #1 0x00016a20 in ?? () Backtrace stopped: previous frame identical to this frame (corrupt stack?) (gdb) ``` So the error seems to happen in `libsamplerate.so` Switching the sync method to "SIMPLE" prevents the error from happening as alsaloop doesn't seem to make use of libsamplerate in this case. The following modes run without failing but don't give the desired results: ``` pi@pi-snapserver:~ $ alsaloop -C hw:2,0 -P hw:3,0 -S 0 # SYNC_TYPE_NONE pi@pi-snapserver:~ $ alsaloop -C hw:2,0 -P hw:3,0 -S 1 # SYNC_TYPE_SIMPLE pi@pi-snapserver:~ $ alsaloop -C hw:2,0 -P hw:3,0 -S 2 # SYNC_TYPE_CAPTRATESHIFT pi@pi-snapserver:~ $ alsaloop -C hw:2,0 -P hw:3,0 -S 3 # SYNC_TYPE_PLAYRATESHIFT ``` Only `SYNC_TYPE_SAMPLERATE` and `SYNC_TYPE_AUTO` (which selects SYNC_TYPE_SAMPLERATE) fail. The modes `SYNC_TYPE_NONE` and `SYNC_TYPE_SIMPLE` don't crash for me, but they don't work and result in increasing latency until the fifos reset. (Which is another issue I guess) Issue URL : https://github.com/alsa-project/alsa-utils/issues/85 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH 1/2] ASoC: ak5558: Add support for ak5552
by Shengjiu Wang 31 Mar '21

31 Mar '21

From: Viorel Suman <viorel.suman(a)nxp.com> AK5552 is a 32-bit 2ch ADC and has the same register map as AK5558. Signed-off-by: Viorel Suman <viorel.suman(a)nxp.com> Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/codecs/ak5558.c | 93 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 88 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/ak5558.c b/sound/soc/codecs/ak5558.c index 85bdd0534180..af12afa83b4f 100644 --- a/sound/soc/codecs/ak5558.c +++ b/sound/soc/codecs/ak5558.c @@ -9,6 +9,7 @@ #include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/module.h> +#include <linux/of_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h> @@ -23,6 +24,11 @@ #include "ak5558.h" +enum ak555x_type { + AK5558, + AK5552, +}; + #define AK5558_NUM_SUPPLIES 2 static const char *ak5558_supply_names[AK5558_NUM_SUPPLIES] = { "DVDD", @@ -59,6 +65,15 @@ static const struct soc_enum ak5558_mono_enum[] = { ARRAY_SIZE(mono_texts), mono_texts), }; +static const char * const mono_5552_texts[] = { + "2 Slot", "1 Slot (Fixed)", "2 Slot", "1 Slot (Optimal)", +}; + +static const struct soc_enum ak5552_mono_enum[] = { + SOC_ENUM_SINGLE(AK5558_01_POWER_MANAGEMENT2, 1, + ARRAY_SIZE(mono_5552_texts), mono_5552_texts), +}; + static const char * const digfil_texts[] = { "Sharp Roll-Off", "Show Roll-Off", "Short Delay Sharp Roll-Off", "Short Delay Show Roll-Off", @@ -74,6 +89,11 @@ static const struct snd_kcontrol_new ak5558_snd_controls[] = { SOC_ENUM("AK5558 Digital Filter", ak5558_adcset_enum[0]), }; +static const struct snd_kcontrol_new ak5552_snd_controls[] = { + SOC_ENUM("AK5552 Monaural Mode", ak5552_mono_enum[0]), + SOC_ENUM("AK5552 Digital Filter", ak5558_adcset_enum[0]), +}; + static const struct snd_soc_dapm_widget ak5558_dapm_widgets[] = { /* Analog Input */ SND_SOC_DAPM_INPUT("AIN1"), @@ -97,6 +117,17 @@ static const struct snd_soc_dapm_widget ak5558_dapm_widgets[] = { SND_SOC_DAPM_AIF_OUT("SDTO", "Capture", 0, SND_SOC_NOPM, 0, 0), }; +static const struct snd_soc_dapm_widget ak5552_dapm_widgets[] = { + /* Analog Input */ + SND_SOC_DAPM_INPUT("AIN1"), + SND_SOC_DAPM_INPUT("AIN2"), + + SND_SOC_DAPM_ADC("ADC Ch1", NULL, AK5558_00_POWER_MANAGEMENT1, 0, 0), + SND_SOC_DAPM_ADC("ADC Ch2", NULL, AK5558_00_POWER_MANAGEMENT1, 1, 0), + + SND_SOC_DAPM_AIF_OUT("SDTO", "Capture", 0, SND_SOC_NOPM, 0, 0), +}; + static const struct snd_soc_dapm_route ak5558_intercon[] = { {"ADC Ch1", NULL, "AIN1"}, {"SDTO", NULL, "ADC Ch1"}, @@ -123,6 +154,14 @@ static const struct snd_soc_dapm_route ak5558_intercon[] = { {"SDTO", NULL, "ADC Ch8"}, }; +static const struct snd_soc_dapm_route ak5552_intercon[] = { + {"ADC Ch1", NULL, "AIN1"}, + {"SDTO", NULL, "ADC Ch1"}, + + {"ADC Ch2", NULL, "AIN2"}, + {"SDTO", NULL, "ADC Ch2"}, +}; + static int ak5558_set_mcki(struct snd_soc_component *component) { return snd_soc_component_update_bits(component, AK5558_02_CONTROL1, AK5558_CKS, @@ -267,6 +306,18 @@ static struct snd_soc_dai_driver ak5558_dai = { .ops = &ak5558_dai_ops, }; +static struct snd_soc_dai_driver ak5552_dai = { + .name = "ak5558-aif", + .capture = { + .stream_name = "Capture", + .channels_min = 1, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_KNOT, + .formats = AK5558_FORMATS, + }, + .ops = &ak5558_dai_ops, +}; + static void ak5558_power_off(struct ak5558_priv *ak5558) { if (!ak5558->reset_gpiod) @@ -354,6 +405,21 @@ static const struct snd_soc_component_driver soc_codec_dev_ak5558 = { .non_legacy_dai_naming = 1, }; +static const struct snd_soc_component_driver soc_codec_dev_ak5552 = { + .probe = ak5558_probe, + .remove = ak5558_remove, + .controls = ak5552_snd_controls, + .num_controls = ARRAY_SIZE(ak5552_snd_controls), + .dapm_widgets = ak5552_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ak5552_dapm_widgets), + .dapm_routes = ak5552_intercon, + .num_dapm_routes = ARRAY_SIZE(ak5552_intercon), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, +}; + static const struct regmap_config ak5558_regmap = { .reg_bits = 8, .val_bits = 8, @@ -368,6 +434,7 @@ static int ak5558_i2c_probe(struct i2c_client *i2c) { struct ak5558_priv *ak5558; int ret = 0; + int dev_id; int i; ak5558 = devm_kzalloc(&i2c->dev, sizeof(*ak5558), GFP_KERNEL); @@ -396,11 +463,26 @@ static int ak5558_i2c_probe(struct i2c_client *i2c) return ret; } - ret = devm_snd_soc_register_component(&i2c->dev, - &soc_codec_dev_ak5558, - &ak5558_dai, 1); - if (ret) + dev_id = (uintptr_t)of_device_get_match_data(&i2c->dev); + switch (dev_id) { + case AK5552: + ret = devm_snd_soc_register_component(&i2c->dev, + &soc_codec_dev_ak5552, + &ak5552_dai, 1); + break; + case AK5558: + ret = devm_snd_soc_register_component(&i2c->dev, + &soc_codec_dev_ak5558, + &ak5558_dai, 1); + break; + default: + dev_err(&i2c->dev, "unexpected device type\n"); + return -EINVAL; + } + if (ret < 0) { + dev_err(&i2c->dev, "failed to register component: %d\n", ret); return ret; + } pm_runtime_enable(&i2c->dev); regcache_cache_only(ak5558->regmap, true); @@ -416,7 +498,8 @@ static int ak5558_i2c_remove(struct i2c_client *i2c) } static const struct of_device_id ak5558_i2c_dt_ids[] __maybe_unused = { - { .compatible = "asahi-kasei,ak5558"}, + { .compatible = "asahi-kasei,ak5558", .data = (void *) AK5558 }, + { .compatible = "asahi-kasei,ak5552", .data = (void *) AK5552 }, { } }; MODULE_DEVICE_TABLE(of, ak5558_i2c_dt_ids); -- 2.27.0

4 4