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

[PATCH v2 1/2] ASoC: Intel: Skylake: skl-topology: Fix OOPs ib skl_tplg_complete
by Ricardo Ribalda 21 Jan '21

21 Jan '21

If dobj->control is not initialized we end up in an OOPs during skl_tplg_complete: [ 26.553358] BUG: kernel NULL pointer dereference, address: 0000000000000078 [ 26.561151] #PF: supervisor read access in kernel mode [ 26.566897] #PF: error_code(0x0000) - not-present page [ 26.572642] PGD 0 P4D 0 [ 26.575479] Oops: 0000 [#1] PREEMPT SMP PTI [ 26.580158] CPU: 2 PID: 2082 Comm: udevd Tainted: G C 5.4.81 #4 [ 26.588232] Hardware name: HP Soraka/Soraka, BIOS Google_Soraka.10431.106.0 12/03/2019 [ 26.597082] RIP: 0010:skl_tplg_complete+0x70/0x144 [snd_soc_skl] Fixes: 2d744ecf2b98 ("ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHL") Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- sound/soc/intel/skylake/skl-topology.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index ae466cd59292..1ef30ca45410 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -3619,15 +3619,16 @@ static void skl_tplg_complete(struct snd_soc_component *component) list_for_each_entry(dobj, &component->dobj_list, list) { struct snd_kcontrol *kcontrol = dobj->control.kcontrol; - struct soc_enum *se = - (struct soc_enum *)kcontrol->private_value; - char **texts = dobj->control.dtexts; + struct soc_enum *se; + char **texts; char chan_text[4]; - if (dobj->type != SND_SOC_DOBJ_ENUM || - dobj->control.kcontrol->put != - skl_tplg_multi_config_set_dmic) + if (dobj->type != SND_SOC_DOBJ_ENUM || !kcontrol || + kcontrol->put != skl_tplg_multi_config_set_dmic) continue; + + se = (struct soc_enum *)kcontrol->private_value; + texts = dobj->control.dtexts; sprintf(chan_text, "c%d", mach->mach_params.dmic_num); for (i = 0; i < se->items; i++) { -- 2.30.0.296.g2bfb1c46d8-goog

5 8

[PATCH] ASoC: rt5682: remove connection with LDO2 in DAPM graph
by shumingf＠realtek.com 21 Jan '21

21 Jan '21

From: Shuming Fan <shumingf(a)realtek.com> The application circuit shall provide MICVDD power. In default, the codec driver doesn't need to enable LDO2. In case, a board wants to use VBAT for micbias, it should add a DAPM route which IN1P connects with LDO2 in the machine driver. e.g. { "IN1P", NULL, "LDO2" }, Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt5682.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index 42ad5bea86b5..185906d6d4e0 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -1854,8 +1854,6 @@ static const struct snd_soc_dapm_route rt5682_dapm_routes[] = { {"CLKDET SYS", NULL, "CLKDET"}, - {"IN1P", NULL, "LDO2"}, - {"BST1 CBJ", NULL, "IN1P"}, {"RECMIX1L", "CBJ Switch", "BST1 CBJ"}, -- 2.29.0

2 1

[PATCH 0/5] Add KUNIT tests for ASoC topology
by Amadeusz Sławiński 21 Jan '21

21 Jan '21

This series adds unit tests for ASoC topology. First fix problems found when developing and running test cases and then add tests implementation. Tests themselves are quite simple and just call snd_soc_tplg_component_load() with various parameters and check the result. Tests themselves are described in more detail in commits adding them. Goal is to expand the amount of test cases in following patches. Prerequisity for this patchset are 2 patches which have already been sent: https://lore.kernel.org/alsa-devel/20210114163602.911205-1-amadeuszx.slawin… Description on how typical test case itself works: In order to load topology we need to have 3 things: card, codec component & platform component. In typical test case we register card and platform component and bind to dummy codec. There are of course execeptions, when we want to test behaviour of topology API when component or card is missing. Note that this is bit different from typical scenario (in SOF and skylake drivers) where card is registered by machine driver and component by platform driver, as we register both when setting up test. If you check the test case most of them have similar architecture of: 1. /* run test */ ret = snd_soc_register_card(&kunit_comp->card); if (ret != 0 && ret != -EPROBE_DEFER) KUNIT_FAIL(test, "Failed to register card"); 2. ret = snd_soc_component_initialize(&kunit_comp->comp, &test_component, test_dev); KUNIT_EXPECT_EQ(test, 0, ret); 3. ret = snd_soc_add_component(&kunit_comp->comp, NULL, 0); KUNIT_EXPECT_EQ(test, 0, ret); Ad. 1. First we register card, which in most tests returns -EPROBE_DEFER (from snd_soc_bind_card()), as platform component is not yet created. I test for both 0 and -EPROBE_DEFER, as it makes it easier to reshuffle this code around if needed and there is one test case which does it in different order. Ad. 2. Then we initialize platform component with structure pointing at proper probe function, which calls snd_soc_tplg_component_load() with test parameters and checks expected result. Ad. 3. And then in follow up we call snd_soc_add_component() which creates platform component for us and calls snd_soc_try_rebind_card() which if everything is bound properly calls previously set probe function. Amadeusz Sławiński (5): ASoC: topology: Properly unregister DAI on removal Revert "ASoC: soc-devres: add devm_snd_soc_register_dai()" ASoC: topology: KUnit: Add KUnit tests passing various arguments to snd_soc_tplg_component_load ASoC: topology: KUnit: Add KUnit tests passing empty topology with variants to snd_soc_tplg_component_load ASoC: topology: KUnit: Add KUnit tests passing topology with PCM to snd_soc_tplg_component_load include/sound/soc.h | 4 - sound/soc/Kconfig | 17 + sound/soc/Makefile | 5 + sound/soc/soc-devres.c | 37 -- sound/soc/soc-topology-test.c | 843 ++++++++++++++++++++++++++++++++++ sound/soc/soc-topology.c | 9 +- 6 files changed, 870 insertions(+), 45 deletions(-) create mode 100644 sound/soc/soc-topology-test.c -- 2.25.1

2 9

[PATCH 00/44] ASoC: sync parameter naming : rate / sample_bits
by Kuninori Morimoto 21 Jan '21

21 Jan '21

Hi Mark snd_pcm_runtime / snd_soc_dai / snd_soc_dai_driver / snd_soc_dai_link have related parameter which is similar but not same naming. struct snd_pcm_runtime { ... (A) unsigned int rate; ... (B) unsigned int sample_bits; ... }; struct snd_soc_dai { ... (A) unsigned int rate; (B) unsigned int sample_bits; ... }; struct snd_soc_dai_driver { ... (A) unsigned int symmetric_rates:1; (B) unsigned int symmetric_samplebits:1; ... }; struct snd_soc_dai_link { ... (A) unsigned int symmetric_rates:1; (B) unsigned int symmetric_samplebits:1; ... }; Because it is similar but not same naming rule, code can be verbose / can't share macro. This patch-set sync naming rule to struct snd_pcm_runtime base. - xxx_rates; + xxx_rate; - xxx_samplebits; + xxx_sample_bits; Kuninori Morimoto (44): ASoC: soc-pcm: revert soc_pcm_apply_symmetry() ASoC: sync parameter naming : rate / sample_bits ASoC: adi: sync parameter naming (rate/sample_bits) ASoC: atmel: sync parameter naming (rate/sample_bits) ASoC: au1x: sync parameter naming (rate/sample_bits) ASoC: bcm: sync parameter naming (rate/sample_bits) ASoC: cirrus: sync parameter naming (rate/sample_bits) ASoC: tegra: sync parameter naming (rate/sample_bits) ASoC: rockchip: sync parameter naming (rate/sample_bits) ASoC: samsung: sync parameter naming (rate/sample_bits) ASoC: sh: sync parameter naming (rate/sample_bits) ASoC: ti: sync parameter naming (rate/sample_bits) ASoC: pxa: sync parameter naming (rate/sample_bits) ASoC: mediatek: sync parameter naming (rate/sample_bits) ASoC: fsl: sync parameter naming (rate/sample_bits) ASoC: wm*: sync parameter naming (rate/sample_bits) ASoC: tlv*: sync parameter naming (rate/sample_bits) ASoC: rt*: sync parameter naming (rate/sample_bits) ASoC: nau*: sync parameter naming (rate/sample_bits) ASoC: tas*: sync parameter naming (rate/sample_bits) ASoC: da*: sync parameter naming (rate/sample_bits) ASoC: es*: sync parameter naming (rate/sample_bits) ASoC: max*: sync parameter naming (rate/sample_bits) ASoC: cs*: sync parameter naming (rate/sample_bits) ASoC: tscs*: sync parameter naming (rate/sample_bits) ASoC: ak*: sync parameter naming (rate/sample_bits) ASoC: adau*: sync parameter naming (rate/sample_bits) ASoC: jz4740: sync parameter naming (rate/sample_bits) ASoC: sunxi: sync parameter naming (rate/sample_bits) ASoC: zl38060: sync parameter naming (rate/sample_bits) ASoC: ssm2602: sync parameter naming (rate/sample_bits) ASoC: sgtl5000: sync parameter naming (rate/sample_bits) ASoC: mc13783: sync parameter naming (rate/sample_bits) ASoC: mt6660: sync parameter naming (rate/sample_bits) ASoC: lochnagar-sc: sync parameter naming (rate/sample_bits) ASoC: ab8500: sync parameter naming (rate/sample_bits) ASoC: alc5632: sync parameter naming (rate/sample_bits) ASoC: cx2072x: sync parameter naming (rate/sample_bits) ASoC: inno_rk3036: sync parameter naming (rate/sample_bits) ASoC: lm49453: sync parameter naming (rate/sample_bits) ASoC: ml26124: sync parameter naming (rate/sample_bits) ASoC: soc-dai.h: remove symmetric_rates/samplebits ASoC: soc-pcm: cleanup soc_pcm_apply_symmetry() ASoC: soc-pcm: cleanup soc_pcm_params_symmetry() include/sound/soc-dai.h | 4 +- include/sound/soc.h | 4 +- sound/soc/adi/axi-i2s.c | 2 +- sound/soc/atmel/atmel-i2s.c | 2 +- sound/soc/atmel/mchp-i2s-mcc.c | 4 +- sound/soc/au1x/i2sc.c | 2 +- sound/soc/bcm/bcm2835-i2s.c | 4 +- sound/soc/bcm/bcm63xx-i2s-whistler.c | 2 +- sound/soc/cirrus/ep93xx-i2s.c | 2 +- sound/soc/codecs/ab8500-codec.c | 4 +- sound/soc/codecs/adau1372.c | 2 +- sound/soc/codecs/adau1373.c | 6 +- sound/soc/codecs/adau1701.c | 2 +- sound/soc/codecs/ak4554.c | 2 +- sound/soc/codecs/ak4613.c | 2 +- sound/soc/codecs/ak4641.c | 4 +- sound/soc/codecs/ak4642.c | 2 +- sound/soc/codecs/alc5632.c | 2 +- sound/soc/codecs/cs35l32.c | 2 +- sound/soc/codecs/cs35l33.c | 2 +- sound/soc/codecs/cs35l34.c | 2 +- sound/soc/codecs/cs35l35.c | 2 +- sound/soc/codecs/cs35l36.c | 2 +- sound/soc/codecs/cs4234.c | 2 +- sound/soc/codecs/cs4271.c | 2 +- sound/soc/codecs/cs42l73.c | 6 +- sound/soc/codecs/cs43130.c | 6 +- sound/soc/codecs/cs4341.c | 2 +- sound/soc/codecs/cs4349.c | 2 +- sound/soc/codecs/cs47l15.c | 12 ++-- sound/soc/codecs/cs47l24.c | 12 ++-- sound/soc/codecs/cs47l35.c | 12 ++-- sound/soc/codecs/cs47l85.c | 16 ++--- sound/soc/codecs/cs47l90.c | 16 ++--- sound/soc/codecs/cs47l92.c | 12 ++-- sound/soc/codecs/cs53l30.c | 2 +- sound/soc/codecs/cx2072x.c | 2 +- sound/soc/codecs/da7210.c | 2 +- sound/soc/codecs/da7213.c | 2 +- sound/soc/codecs/da7218.c | 4 +- sound/soc/codecs/da7219.c | 4 +- sound/soc/codecs/da9055.c | 2 +- sound/soc/codecs/es8316.c | 2 +- sound/soc/codecs/es8328.c | 2 +- sound/soc/codecs/inno_rk3036.c | 2 +- sound/soc/codecs/jz4740.c | 2 +- sound/soc/codecs/lm49453.c | 2 +- sound/soc/codecs/lochnagar-sc.c | 12 ++-- sound/soc/codecs/max9860.c | 2 +- sound/soc/codecs/max9867.c | 2 +- sound/soc/codecs/mc13783.c | 2 +- sound/soc/codecs/ml26124.c | 2 +- sound/soc/codecs/mt6660.c | 4 +- sound/soc/codecs/nau8810.c | 2 +- sound/soc/codecs/nau8822.c | 2 +- sound/soc/codecs/rt274.c | 2 +- sound/soc/codecs/rt286.c | 4 +- sound/soc/codecs/rt298.c | 4 +- sound/soc/codecs/rt5670.c | 4 +- sound/soc/codecs/sgtl5000.c | 2 +- sound/soc/codecs/ssm2602.c | 4 +- sound/soc/codecs/tas2764.c | 2 +- sound/soc/codecs/tas2770.c | 2 +- sound/soc/codecs/tlv320adcx140.c | 2 +- sound/soc/codecs/tlv320aic31xx.c | 4 +- sound/soc/codecs/tlv320aic32x4.c | 2 +- sound/soc/codecs/tlv320aic3x.c | 2 +- sound/soc/codecs/tscs42xx.c | 4 +- sound/soc/codecs/tscs454.c | 12 ++-- sound/soc/codecs/wm5102.c | 12 ++-- sound/soc/codecs/wm5110.c | 12 ++-- sound/soc/codecs/wm8510.c | 2 +- sound/soc/codecs/wm8731.c | 2 +- sound/soc/codecs/wm8770.c | 2 +- sound/soc/codecs/wm8804.c | 2 +- sound/soc/codecs/wm8903.c | 2 +- sound/soc/codecs/wm8904.c | 2 +- sound/soc/codecs/wm8940.c | 2 +- sound/soc/codecs/wm8960.c | 2 +- sound/soc/codecs/wm8962.c | 2 +- sound/soc/codecs/wm8974.c | 2 +- sound/soc/codecs/wm8978.c | 2 +- sound/soc/codecs/wm8983.c | 2 +- sound/soc/codecs/wm8985.c | 2 +- sound/soc/codecs/wm8988.c | 2 +- sound/soc/codecs/wm8993.c | 2 +- sound/soc/codecs/wm8994.c | 4 +- sound/soc/codecs/wm8997.c | 8 +-- sound/soc/codecs/wm8998.c | 12 ++-- sound/soc/codecs/wm9713.c | 2 +- sound/soc/codecs/zl38060.c | 4 +- sound/soc/fsl/fsl_esai.c | 4 +- sound/soc/fsl/fsl_sai.c | 8 +-- sound/soc/fsl/fsl_ssi.c | 4 +- sound/soc/jz4740/jz4740-i2s.c | 2 +- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 10 +-- sound/soc/mediatek/mt6797/mt6797-dai-pcm.c | 8 +-- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 2 +- sound/soc/mediatek/mt8183/mt8183-dai-pcm.c | 8 +-- sound/soc/mediatek/mt8192/mt8192-dai-pcm.c | 8 +-- sound/soc/pxa/pxa2xx-i2s.c | 2 +- sound/soc/rockchip/rockchip_i2s.c | 4 +- sound/soc/rockchip/rockchip_pdm.c | 2 +- sound/soc/samsung/i2s.c | 2 +- sound/soc/samsung/pcm.c | 2 +- sound/soc/sh/rcar/core.c | 4 +- sound/soc/soc-pcm.c | 80 +++++++--------------- sound/soc/soc-topology.c | 8 +-- sound/soc/sunxi/sun4i-i2s.c | 2 +- sound/soc/sunxi/sun8i-codec.c | 12 ++-- sound/soc/tegra/tegra186_dspk.c | 2 +- sound/soc/tegra/tegra20_i2s.c | 2 +- sound/soc/tegra/tegra210_dmic.c | 2 +- sound/soc/tegra/tegra210_i2s.c | 2 +- sound/soc/tegra/tegra30_i2s.c | 2 +- sound/soc/ti/davinci-mcasp.c | 2 +- 116 files changed, 253 insertions(+), 283 deletions(-) -- 2.25.1

2 45

[PATCH 0/2] Add sanity checks for topology API calls
by Amadeusz Sławiński 21 Jan '21

21 Jan '21

Topology API exposes just 2 function calls, to load and unload topology. This adds sanity checks to make sure that it behaves well when some of parameters are set incoorectly or not needed. This makes developer live easier by failing early instead of proceeding on and then failing in unexpected ways. As loading and unloading topology usually happens one the overhead of additional checks should be negligible. Amadeusz Sławiński (2): ASoC: topology: Ensure that needed parameters are set ASoC: topology: Check if ops is set before dereference sound/soc/soc-topology.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) -- 2.25.1

2 3

[RESEND PATCH v6 0/6] Tegra210 audio graph card
by Sameer Pujar 21 Jan '21

21 Jan '21

This series adds audio graph based sound card support for Tegra210 platforms like Jetson-TX1 an Jetson-Nano. The following preparatory audio graph enhancement series is already merged. * https://patchwork.kernel.org/project/alsa-devel/list/?series=375629&state=* Following are the summary of changes: * Add graph/audio-graph based schemas or schema updates for Tegra210 component and machine drivers. * Add Tegra audio graph machine driver. * Add required DT support for Jetson-TX1/Nano. This work is based on earlier discussion of DPCM usage for Tegra and simple card driver updates. * https://lkml.org/lkml/2020/4/30/519 * https://lkml.org/lkml/2020/6/27/4 Original v6 series was sent about 6-7 weeks back. The dependency commit, https://lore.kernel.org/alsa-devel/1610948585-16286-1-git-send-email-spujar… is now merged. Resending this now to appear in the top of the mail list. Changelog ========= v5 -> v6 -------- * Added ports or port description in YAML docs for Tegra AHUB devices and graph card in patch 1/6 and 2/6. Reference of audio-graph-port.yaml is used for AHUB devices. * Dropped redundant NULL check return for of_device_get_match_data() in patch 3/6. * Added 'Reviewed-by' tag from Jon Hunter. * No changes in remaining patches. v4 -> v5 -------- * Audio graph related changes were sent in separate v5 series as mentioned above and are dropped from current series. * Graph and audio graph doc patches are dropped from this series and are sent separately as mentioned above. * Minor change with phandle label for TX1 and Nano platform DT files. * No changes in other patches. v3 -> v4 -------- * Added new patches to convert graph.txt and audio-graph-card.txt to corresponding json-schema files. Later these references are used in Tegra audio graph schema. * AHUB component binding docs are updated to reflect the usage of ports/port/endpoint * More common stuff is moved into graph_parse_of() and this is used by both generic and Tegra audio graph. * DT binding for Tegra audio graph is updated to included "ports { }" * As per the suggestion 'void *data' member is dropped from 'asoc_simple_priv' and instead container method is used to maintain required custom data internal to Tegra audio graph. v2 -> v3 -------- * Dropped new compatible addition in generic graph driver after reviewing it with Morimoto-san. Instead added Tegra audio graph driver and new compatibles are added in the same. * Added new patches to expose new members for customization in audio graph driver. * Added new patch for Tegra audio graph driver and related documentation. * Minor change in below commit where mutex version of helper is used "ASoC: audio-graph: Identify 'no_pcm' DAI links for DPCM" * DT binding is updated to use the newly exposed compatibles * No changes in other patches v1 -> v2 -------- * Re-organized ports/endpoints description for ADMAIF and XBAR. Updated DT patches accordingly. * After above change, multiple Codec endpoint support is not required and hence dropped for now. This will be considered separately if at all required in future. * Re-ordered patches in the series. Sameer Pujar (6): ASoC: dt-bindings: tegra: Add graph bindings ASoC: dt-bindings: tegra: Add json-schema for Tegra audio graph card ASoC: tegra: Add audio graph based card driver arm64: defconfig: Enable Tegra audio graph card driver arm64: tegra: Audio graph header for Tegra210 arm64: tegra: Audio graph sound card for Jetson Nano and TX1 .../sound/nvidia,tegra-audio-graph-card.yaml | 187 +++++++++++++++ .../bindings/sound/nvidia,tegra186-dspk.yaml | 18 +- .../bindings/sound/nvidia,tegra210-admaif.yaml | 13 +- .../bindings/sound/nvidia,tegra210-ahub.yaml | 13 +- .../bindings/sound/nvidia,tegra210-dmic.yaml | 18 +- .../bindings/sound/nvidia,tegra210-i2s.yaml | 18 +- .../boot/dts/nvidia/tegra210-audio-graph.dtsi | 153 ++++++++++++ arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 262 +++++++++++++++++++++ arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 146 ++++++++++++ arch/arm64/configs/defconfig | 1 + sound/soc/tegra/Kconfig | 9 + sound/soc/tegra/Makefile | 2 + sound/soc/tegra/tegra_audio_graph_card.c | 251 ++++++++++++++++++++ 13 files changed, 1085 insertions(+), 6 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-graph-card.yaml create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-audio-graph.dtsi create mode 100644 sound/soc/tegra/tegra_audio_graph_card.c -- 2.7.4

3 15

[PATCH v3 1/2] ASoC: Intel: Skylake: skl-topology: Fix OOPs ib skl_tplg_complete
by Ricardo Ribalda 21 Jan '21

21 Jan '21

If dobj->control is not initialized we end up in an OOPs during skl_tplg_complete: [ 26.553358] BUG: kernel NULL pointer dereference, address: 0000000000000078 [ 26.561151] #PF: supervisor read access in kernel mode [ 26.566897] #PF: error_code(0x0000) - not-present page [ 26.572642] PGD 0 P4D 0 [ 26.575479] Oops: 0000 [#1] PREEMPT SMP PTI [ 26.580158] CPU: 2 PID: 2082 Comm: udevd Tainted: G C 5.4.81 #4 [ 26.588232] Hardware name: HP Soraka/Soraka, BIOS Google_Soraka.10431.106.0 12/03/2019 [ 26.597082] RIP: 0010:skl_tplg_complete+0x70/0x144 [snd_soc_skl] Cc: <stable(a)vger.kernel.org> Fixes: 2d744ecf2b98 ("ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHL") Tested-by: Lukasz Majczak <lma(a)semihalf.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Reviewed-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- v3: order local variables by length sound/soc/intel/skylake/skl-topology.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index ae466cd59292..ffd37aaecdf1 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -3619,15 +3619,16 @@ static void skl_tplg_complete(struct snd_soc_component *component) list_for_each_entry(dobj, &component->dobj_list, list) { struct snd_kcontrol *kcontrol = dobj->control.kcontrol; - struct soc_enum *se = - (struct soc_enum *)kcontrol->private_value; - char **texts = dobj->control.dtexts; + struct soc_enum *se; char chan_text[4]; + char **texts; - if (dobj->type != SND_SOC_DOBJ_ENUM || - dobj->control.kcontrol->put != - skl_tplg_multi_config_set_dmic) + if (dobj->type != SND_SOC_DOBJ_ENUM || !kcontrol || + kcontrol->put != skl_tplg_multi_config_set_dmic) continue; + + se = (struct soc_enum *)kcontrol->private_value; + texts = dobj->control.dtexts; sprintf(chan_text, "c%d", mach->mach_params.dmic_num); for (i = 0; i < se->items; i++) { -- 2.30.0.296.g2bfb1c46d8-goog

1 1

pcm: pcm_ioplug - fix the avail_update mmap capture copy issue
by GitHub pull_request - opened 21 Jan '21

21 Jan '21

alsa-project/alsa-lib pull request #115 was opened from perexg: It seems that the commit "pcm: ioplug: Transfer all available data" introduced new regressions (wrong memory access). The second issue is that the avail_update in ioplug does not move appl_ptr nor hw_ptr, so it's possible that the transfers may be repetitive. This patch moves the transfer calls to mmap_begin callback where it should be. The pointer wraps are handled by design now. Fixes: 1714332719 ("pcm: ioplug: Transfer all available data") BugLink: https://github.com/alsa-project/alsa-lib/pull/103 Request URL : https://github.com/alsa-project/alsa-lib/pull/115 Patch URL : https://github.com/alsa-project/alsa-lib/pull/115.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[RFC][PATCH v4 0/4] design a way to change audio Jack state by software
by Hui Wang 21 Jan '21

21 Jan '21

the changes in the v4: - change the sound-core to sound and change the sound_core_debugfs_root to sound_debugfs_root in the 0001-xxx.patch - change kzalloc/kfree to kvzalloc/kvfree in the debugfs fops for 0001-xxx.patch and 0003-xxx.patch - And if needed, I could squash 4 patches into 1 patch before merging. the changes in the v3 (for easy to review, divide change into 4 patches): - address the comment about the snd_jack_report() and _snd_jack_report(), the v2 design is hard to understand and is hard to review, in the v3, separate the jack_report to snd_jack_report() and snd_jack_inject_report(), hw jack events call snd_jack_report() as before, if a jack contains multi jack_kctl and the jack_kctl's sw_inject is enabled, the status and the related input-dev's events will not be reproted. The injection events call snd_jack_inject_report(). This change is squashed to 0001-xxx.patch, the rest part of 0001-xxx.patch is same as v2. - address the comment about folders'name in the 0002-xxx.patch, so far, drop the '/', ',', '=' and ' ' from the folders' name. - address the comment about adding more debugfs nodes in the 0003-xxx.patch, it adds kctl_id, mask_bits, status and type. - address the comment about save-n-restore jack's hw status in the 0004-xxx.patch, adding a hw_status_cache and save the last reported jack hw event, once the sw_inject is disabled, will restore all jack_kctl's state under the same snd_jack with hw_status_cache. [snip] the changes in the V2: - using debugfs instead of sysfs - using jack_ctrl to create a folder instead of snd_jack, since ASoC drivers could create multi jack_ctrls within a snd_jack - create a folder for each jack_ctrl instead for all jack_ctrls [ snip ] Hui Wang (4): alsa: jack: implement software jack injection via debugfs alsa: jack: adjust jack_kctl debugfs folder's name alsa: jack: add more jack_kctl debugfs nodes alsa: jack: implement save-and-restore for jack's hw status include/sound/core.h | 2 + include/sound/jack.h | 1 + sound/core/init.c | 7 + sound/core/jack.c | 352 ++++++++++++++++++++++++++++++++++++++++++- sound/core/sound.c | 8 + 5 files changed, 366 insertions(+), 4 deletions(-) -- 2.25.1

2 10

[PATCH] ALSA: control: remove limitation on the number of user-defined control element set per card
by Takashi Sakamoto 21 Jan '21

21 Jan '21

ALSA control core allows usespace application to register control element set by call of ioctl(2) with SNDRV_CTL_IOCTL_ELEM_ADD request. The added control element set is called as 'user-defined'. Currently sound card has limitation on the number of the user-defined control element set up to 32. The limitation is inconvenient to drivers in ALSA firewire stack since the drivers expect userspace applications to implement function to control device functionalities such as mixing and routing. As the userspace application, snd-firewire-ctl-services project starts: https://github.com/alsa-project/snd-firewire-ctl-services/ The project supports many devices supported by ALSA firewire stack. The limitation is mostly good since routing and mixing controls can be represented by control element set, which includes control element with the same parameters. Nevertheless, it's actually inconvenient to device which has many varied functionalities. For example, plugin effect such as channel strip and reverb has many parameters. For the case, many control elements are required to configure the parameters and control element set cannot aggregates controls for the parameters. At present, below models are implemented with the control elements and actually add control element sets over 32: * Apogee Emsemble (snd-bebob-ctl-service) * TC Electronic Konnekt 24d (snd-dice-ctl-service) * TC Electronic Studio Konnekt 48 (snd-dice-ctl-service) * TC Electronic Konnekt Live (snd-dice-ctl-service) * TC Electronic Impact Twin (snd-dice-ctl-service) It could be investigated to increase the number; e.g. quadruple to the current (=128), however it's hard to find criteria about the number for existent sound card. This commit just removes the limitation for the reason. ALSA control core uses UINT_MAX as the maximum number of control elements added to a sound card. It's limitation for both in-kernel driver and userspace application. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- include/sound/core.h | 1 - sound/core/control.c | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/include/sound/core.h b/include/sound/core.h index 0462c577d7a3..6b443ce0acf8 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -100,7 +100,6 @@ struct snd_card { struct rw_semaphore controls_rwsem; /* controls list lock */ rwlock_t ctl_files_rwlock; /* ctl_files list lock */ int controls_count; /* count of all controls */ - int user_ctl_count; /* count of all user controls */ struct list_head controls; /* all controls for this card */ struct list_head ctl_files; /* active control files */ diff --git a/sound/core/control.c b/sound/core/control.c index 5165741a8400..1bcef22713f4 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -18,8 +18,6 @@ #include <sound/info.h> #include <sound/control.h> -/* max number of user-defined controls */ -#define MAX_USER_CONTROLS 32 #define MAX_CONTROL_COUNT 1028 struct snd_kctl_ioctl { @@ -539,7 +537,6 @@ static int snd_ctl_remove_user_ctl(struct snd_ctl_file * file, ret = snd_ctl_remove(card, kctl); if (ret < 0) goto error; - card->user_ctl_count--; error: up_write(&card->controls_rwsem); return ret; @@ -1435,13 +1432,6 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, return err; } - /* - * The number of userspace controls are counted control by control, - * not element by element. - */ - if (card->user_ctl_count + 1 > MAX_USER_CONTROLS) - return -ENOMEM; - /* Check the number of elements for this userspace control. */ count = info->owner; if (count == 0) @@ -1534,9 +1524,6 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, * applications because the field originally means PID of a process * which locks the element. */ - - card->user_ctl_count++; - unlock: up_write(&card->controls_rwsem); return err; -- 2.27.0

3 3