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

[PATCH v2 0/2] ASoC: codec: lpass-va: add npl clock support
by Srinivas Kandagatla 24 Dec '22

24 Dec '22

New versions of VA Macro has soundwire integrated, so handle the soundwire npl clock correctly in the codec driver and add related bindings. Changes since v1: - updated bindings as per Kryz comments. - added error handling during npl and mclk enable. Srinivas Kandagatla (2): ASoC: dt-bindings: lpass-va: add npl clock for new VA macro ASoC: codecs: va-macro: add npl clk .../bindings/sound/qcom,lpass-va-macro.yaml | 63 ++++++++++++++++--- sound/soc/codecs/lpass-va-macro.c | 46 ++++++++++++++ 2 files changed, 101 insertions(+), 8 deletions(-) -- 2.25.1

2 5

[PATCH 1/3] ASoC: dt-bindings: fsl-sai: Fix mx6ul and mx7d compatible strings
by Marek Vasut 08 Dec '22

08 Dec '22

Describe existing used combinations of compatible strings on MX6UL and MX7D, which are backward compatible with MX6SX. Add the missing imx7d-sai compatible string which is used on i.MX7 . Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt(a)linaro.org> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Nicolin Chen <nicoleotsuka(a)gmail.com> Cc: Rob Herring <robh+dt(a)kernel.org> Cc: Shengjiu Wang <shengjiu.wang(a)gmail.com> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Xiubo Li <Xiubo.Lee(a)gmail.com> Cc: alsa-devel(a)alsa-project.org To: devicetree(a)vger.kernel.org --- .../devicetree/bindings/sound/fsl,sai.yaml | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/fsl,sai.yaml b/Documentation/devicetree/bindings/sound/fsl,sai.yaml index 11aab891288d2..05bad828cc353 100644 --- a/Documentation/devicetree/bindings/sound/fsl,sai.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,sai.yaml @@ -18,15 +18,12 @@ description: | properties: compatible: oneOf: - - enum: - - fsl,vf610-sai - - fsl,imx6sx-sai - - fsl,imx6ul-sai - - fsl,imx7ulp-sai - - fsl,imx8mq-sai - - fsl,imx8qm-sai - - fsl,imx8ulp-sai - - fsl,imx93-sai + - items: + - enum: + - fsl,imx6ul-sai + - fsl,imx7d-sai + - const: fsl,imx6sx-sai + - items: - enum: - fsl,imx8mm-sai @@ -34,6 +31,15 @@ properties: - fsl,imx8mp-sai - const: fsl,imx8mq-sai + - items: + - enum: + - fsl,imx6sx-sai + - fsl,imx7ulp-sai + - fsl,imx8mq-sai + - fsl,imx8qm-sai + - fsl,imx8ulp-sai + - fsl,vf610-sai + reg: maxItems: 1 -- 2.35.1

3 8

[PATCH] ASoC: soc-pcm.c: Clear DAIs parameters after stream_active is updated
by Chancel Liu 07 Dec '22

07 Dec '22

DAIs parameters should be cleared if there's no active stream. Before, we implemented it in soc_pcm_hw_free() by detecting stream_active. If the running stream is the last active stream, we're going to clear parameters. However it will cause DAIs parameters never be cleared if there're more than one stream. For example, we have stream1 and stream2 about to stop. stream2 executes soc_pcm_hw_free() before stream1 executes soc_pcm_close(). At the moment, stream2 should clear DAIs parameters. Since stream_active is not yet updated by stream1 in soc_pcm_close(), stream2 will not clear DAIs parameters. In result both stream1 and stream2 don't clear the parameters. This patch moves DAIs parameters cleanup after stream_active is updated. Signed-off-by: Chancel Liu <chancel.liu(a)nxp.com> --- sound/soc/soc-pcm.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index fb87d6d23408..85a7f0a3eb70 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -709,8 +709,17 @@ static int soc_pcm_clean(struct snd_soc_pcm_runtime *rtd, snd_soc_dpcm_mutex_assert_held(rtd); - if (!rollback) + if (!rollback) { snd_soc_runtime_deactivate(rtd, substream->stream); + /* clear the corresponding DAIs parameters when going to be inactive */ + for_each_rtd_dais(rtd, i, dai) { + if (snd_soc_dai_active(dai) == 0) + soc_pcm_set_dai_params(dai, NULL); + + if (snd_soc_dai_stream_active(dai, substream->stream) == 0) + snd_soc_dai_digital_mute(dai, 1, substream->stream); + } + } for_each_rtd_dais(rtd, i, dai) snd_soc_dai_shutdown(dai, substream, rollback); @@ -945,15 +954,6 @@ static int soc_pcm_hw_clean(struct snd_soc_pcm_runtime *rtd, snd_soc_dpcm_mutex_assert_held(rtd); - /* clear the corresponding DAIs parameters when going to be inactive */ - for_each_rtd_dais(rtd, i, dai) { - if (snd_soc_dai_active(dai) == 1) - soc_pcm_set_dai_params(dai, NULL); - - if (snd_soc_dai_stream_active(dai, substream->stream) == 1) - snd_soc_dai_digital_mute(dai, 1, substream->stream); - } - /* run the stream event */ snd_soc_dapm_stream_stop(rtd, substream->stream); -- 2.25.1

2 1

[PATCH 0/4] Make QMI message rules const
by Jeff Johnson 07 Dec '22

07 Dec '22

Change ff6d365898d ("soc: qcom: qmi: use const for struct qmi_elem_info") allows QMI message encoding/decoding rules to be const. So now update the definitions in the various client to take advantage of this. Patches for ath10k and ath11k were perviously sent separately. This series depends upon: https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git/commit/?h=fo… This is in the for-next banch of: git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git Hence this series is also based upon that tree/branch. Jeff Johnson (4): net: ipa: Make QMI message rules const remoteproc: sysmon: Make QMI message rules const slimbus: qcom-ngd-ctrl: Make QMI message rules const soc: qcom: pdr: Make QMI message rules const drivers/net/ipa/ipa_qmi_msg.c | 20 ++++++++++---------- drivers/net/ipa/ipa_qmi_msg.h | 20 ++++++++++---------- drivers/remoteproc/qcom_sysmon.c | 8 ++++---- drivers/slimbus/qcom-ngd-ctrl.c | 8 ++++---- drivers/soc/qcom/pdr_internal.h | 20 ++++++++++---------- 5 files changed, 38 insertions(+), 38 deletions(-) -- 2.37.0

4 17

[PATCH v2] arm64: dts: qcom: sc7280: Remove unused sleep pin control nodes
by Srinivasa Rao Mandadapu 06 Dec '22

06 Dec '22

Remove unused and redundant sleep pin control entries as they are not referenced anywhere in sc7280 based platform's device tree variants. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> --- Chnges Since v1: -- Update subject prefixes and commit message. .../qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi | 8 ----- .../dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi | 20 ----------- arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 20 ----------- arch/arm64/boot/dts/qcom/sc7280.dtsi | 40 ---------------------- 4 files changed, 88 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi index cf34334..1ca11a1 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi @@ -148,10 +148,6 @@ hp_i2c: &i2c2 { bias-disable; }; -&lpass_dmic01_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic01_data { bias-pull-down; }; @@ -161,10 +157,6 @@ hp_i2c: &i2c2 { bias-disable; }; -&lpass_dmic23_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic23_data { bias-pull-down; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi index c72e53a..ae25520 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi @@ -167,10 +167,6 @@ bias-disable; }; -&lpass_dmic01_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic01_data { bias-pull-down; }; @@ -180,10 +176,6 @@ bias-disable; }; -&lpass_dmic23_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic23_data { bias-pull-down; }; @@ -194,30 +186,18 @@ bias-disable; }; -&lpass_rx_swr_clk_sleep { - bias-pull-down; -}; - &lpass_rx_swr_data { drive-strength = <2>; slew-rate = <1>; bias-bus-hold; }; -&lpass_rx_swr_data_sleep { - bias-pull-down; -}; - &lpass_tx_swr_clk { drive-strength = <2>; slew-rate = <1>; bias-disable; }; -&lpass_tx_swr_clk_sleep { - bias-pull-down; -}; - &lpass_tx_swr_data { drive-strength = <2>; slew-rate = <1>; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi index 8ca2281..f7efb99 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -576,10 +576,6 @@ bias-disable; }; -&lpass_dmic01_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic01_data { bias-pull-down; }; @@ -589,10 +585,6 @@ bias-disable; }; -&lpass_dmic23_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic23_data { bias-pull-down; }; @@ -603,30 +595,18 @@ bias-disable; }; -&lpass_rx_swr_clk_sleep { - bias-pull-down; -}; - &lpass_rx_swr_data { drive-strength = <2>; slew-rate = <1>; bias-bus-hold; }; -&lpass_rx_swr_data_sleep { - bias-pull-down; -}; - &lpass_tx_swr_clk { drive-strength = <2>; slew-rate = <1>; bias-disable; }; -&lpass_tx_swr_clk_sleep { - bias-pull-down; -}; - &lpass_tx_swr_data { drive-strength = <2>; slew-rate = <1>; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 448879d..4970864 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2483,80 +2483,40 @@ function = "dmic1_clk"; }; - lpass_dmic01_clk_sleep: dmic01-clk-sleep-state { - pins = "gpio6"; - function = "dmic1_clk"; - }; - lpass_dmic01_data: dmic01-data-state { pins = "gpio7"; function = "dmic1_data"; }; - lpass_dmic01_data_sleep: dmic01-data-sleep-state { - pins = "gpio7"; - function = "dmic1_data"; - }; - lpass_dmic23_clk: dmic23-clk-state { pins = "gpio8"; function = "dmic2_clk"; }; - lpass_dmic23_clk_sleep: dmic23-clk-sleep-state { - pins = "gpio8"; - function = "dmic2_clk"; - }; - lpass_dmic23_data: dmic23-data-state { pins = "gpio9"; function = "dmic2_data"; }; - lpass_dmic23_data_sleep: dmic23-data-sleep-state { - pins = "gpio9"; - function = "dmic2_data"; - }; - lpass_rx_swr_clk: rx-swr-clk-state { pins = "gpio3"; function = "swr_rx_clk"; }; - lpass_rx_swr_clk_sleep: rx-swr-clk-sleep-state { - pins = "gpio3"; - function = "swr_rx_clk"; - }; - lpass_rx_swr_data: rx-swr-data-state { pins = "gpio4", "gpio5"; function = "swr_rx_data"; }; - lpass_rx_swr_data_sleep: rx-swr-data-sleep-state { - pins = "gpio4", "gpio5"; - function = "swr_rx_data"; - }; - lpass_tx_swr_clk: tx-swr-clk-state { pins = "gpio0"; function = "swr_tx_clk"; }; - lpass_tx_swr_clk_sleep: tx-swr-clk-sleep-state { - pins = "gpio0"; - function = "swr_tx_clk"; - }; - lpass_tx_swr_data: tx-swr-data-state { pins = "gpio1", "gpio2", "gpio14"; function = "swr_tx_data"; }; - - lpass_tx_swr_data_sleep: tx-swr-data-sleep-state { - pins = "gpio1", "gpio2", "gpio14"; - function = "swr_tx_data"; - }; }; gpu: gpu@3d00000 { -- 2.7.4

4 4

[PATCH v2 0/8] Adjust usage of rt5682(s) power supply properties
by Nícolas F. R. A. Prado 06 Dec '22

06 Dec '22

This series sets straight the usage of power supply properties for the rt5682 and rt5682s audio codecs. These properties were already being used by sc7180-trogdor.dtsi (and derived DTs like sc7180-trogdor-kingoftown.dtsi). We start by documenting the power supplies that are already in use and then add few others that were missing to the bindings. Then we update the drivers to also support the new supplies. Finally we update the trogdor DTs so they have the newly added but required supplies and remove a superfluous one that was causing warnings. v1: https://lore.kernel.org/all/20221028205540.3197304-1-nfraprado@collabora.com Changes in v2: - Made new supply names uppercase to be consistent with the existing ones Nícolas F. R. A. Prado (8): ASoC: dt-bindings: realtek,rt5682s: Add AVDD and MICVDD supplies ASoC: dt-bindings: realtek,rt5682s: Add DBVDD and LDO1-IN supplies ASoC: dt-bindings: rt5682: Add AVDD, MICVDD and VBAT supplies ASoC: dt-bindings: rt5682: Add DBVDD and LDO1-IN supplies ASoC: rt5682s: Support DBVDD and LDO1-IN supplies ASoC: rt5682: Support DBVDD and LDO1-IN supplies arm64: dts: qcom: sc7180-trogdor: Add missing supplies for rt5682 arm64: dts: qcom: sc7180-trogdor: Remove VBAT supply from rt5682s .../bindings/sound/realtek,rt5682s.yaml | 23 +++++++++++++++++++ .../devicetree/bindings/sound/rt5682.txt | 20 ++++++++++++++++ .../dts/qcom/sc7180-trogdor-kingoftown.dtsi | 1 + ...0-trogdor-wormdingler-rev1-boe-rt5682s.dts | 1 + ...0-trogdor-wormdingler-rev1-inx-rt5682s.dts | 1 + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 2 ++ sound/soc/codecs/rt5682.c | 2 ++ sound/soc/codecs/rt5682.h | 2 +- sound/soc/codecs/rt5682s.c | 22 ++++++++++++++++++ sound/soc/codecs/rt5682s.h | 2 ++ 10 files changed, 75 insertions(+), 1 deletion(-) -- 2.38.1

4 10

Query about xrun on usb/pcm
by Carl Hetherington 06 Dec '22

06 Dec '22

Hi all, I wonder if anybody has any clues/suggestions about problem I'm seeing with an XMOS-based USB sound card. As far as I can see, the card has endpoint 0x82 set up for capture data, 0x2 for playback data, and 0x82 is also used as the sync endpoint for playback. I'm assuming that's a fairly common arrangement? I am testing it using simultaneous playback and capture, and simulating a high-CPU-load case by sleeping for long enough to cause a lot of xruns. After some random time, I see a failure case that I'm struggling to explain. It goes like this: There's an XRUN on the playback PCM, so __snd_pcm_xrun happens, then stop_endpoints() happens, and: it decides not to stop 0x82 because its running is > 1 it stops 0x2, so its state goes to EP_STATE_STOPPING Then the ALSA userspace code calls prepare on the playback PCM to get it going again. This ends up in wait_clear_urbs(), which does nothing with 0x82 as it is still running. At this point, the prepare thread is interrupted by an XRUN on the capture PCM. With this PCM, there is no sync endpoint, and 0x82 is the data endpoint. In the xrun handler: stop_urbs() sets 0x82 to EP_STATE_STOPPING. ... and the xrun handler finishes. Then we end up back in the prepare for the playback PCM. wait_clear_urbs() then sets 0x2 to STOPPED, and the prepare is finished. Now, snd_usb_endpoint_start() is called on 0x2 and that is fine. Next, snd_usb_endpoint_start() is called on 0x82 and that fails because its state is still STOPPING. At this point things seem broken. Does anyone have a hint about where in this sequence things are going wrong, and maybe even why? I'm more than happy to clarify anything I can, or provide more debugging information. Thanks in advance! Best, Carl

2 12

[PATCH v1 0/2] ASoC/tda998x: Fix reporting of nonexistent capture streams
by Mark Brown 04 Dec '22

04 Dec '22

The recently added pcm-test selftest has pointed out that systems with the tda998x driver end up advertising that they support capture when in reality as far as I can see the tda998x devices are transmit only. The DAIs registered through hdmi-codec are bidirectional, meaning that for I2S systems when combined with a typical bidrectional CPU DAI the overall capability of the PCM is bidirectional. In most cases the I2S links will clock OK but no useful audio will be returned which isn't so bad but we should still not advertise the useless capability, and some systems may notice problems for example due to pinmux management. This is happening due to the hdmi-codec helpers not providing any mechanism for indicating unidirectional audio so add one and use it in the tda998x driver. It is likely other hdmi-codec users are also affected but I don't have those systems to hand. Mark Brown (2): ASoC: hdmi-codec: Allow playback and capture to be disabled drm: tda99x: Don't advertise non-existent capture support drivers/gpu/drm/i2c/tda998x_drv.c | 2 ++ include/sound/hdmi-codec.h | 4 ++++ sound/soc/codecs/hdmi-codec.c | 30 +++++++++++++++++++++++++----- 3 files changed, 31 insertions(+), 5 deletions(-) base-commit: f0c4d9fc9cc9462659728d168387191387e903cc -- 2.30.2

2 4

[PATCH v1 0/6] kselftest/alsa: pcm-test improvements
by Mark Brown 02 Dec '22

02 Dec '22

This series provides a bunch of quick updates which should make the coverage from pcm-test a bit more useful, it adds some support for skipping tests when the hardware/driver is unable to support the requested configuration and then expands the set of cases we cover to include more sample rates and channel counts. This should exercise switching between 8kHz and 44.1kHz based rates and ensure that clocking doesn't get confused by non-stereo channel counts, both of which are I expect common real world errors, at least for embedded cards. Mark Brown (6): kselftest/alsa: Refactor pcm-test to list the tests to run in a struct kselftest/alsa: Report failures to set the requested sample rate as skips kselftest/alsa: Report failures to set the requested channels as skips kselftest/alsa: Don't any configuration in the sample config kselftest/alsa: Provide more meaningful names for tests kselftest/alsa: Add more coverage of sample rates and channel counts .../alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf | 35 ++++---- tools/testing/selftests/alsa/pcm-test.c | 88 +++++++++++++------ 2 files changed, 81 insertions(+), 42 deletions(-) base-commit: 1d8025ec722d5e011f9299c46274eb21fb54a428 -- 2.30.2

3 16

[PATCH v7 0/2] ASoC: SOF: Fix deadlock when shutdown a frozen userspace
by Ricardo Ribalda 01 Dec '22

01 Dec '22

Since: 83bfc7e793b5 ("ASoC: SOF: core: unregister clients and machine drivers in .shutdown") we wait for all the workloads to be completed during shutdown. This was done to avoid a stall once the device is started again. Unfortunately this has the side effect of stalling kexec(), if the userspace is frozen. Let's handle that case. To: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> To: Liam Girdwood <lgirdwood(a)gmail.com> To: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> To: Bard Liao <yung-chuan.liao(a)linux.intel.com> To: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> To: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> To: Daniel Baluta <daniel.baluta(a)nxp.com> To: Mark Brown <broonie(a)kernel.org> To: Jaroslav Kysela <perex(a)perex.cz> To: Takashi Iwai <tiwai(a)suse.com> To: Eric Biederman <ebiederm(a)xmission.com> To: Chromeos Kdump <chromeos-kdump(a)google.com> To: Steven Rostedt <rostedt(a)goodmis.org> Cc: stable(a)vger.kernel.org Cc: sound-open-firmware(a)alsa-project.org Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Cc: kexec(a)lists.infradead.org Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- Changes in v7: - Fix commit message (Thanks Pierre-Louis). - Link to v6: https://lore.kernel.org/r/20221127-snd-freeze-v6-0-3e90553f64a5@chromium.org Changes in v6: - Check if we are in kexec with the userspace frozen. - Link to v5: https://lore.kernel.org/r/20221127-snd-freeze-v5-0-4ededeb08ba0@chromium.org Changes in v5: - Edit subject prefix. - Link to v4: https://lore.kernel.org/r/20221127-snd-freeze-v4-0-51ca64b7f2ab@chromium.org Changes in v4: - Do not call snd_sof_machine_unregister from shutdown. - Link to v3: https://lore.kernel.org/r/20221127-snd-freeze-v3-0-a2eda731ca14@chromium.org Changes in v3: - Wrap pm_freezing in a function. - Link to v2: https://lore.kernel.org/r/20221127-snd-freeze-v2-0-d8a425ea9663@chromium.org Changes in v2: - Only use pm_freezing if CONFIG_FREEZER . - Link to v1: https://lore.kernel.org/r/20221127-snd-freeze-v1-0-57461a366ec2@chromium.org --- Ricardo Ribalda (2): kexec: Introduce kexec_with_frozen_processes ASoC: SOF: Fix deadlock when shutdown a frozen userspace include/linux/kexec.h | 3 +++ kernel/kexec_core.c | 5 +++++ sound/soc/sof/core.c | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) --- base-commit: 4312098baf37ee17a8350725e6e0d0e8590252d4 change-id: 20221127-snd-freeze-1ee143228326 Best regards, -- Ricardo Ribalda <ribalda(a)chromium.org>

3 5