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

[PATCH] ASoC: simple-card: add trigger-stop entry parser
by Maxim Kochetkov 14 Jul '23

14 Jul '23

It may be useful to specify trigger-stop for some DMA-based simple audio card. So add this "trigger-stop" device tree entry parser. Signed-off-by: Maxim Kochetkov <fido_max(a)inbox.ru> --- sound/soc/generic/simple-card.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index a78babf44f38..86df7d326068 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -145,8 +145,27 @@ static int simple_parse_node(struct asoc_simple_priv *priv, struct snd_soc_dai_link_component *dlc; struct asoc_simple_dai *dai; int ret; + const char *str; + struct { + char *name; + unsigned int val; + } of_trigger_table[] = { + { "default", SND_SOC_TRIGGER_ORDER_DEFAULT }, + { "ldc", SND_SOC_TRIGGER_ORDER_LDC }, + }; + if (cpu) { + ret = of_property_read_string(np, "trigger-stop", &str); + if (ret == 0) { + for (int i = 0; i < ARRAY_SIZE(of_trigger_table); i++) { + if (strcmp(str, of_trigger_table[i].name) == 0) { + dai_link->trigger_stop = of_trigger_table[i].val; + break; + } + } + } + dlc = asoc_link_to_cpu(dai_link, 0); dai = simple_props_to_dai_cpu(dai_props, 0); } else { -- 2.40.1

2 1

[PATCH 0/2] kselftest/alsa: Decrease pcm-test duration to avoid timeouts
by Nícolas F. R. A. Prado 13 Jul '23

13 Jul '23

This series decreases the pcm-test duration in order to avoid timeouts by first moving the audio stream duration to a variable and subsequently decreasing it. Nícolas F. R. A. Prado (2): kselftest/alsa: pcm-test: Move stream duration and margin to variables kselftest/alsa: pcm-test: Decrease stream duration from 4 to 2 seconds tools/testing/selftests/alsa/pcm-test.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.41.0

5 15

[PATCH] ASoC: q6dsp: q6apm: make g_apm static
by Min-Hua Chen 13 Jul '23

13 Jul '23

This patch fixes the following sprse warning: sound/soc/qcom/qdsp6/q6apm.c:30:14: sparse: warning: symbol 'g_apm' was not declared. Should it be static? No functional change intended Signed-off-by: Min-Hua Chen <minhuadotchen(a)gmail.com> --- sound/soc/qcom/qdsp6/q6apm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/qcom/qdsp6/q6apm.c b/sound/soc/qcom/qdsp6/q6apm.c index 7bfac9492ab5..d5ad9cbd3c21 100644 --- a/sound/soc/qcom/qdsp6/q6apm.c +++ b/sound/soc/qcom/qdsp6/q6apm.c @@ -27,7 +27,7 @@ struct apm_graph_mgmt_cmd { #define APM_GRAPH_MGMT_PSIZE(p, n) ALIGN(struct_size(p, sub_graph_id_list, n), 8) -struct q6apm *g_apm; +static struct q6apm *g_apm; int q6apm_send_cmd_sync(struct q6apm *apm, struct gpr_pkt *pkt, uint32_t rsp_opcode) { -- 2.34.1

1 0

[PATCH 00/10] ASoC: ad: Update Analog Devices drivers to maple tree register cache
by Mark Brown 13 Jul '23

13 Jul '23

The maple tree register cache has now got to feature parity with the rbtree cache, there are some different tradeoffs made and it should be a better choice for most modern systems. Convert the Analog Devices drivers to use the more modern data structure. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Mark Brown (10): ASoC: ad1836: Update to use maple tree register cache ASoC: ad1980: Update to use maple tree register cache ASoC: adau1372: Update to use maple tree register cache ASoC: adau1373: Update to use maple tree register cache ASoC: adau1701: Update to use maple tree register cache ASoC: adau1761: Update to use maple tree register cache ASoC: adau1781: Update to use maple tree register cache ASoC: adau1977: Update to use maple tree register cache ASoC: adau7118: Update to use maple tree register cache ASoC: adav80x: Update to use maple tree register cache sound/soc/codecs/ad1836.c | 2 +- sound/soc/codecs/ad1980.c | 2 +- sound/soc/codecs/adau1372.c | 2 +- sound/soc/codecs/adau1373.c | 2 +- sound/soc/codecs/adau1701.c | 2 +- sound/soc/codecs/adau1761.c | 2 +- sound/soc/codecs/adau1781.c | 2 +- sound/soc/codecs/adau1977.c | 2 +- sound/soc/codecs/adau7118-i2c.c | 2 +- sound/soc/codecs/adav80x.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) --- base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 change-id: 20230701-asoc-ad-maple-170068cf0c39 Best regards, -- Mark Brown <broonie(a)kernel.org>

2 12

[PATCH 2/2] ALSA: hda/realtek: Add quirks for Lenovo 16IAH7, 16IAX7 and 16ARHA7
by David Xu 13 Jul '23

13 Jul '23

Add quirks for Lenovo 16IAH7, 16IAX7 and 16ARHA7 that have dual cs35l41 amplifiers that drives their speakers. Please note that this patch depends on patch 1, for the added quirks to work for the specified models, proper CSC3551 configurtion fixups have to be applied. Signed-off-by: David Xu <xuwd1(a)hotmail.com> --- sound/pci/hda/patch_realtek.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e2f8b608de82..cc10bb8b75d1 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9831,6 +9831,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x31af, "ThinkCentre Station", ALC623_FIXUP_LENOVO_THINKSTATION_P340), SND_PCI_QUIRK(0x17aa, 0x3801, "Lenovo Yoga9 14IAP7", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN), SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo Yoga DuetITL 2021", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS), + SND_PCI_QUIRK(0x17aa, 0x3803, "Legion Slim 7i 16IAH7", ALC287_FIXUP_CS35L41_I2C_2), SND_PCI_QUIRK(0x17aa, 0x3813, "Legion 7i 15IMHG05", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS), SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940 / Yoga Duet 7", ALC298_FIXUP_LENOVO_C940_DUET7), SND_PCI_QUIRK(0x17aa, 0x3819, "Lenovo 13s Gen2 ITL", ALC287_FIXUP_13S_GEN2_SPEAKERS), @@ -9846,6 +9847,10 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x3853, "Lenovo Yoga 7 15ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS), SND_PCI_QUIRK(0x17aa, 0x3855, "Legion 7 16ITHG6", ALC287_FIXUP_LEGION_16ITHG6), SND_PCI_QUIRK(0x17aa, 0x3869, "Lenovo Yoga7 14IAL7", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN), + SND_PCI_QUIRK(0x17aa, 0x386e, "Legion Slim 7i 16IAH7", ALC287_FIXUP_CS35L41_I2C_2), + SND_PCI_QUIRK(0x17aa, 0x386f, "Legion 7i 16IAX7", ALC287_FIXUP_CS35L41_I2C_2), + SND_PCI_QUIRK(0x17aa, 0x3874, "Legion 7i 16IAX7", ALC287_FIXUP_CS35L41_I2C_2), + SND_PCI_QUIRK(0x17aa, 0x3877, "Legion 7 16ARHA7", ALC287_FIXUP_CS35L41_I2C_2), SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC), SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI), -- 2.41.0

1 0

Re: [PATCH 2/4] ASoC: codecs: es8326: Fix power-up sequence
by Zhu Ning 13 Jul '23

13 Jul '23

> > Old power-up sequence causes large pop noise during start-up. > > Using a new sequence instead. > > > static const struct regmap_range es8326_volatile_ranges[] = { > > - regmap_reg_range(ES8326_HP_DETECT, ES8326_HP_DETECT), > > + regmap_reg_range(ES8326_HPDET_TYPE, ES8326_HPDET_TYPE), > > }; > > As well as not seeming to correspond to the patch description this seems > obviously buggy - even if _HPDET_TYPE was missed from the list of > volatile registers no software change should be able to make a volatile > register non-volatile, that's a property of the hardware. The changes > to read from HPDET_TYPE also seem unrelated to the main change here in > the resume function, this should probably be multiple commits. Just a naming space change, will create a new patch for it. > > static int es8326_resume(struct snd_soc_component *component) > > { > > struct es8326_priv *es8326 = snd_soc_component_get_drvdata(component); > > - unsigned int reg; > > > > regcache_cache_only(es8326->regmap, false); > > regcache_sync(es8326->regmap); > > > > + /* reset register value to default */ > > + regmap_write(es8326->regmap, ES8326_CSM_I2C_STA, 0x01); > > + usleep_range(1000, 3000); > > + regmap_write(es8326->regmap, ES8326_CSM_I2C_STA, 0x00); > > This looks wrong, you're resyncing the cache and then start resetting > registers? It feels like the ordering is off here, and some of this > reset sequence might want to be done with the cache bypassed. Are you > sure that there's no corruption of user visible state resulting from the > power up sequence, especially around the HP driver? Basically the chip runs through the start-up sequence every time in the resume function. Will move the reset sequence to es8326_suspend

2 1

[PATCH v2 0/5] Few audio fixes on Tegra platforms
by Sameer Pujar 13 Jul '23

13 Jul '23

This series fixes some of the issues which were observed during an attempt to enhance automated test coverage on Jetson AGX Orin. Below is a short summary of the issues and fixes: * Sample rate coversion failures above 48kHz. * AMX and ADX test cases failures due to incorrect byte mask. * Atomic sleep in RT5640 codec which is present on Jetson AGX Orin. * AHUB clock fixes on Tegra234 and previous chips. * Minor cleanups in ASRC and AHUB driver. Changelog ========= v1 -> v2: --------- * Few patches got accepted in the original (v1) series. Now v2 addresses comments for remaining patches. * AMX/ADX byte map fix patch is updated with more details in the commit message and added TODO item in the driver to improve the logic. * For RT5640 codec patch, the threaded IRQ is used for only for rt5640_irq() and rt5640_jd_gpio_irq() is left untouched. Sameer Pujar (2): ASoC: rt5640: Fix sleep in atomic context arm64: tegra: Update AHUB clock parent and rate Sheetal (3): ASoC: tegra: Fix AMX byte map ASoC: tegra: Fix ADX byte map arm64: tegra: Update AHUB clock parent and rate on Tegra234 arch/arm64/boot/dts/nvidia/tegra186.dtsi | 3 ++- arch/arm64/boot/dts/nvidia/tegra194.dtsi | 3 ++- arch/arm64/boot/dts/nvidia/tegra210.dtsi | 3 ++- arch/arm64/boot/dts/nvidia/tegra234.dtsi | 3 ++- sound/soc/codecs/rt5640.c | 12 ++++++---- sound/soc/tegra/tegra210_adx.c | 34 +++++++++++++++++---------- sound/soc/tegra/tegra210_amx.c | 40 ++++++++++++++++++-------------- 7 files changed, 59 insertions(+), 39 deletions(-) -- 2.7.4

4 11

[PATCH 1/3] ALSA: emu10k1: fix return value of snd_emu1010_adc_pads_put()
by Oswald Buddenhagen 13 Jul '23

13 Jul '23

It returned zero even if the value had changed. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> --- this should have been in cc766807a2 (fix return value of snd_emu1010_dac_pads_put()), but, well. --- sound/pci/emu10k1/emumixer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index f9500cd50a4b..573e1c7c5e50 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c @@ -770,18 +770,21 @@ static int snd_emu1010_adc_pads_put(struct snd_kcontrol *kcontrol, struct snd_ct struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol); unsigned int mask = snd_emu1010_adc_pad_regs[kcontrol->private_value]; unsigned int val, cache; + int change; + val = ucontrol->value.integer.value[0]; cache = emu->emu1010.adc_pads; if (val == 1) cache = cache | mask; else cache = cache & ~mask; - if (cache != emu->emu1010.adc_pads) { + change = (cache != emu->emu1010.adc_pads); + if (change) { snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, cache ); emu->emu1010.adc_pads = cache; } - return 0; + return change; } static const struct snd_kcontrol_new emu1010_adc_pads_ctl = { -- 2.40.0.152.g15d061e6df

2 14

[PATCH] ALSA: pcmtest: Extend error injection, decrease buffer filling overhead
by Ivan Orlov 13 Jul '23

13 Jul '23

Extend 'pcmtest' virtual driver with 'open' callback error injection functionality, as it already can inject errors into other PCM callbacks. Fix the driver to use already defined variables where it is possible. Additionally, decrease the buffer filling overhead with conditional reminder calculation in the 'inc_buf_pos' inline function. Signed-off-by: Ivan Orlov <ivan.orlov0322(a)gmail.com> --- sound/drivers/pcmtest.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sound/drivers/pcmtest.c b/sound/drivers/pcmtest.c index 291e7fe47893..08e14b5eb772 100644 --- a/sound/drivers/pcmtest.c +++ b/sound/drivers/pcmtest.c @@ -65,6 +65,7 @@ static int inject_delay; static bool inject_hwpars_err; static bool inject_prepare_err; static bool inject_trigger_err; +static bool inject_open_err; static short fill_mode = FILL_MODE_PAT; @@ -88,6 +89,9 @@ module_param(inject_prepare_err, bool, 0600); MODULE_PARM_DESC(inject_prepare_err, "Inject EINVAL error in the 'prepare' callback"); module_param(inject_trigger_err, bool, 0600); MODULE_PARM_DESC(inject_trigger_err, "Inject EINVAL error in the 'trigger' callback"); +module_param(inject_open_err, bool, 0600); +MODULE_PARM_DESC(inject_open_err, "Inject EBUSY error in the 'open' callback"); + struct pcmtst { struct snd_pcm *pcm; @@ -140,7 +144,8 @@ static inline void inc_buf_pos(struct pcmtst_buf_iter *v_iter, size_t by, size_t { v_iter->total_bytes += by; v_iter->buf_pos += by; - v_iter->buf_pos %= bytes; + if (v_iter->buf_pos >= bytes) + v_iter->buf_pos %= bytes; } /* @@ -196,10 +201,10 @@ static void check_buf_block_ni(struct pcmtst_buf_iter *v_iter, struct snd_pcm_ru u8 current_byte; for (i = 0; i < v_iter->b_rw; i++) { - current_byte = runtime->dma_area[buf_pos_n(v_iter, channels, i % channels)]; + ch_num = i % channels; + current_byte = runtime->dma_area[buf_pos_n(v_iter, channels, ch_num)]; if (!current_byte) break; - ch_num = i % channels; if (current_byte != patt_bufs[ch_num].buf[(v_iter->total_bytes / channels) % patt_bufs[ch_num].len]) { v_iter->is_buf_corrupted = true; @@ -239,7 +244,7 @@ static void fill_block_pattern_n(struct pcmtst_buf_iter *v_iter, struct snd_pcm_ for (i = 0; i < v_iter->b_rw; i++) { ch_num = i % channels; - runtime->dma_area[buf_pos_n(v_iter, channels, i % channels)] = + runtime->dma_area[buf_pos_n(v_iter, channels, ch_num)] = patt_bufs[ch_num].buf[(v_iter->total_bytes / channels) % patt_bufs[ch_num].len]; inc_buf_pos(v_iter, 1, runtime->dma_bytes); @@ -364,6 +369,9 @@ static int snd_pcmtst_pcm_open(struct snd_pcm_substream *substream) struct snd_pcm_runtime *runtime = substream->runtime; struct pcmtst_buf_iter *v_iter; + if (inject_open_err) + return -EBUSY; + v_iter = kzalloc(sizeof(*v_iter), GFP_KERNEL); if (!v_iter) return -ENOMEM; -- 2.34.1

2 2

[PATCH][next] selftests: ALSA: Fix fclose on an already fclosed file pointer
by Colin Ian King 13 Jul '23

13 Jul '23

In the case where a sysfs file cannot be opened the error return path fcloses file pointer fpl, however, fpl has already been closed in the previous stanza. Fix the double fclose by removing it. Fixes: 10b98a4db11a ("selftests: ALSA: Add test for the 'pcmtest' driver") Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- tools/testing/selftests/alsa/test-pcmtest-driver.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/testing/selftests/alsa/test-pcmtest-driver.c b/tools/testing/selftests/alsa/test-pcmtest-driver.c index 71931b240a83..357adc722cba 100644 --- a/tools/testing/selftests/alsa/test-pcmtest-driver.c +++ b/tools/testing/selftests/alsa/test-pcmtest-driver.c @@ -47,10 +47,8 @@ static int read_patterns(void) sprintf(pf, "/sys/kernel/debug/pcmtest/fill_pattern%d", i); fp = fopen(pf, "r"); - if (!fp) { - fclose(fpl); + if (!fp) return -1; - } fread(patterns[i].buf, 1, patterns[i].len, fp); fclose(fp); } -- 2.39.2

3 2