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

[PATCH v2 0/1] ASoC: soc-pcm.c: Make sure DAI parameters cleared if the DAI becomes inactive
by Chancel Liu 27 Nov '23

27 Nov '23

It's reasonable that DAI parameters should be cleared if current DAI becomes inactive. Only check DAI active status in soc_pcm_hw_free() is not enough since there's the risk that DAI parameters never be cleared if there're more than one stream [see A]. Only check DAI active status in soc_pcm_close() is also not enough since it will cause the cleanup just happening in soc_pcm_close() [see B]. [A] For example, we have stream1 and stream2 for DAI about to stop. stream2 executes soc_pcm_hw_free() before stream1 executes soc_pcm_close(). At the moment, stream2 should clear current DAI parameters because stream1 passed the cleanup stage in soc_pcm_hw_free() and stream2 in fact is the only active stream which has a chance to do clean up. Since DAI active status is not yet updated by stream1 in soc_pcm_close(), stream2 doesn't know itself should clear DAI parameters. In result both stream1 and stream2 don't clear the parameters. [B] Suppose a case: aplay -Dhw:0 44100.wav 48000.wav In this case, we call soc_pcm_open()->soc_pcm_hw_params()->soc_pcm_hw_free() ->soc_pcm_hw_params()->soc_pcm_hw_free()->soc_pcm_close() in order. The DAI parameters would be remained in the system even if the playback of 44100.wav is finished. In conclusion, it's better to check DAI active status in both soc_pcm_hw_free() and soc_pcm_close() which makes sure DAI parameters cleared if the DAI becomes inactive. changes in v2: - Patch v1 link: https://lore.kernel.org/all/20230112065834.580192-1-chancel.liu@nxp.com/ Patch v1 tries to introduce a usage count called hw_params_count to fix issue on DAI parameters cleanup. However it's not a good fix because not considering hw_params() and hw_free() are not symmetrical and hw_params() might be called multilpe times by user. - Both check DAI active status in soc_pcm_hw_free() and soc_pcm_close() which makes sure DAI parameters cleared if the DAI becomes inactive. Chancel Liu (1): ASoC: soc-pcm.c: Make sure DAI parameters cleared if the DAI becomes inactive sound/soc/soc-pcm.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) -- 2.25.1

3 4

[PATCH v3 0/3] Add audio device nodes for i.MX93 platform
by Chancel Liu 27 Nov '23

27 Nov '23

changes in v3 - drop unused compatible string in fsl,mqs.yaml changes in v2 - Move MQS device node under "/" root node - Convert fsl,mqs.txt to yaml Chancel Liu (3): arm64: dts: imx93: Add audio device nodes arm64: dts: imx93: Configure clock rate for audio PLL ASoC: dt-bindings: fsl,mqs: Convert format to json-schema .../devicetree/bindings/sound/fsl,mqs.txt | 36 ------ .../devicetree/bindings/sound/fsl,mqs.yaml | 105 ++++++++++++++++++ arch/arm64/boot/dts/freescale/imx93.dtsi | 89 +++++++++++++++ 3 files changed, 194 insertions(+), 36 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/fsl,mqs.txt create mode 100644 Documentation/devicetree/bindings/sound/fsl,mqs.yaml -- 2.42.0

3 6

[PATCH v7 resend 0/5] ASoC: makes CPU/Codec channel connection map more generic
by Kuninori Morimoto 27 Nov '23

27 Nov '23

Hi Mark Cc Bard, Pierre-Louis, Jerome, DT-ML This is v7 patch-set. 2 weeks past, this is resend patch-set. Current ASoC is supporting CPU/Codec = N:M (N < M) connection by using ch_map idea. This patch-set expands it that all connection uses this idea, and no longer N < M limit [1][2]. Link: https://lore.kernel.org/r/87fs6wuszr.wl-kuninori.morimoto.gx@renesas.com [1] Link: https://lore.kernel.org/r/878r7yqeo4.wl-kuninori.morimoto.gx@renesas.com [2] ASoC core code ([PATCH 1/5]) is same as v6 and it was tested by Pierre-Louis, and Jerome. Big change on v7 is basically for Audio-Graph-Card2. v6 -> v7 - use "endpoint" for N:M connection instead of ch-map-idx on Audio-Graph-Card2 v5 -> v6 - tidyup some warnings - rename "ch-map-idx" -> "channel-map-index" - Update "channel-map-index" description - add Tested-by from Pierre-Louis / Jerome v4 -> v5 - use cpu/codec index on ch_maps - separate card2 sample DT patch into prepare and new feature - ch-maps -> ch-map-idx on DT v3 -> v4 - add Jerome on To - add "description" on "ch-maps" v2 -> v3 - tidyup comment - use more clear connection image on DT - "ch_maps" -> "ch-maps" on DT - Add DT maintainer on "To:" for all patches v1 -> v2 - makes CPU/Codec connection relation clear on comment/sample - fixup type "connction" -> "connection" - makes error message clear Kuninori Morimoto (5): ASoC: makes CPU/Codec channel connection map more generic ASoC: audio-graph-card2: use better image for Multi connection ASoC: audio-graph-card2: add CPU:Codec = N:M support ASoC: audio-graph-card2-custom-sample: Add connection image ASoC: audio-graph-card2-custom-sample: add CPU/Codec = N:M sample include/sound/soc.h | 56 ++- .../audio-graph-card2-custom-sample.dtsi | 380 ++++++++++++++++-- sound/soc/generic/audio-graph-card2.c | 277 ++++++++++--- sound/soc/intel/boards/sof_sdw.c | 28 +- sound/soc/soc-core.c | 95 ++++- sound/soc/soc-dapm.c | 45 +-- sound/soc/soc-pcm.c | 44 +- 7 files changed, 754 insertions(+), 171 deletions(-) -- 2.25.1

1 5

[PATCH alsa-ucm-conf] chtrt5645: Add support for the components string
by Hans de Goede 26 Nov '23

26 Nov '23

Upcoming kernel versions will report which speaker and dmic config is used by the device in a components strings so that we don't need to duplicate the DMI quirks in both the kernel and the UCM profile. Add support for getting the speaker and dmic config from the components string. Note the old DMI matching is kept for support of older kernels, this means that on devices where the old DMI matching was used things like: Define.MonoSpeaker "Yes" Will now be done twice, this is harmless as long as the kernel and UCM profile DMI quirks are in sync, which they are. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- ucm2/Intel/chtrt5645/HiFi.conf | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/ucm2/Intel/chtrt5645/HiFi.conf b/ucm2/Intel/chtrt5645/HiFi.conf index 30fad50..f8dcbf5 100644 --- a/ucm2/Intel/chtrt5645/HiFi.conf +++ b/ucm2/Intel/chtrt5645/HiFi.conf @@ -2,6 +2,41 @@ Define.MonoSpeaker "" Define.AnalogMic "yes" Define.DigitalMic "" +If.components-dmic1 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:dmic1" + } + True { + Define.AnalogMic "" + Define.DigitalMic "DMIC1" + } +} + +If.components-dmic2 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:dmic2" + } + True { + Define.AnalogMic "" + Define.DigitalMic "DMIC2" + } +} + +If.components-mspk { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:1" + } + True { + Define.MonoSpeaker "yes" + } +} + If.cfg-dmic1 { Condition { Type RegexMatch -- 2.41.0

1 0

[PATCH 0/4] ASoC: SOF: ipc4: Add support for control change notification
by Peter Ujfalusi 25 Nov '23

25 Nov '23

Hi, This series adds support for handling control (switch/enum) change notifications sent by the firmware. The use case is similar to what is already used by IPC3 version: the firmware can update the value of an enum or switch and sends notification to the kernel, which in turn will notify the user space of a change. Regards, Peter --- Peter Ujfalusi (4): ASoC: SOF: ipc4-topology: Helper to find an swidget by module/instance id ASoC: SOF: ipc4: Add data struct for module notification message from firmware ASoC: SOF: ipc4-control: Implement control update for switch/enum controls ASoC: SOF: ipc4: Handle ALSA kcontrol change notification from firmware include/sound/sof/ipc4/header.h | 29 ++++++ sound/soc/sof/ipc4-control.c | 179 ++++++++++++++++++++++++++++++++ sound/soc/sof/ipc4-priv.h | 3 + sound/soc/sof/ipc4-topology.c | 20 ++++ sound/soc/sof/ipc4.c | 57 ++++++++++ 5 files changed, 288 insertions(+) -- 2.42.1

2 5

[PATCH 0/2] ASoC: SOF: Extend the enabled DSP core handling
by Peter Ujfalusi 25 Nov '23

25 Nov '23

Hi, In the current code, we enable a widget core when it is set up and disable it when it is freed. This is problematic with IPC4 because widget free is essentially a NOP and all widgets are freed in the firmware when the pipeline is deleted. This results in a crash during pipeline deletion when one of it's widgets is scheduled to run on a secondary core and is powered off when widget is freed. So, change the logic to enable all cores needed by all the modules in a pipeline when the pipeline widget is set up and disable them after the pipeline widget is freed. Regards, Peter --- Ranjani Sridharan (2): ASoC: SOF: ipc4-topology: Add core_mask in struct snd_sof_pipeline ASoC: SOF: sof-audio: Modify logic for enabling/disabling topology cores sound/soc/sof/ipc3-topology.c | 2 ++ sound/soc/sof/ipc4-topology.c | 9 +++++ sound/soc/sof/sof-audio.c | 65 ++++++++++++++++++++++------------- sound/soc/sof/sof-audio.h | 2 ++ 4 files changed, 54 insertions(+), 24 deletions(-) -- 2.42.1

2 3

[PATCH] ASoC: dt-bindings: correct white-spaces in examples
by Krzysztof Kozlowski 25 Nov '23

25 Nov '23

Use only one and exactly one space around '=' in DTS example. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- Cc: Neil Armstrong <neil.armstrong(a)linaro.org> --- .../devicetree/bindings/sound/nuvoton,nau8821.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml | 4 ++-- .../devicetree/bindings/sound/qcom,wcd938x-sdw.yaml | 4 ++-- Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml | 4 ++-- Documentation/devicetree/bindings/sound/renesas,rsnd.yaml | 8 ++++---- .../devicetree/bindings/sound/ti,tlv320aic32x4.yaml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/nuvoton,nau8821.yaml b/Documentation/devicetree/bindings/sound/nuvoton,nau8821.yaml index 3380b6aa9542..054b53954ac3 100644 --- a/Documentation/devicetree/bindings/sound/nuvoton,nau8821.yaml +++ b/Documentation/devicetree/bindings/sound/nuvoton,nau8821.yaml @@ -135,7 +135,7 @@ examples: nuvoton,jack-insert-debounce = <7>; nuvoton,jack-eject-debounce = <0>; nuvoton,dmic-clk-threshold = <3072000>; - nuvoton,dmic-slew-rate= <0>; + nuvoton,dmic-slew-rate = <0>; #sound-dai-cells = <0>; }; }; diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml b/Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml index 4df59f3b7b01..beb0ff0245b0 100644 --- a/Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml @@ -201,9 +201,9 @@ examples: - | codec@1,0{ compatible = "slim217,250"; - reg = <1 0>; + reg = <1 0>; reset-gpios = <&tlmm 64 0>; - slim-ifc-dev = <&wcd9340_ifd>; + slim-ifc-dev = <&wcd9340_ifd>; #sound-dai-cells = <1>; interrupt-parent = <&tlmm>; interrupts = <54 4>; diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd938x-sdw.yaml b/Documentation/devicetree/bindings/sound/qcom,wcd938x-sdw.yaml index b430dd3e1841..7b31bf93f1a1 100644 --- a/Documentation/devicetree/bindings/sound/qcom,wcd938x-sdw.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,wcd938x-sdw.yaml @@ -51,7 +51,7 @@ examples: reg = <0x03210000 0x2000>; wcd938x_rx: codec@0,4 { compatible = "sdw20217010d00"; - reg = <0 4>; + reg = <0 4>; qcom,rx-port-mapping = <1 2 3 4 5>; }; }; @@ -62,7 +62,7 @@ examples: reg = <0x03230000 0x2000>; wcd938x_tx: codec@0,3 { compatible = "sdw20217010d00"; - reg = <0 3>; + reg = <0 3>; qcom,tx-port-mapping = <2 3 4 5>; }; }; diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml b/Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml index 018565793a3e..adbfa67f88ed 100644 --- a/Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml @@ -137,7 +137,7 @@ examples: reg = <0x03210000 0x2000>; wcd938x_rx: codec@0,4 { compatible = "sdw20217010d00"; - reg = <0 4>; + reg = <0 4>; qcom,rx-port-mapping = <1 2 3 4 5>; }; }; @@ -148,7 +148,7 @@ examples: reg = <0x03230000 0x2000>; wcd938x_tx: codec@0,3 { compatible = "sdw20217010d00"; - reg = <0 3>; + reg = <0 3>; qcom,tx-port-mapping = <2 3 4 5>; }; }; diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml index 1174205286d4..0d7a6b576d88 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml @@ -497,19 +497,19 @@ examples: rcar_sound,dai { dai0 { playback = <&ssi5>, <&src5>; - capture = <&ssi6>; + capture = <&ssi6>; }; dai1 { playback = <&ssi3>; }; dai2 { - capture = <&ssi4>; + capture = <&ssi4>; }; dai3 { playback = <&ssi7>; }; dai4 { - capture = <&ssi8>; + capture = <&ssi8>; }; }; @@ -523,7 +523,7 @@ examples: frame-master = <&rsnd_endpoint0>; playback = <&ssi0>, <&src0>, <&dvc0>; - capture = <&ssi1>, <&src1>, <&dvc1>; + capture = <&ssi1>, <&src1>, <&dvc1>; }; }; }; diff --git a/Documentation/devicetree/bindings/sound/ti,tlv320aic32x4.yaml b/Documentation/devicetree/bindings/sound/ti,tlv320aic32x4.yaml index a7cc9aa34468..4783e6dbb5c4 100644 --- a/Documentation/devicetree/bindings/sound/ti,tlv320aic32x4.yaml +++ b/Documentation/devicetree/bindings/sound/ti,tlv320aic32x4.yaml @@ -90,7 +90,7 @@ examples: ldoin-supply = <&reg_3v3>; clocks = <&clks 201>; clock-names = "mclk"; - aic32x4-gpio-func= < + aic32x4-gpio-func = < 0xff /* AIC32X4_MFPX_DEFAULT_VALUE */ 0xff /* AIC32X4_MFPX_DEFAULT_VALUE */ 0x04 /* MFP3 AIC32X4_MFP3_GPIO_ENABLED */ -- 2.34.1

2 1

[PATCH] ASoC: Intel: sof_sdw: Always register the HDMI dai links
by Peter Ujfalusi 24 Nov '23

24 Nov '23

The topology files for SDW devices require HDMI dai links to be present and this is granted under normal conditions but in case of special use cases the display (i915) driver might not be enabled due to deny-listing, booting with nomodeset or just not compiled at all. This should not block the non HDMI audio to be usable so register the dai links unconditionally. The code has been prepared for this and in case of no HDMI audio the link is created with dummy codec. Closes: https://github.com/thesofproject/linux/issues/4594 Closes: https://github.com/thesofproject/linux/issues/4648 Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/intel/boards/sof_sdw.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 3312ad8a563b..4e4284729773 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -1546,7 +1546,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) { struct device *dev = card->dev; struct snd_soc_acpi_mach *mach = dev_get_platdata(card->dev); - int sdw_be_num = 0, ssp_num = 0, dmic_num = 0, hdmi_num = 0, bt_num = 0; + int sdw_be_num = 0, ssp_num = 0, dmic_num = 0, bt_num = 0; struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params; const struct snd_soc_acpi_link_adr *adr_link = mach_params->links; @@ -1564,6 +1564,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) char *codec_name, *codec_dai_name; int i, j, be_id = 0; int codec_index; + int hdmi_num; int ret; ret = get_dailink_info(dev, adr_link, &sdw_be_num, &codec_conf_num); @@ -1584,14 +1585,13 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) ssp_num = hweight_long(ssp_mask); } - if (mach_params->codec_mask & IDISP_CODEC_MASK) { + if (mach_params->codec_mask & IDISP_CODEC_MASK) ctx->hdmi.idisp_codec = true; - if (sof_sdw_quirk & SOF_SDW_TGL_HDMI) - hdmi_num = SOF_TGL_HDMI_COUNT; - else - hdmi_num = SOF_PRE_TGL_HDMI_COUNT; - } + if (sof_sdw_quirk & SOF_SDW_TGL_HDMI) + hdmi_num = SOF_TGL_HDMI_COUNT; + else + hdmi_num = SOF_PRE_TGL_HDMI_COUNT; /* enable dmic01 & dmic16k */ if (sof_sdw_quirk & SOF_SDW_PCH_DMIC || mach_params->dmic_num) @@ -1601,7 +1601,8 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) bt_num = 1; dev_dbg(dev, "sdw %d, ssp %d, dmic %d, hdmi %d, bt: %d\n", - sdw_be_num, ssp_num, dmic_num, hdmi_num, bt_num); + sdw_be_num, ssp_num, dmic_num, + ctx->hdmi.idisp_codec ? hdmi_num : 0, bt_num); /* allocate BE dailinks */ num_links = sdw_be_num + ssp_num + dmic_num + hdmi_num + bt_num; -- 2.42.1

2 1

[PATCH] ASoC: Intel: skl_hda_dsp_generic: Drop HDMI routes when HDMI is not available
by Peter Ujfalusi 24 Nov '23

24 Nov '23

When the HDMI is not present due to disabled display support we will use dummy codec and the HDMI routes will refer to non existent DAPM widgets. Trim the route list from the HDMI routes to be able to probe the card even if the HDMI dais are not registered. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c index 6c6ef63cd5d9..6e172719c979 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_generic.c +++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c @@ -154,6 +154,8 @@ static int skl_hda_fill_card_info(struct snd_soc_acpi_mach_params *mach_params) card->dapm_widgets = skl_hda_widgets; card->num_dapm_widgets = ARRAY_SIZE(skl_hda_widgets); if (!ctx->idisp_codec) { + card->dapm_routes = &skl_hda_map[IDISP_ROUTE_COUNT]; + num_route -= IDISP_ROUTE_COUNT; for (i = 0; i < IDISP_DAI_COUNT; i++) { skl_hda_be_dai_links[i].codecs = &snd_soc_dummy_dlc; skl_hda_be_dai_links[i].num_codecs = 1; -- 2.42.1

2 1

[PATCH v3 0/2] Introduce playback-only/capture-only DAI link flags
by Daniel Baluta 24 Nov '23

24 Nov '23

From: Daniel Baluta <daniel.baluta(a)nxp.com> This patchseries allows users to specify a link only direction with audio-graph-card2. Changes since v1 - https://lore.kernel.org/lkml/20230801082433.548206-1-daniel.baluta@oss.nxp.… - used audio-graph-card2 instead of simple-card as we are deprecting simple-card. Changes since v2: - Fix device tree binding error reported by Rob Daniel Baluta (2): ASoC: audio-graph-card2: Introduce playback-only/capture only DAI link flags ASoC: dt-bindings: audio-graph-port: Document new DAI link flags playback-only/capture-only .../bindings/sound/audio-graph-port.yaml | 6 ++++++ include/sound/simple_card_utils.h | 3 +++ sound/soc/generic/audio-graph-card2.c | 6 ++++++ sound/soc/generic/simple-card-utils.c | 19 +++++++++++++++++++ 4 files changed, 34 insertions(+) -- 2.25.1

2 3