ASoC: simple-card-utils: Don't reset clock of active DAI

Playback or capture errors are seen when clock is reset during an active
stage of DAI. Presently this scenario happens when DAI has both playback
and capture sessions running and one of these finishes first which will
be followed by clock rate reset. The remaining active session will be
affected in such case.

Address this problem by allowing clock rate reset to happen only when
the DAI is no more active.

Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/1646910999-2501-1-git-send-email-spujar@nvidia.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 14c8b3a74c2d31a1cd31563d0e68b8cb7c4ccc09..8e037835bc583f4d7e0a83119ad935bf2d9d242a 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -318,15 +318,19 @@ void asoc_simple_shutdown(struct snd_pcm_substream *substream)
        int i;
 
        for_each_prop_dai_cpu(props, i, dai) {
-               if (props->mclk_fs && !dai->clk_fixed)
-                       snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, i),
+               struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, i);
+
+               if (props->mclk_fs && !dai->clk_fixed && !snd_soc_dai_active(cpu_dai))
+                       snd_soc_dai_set_sysclk(cpu_dai,
                                               0, 0, SND_SOC_CLOCK_IN);
 
                asoc_simple_clk_disable(dai);
        }
        for_each_prop_dai_codec(props, i, dai) {
-               if (props->mclk_fs && !dai->clk_fixed)
-                       snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, i),
+               struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, i);
+
+               if (props->mclk_fs && !dai->clk_fixed && !snd_soc_dai_active(codec_dai))
+                       snd_soc_dai_set_sysclk(codec_dai,
                                               0, 0, SND_SOC_CLOCK_IN);
 
                asoc_simple_clk_disable(dai);