ASoC: soc-component: add mark for snd_soc_pcm_component_hw_params/free()

soc_pcm_hw_params() does rollback when failed (A),
but, it is almost same as soc_pcm_hw_free().

	static int soc_pcm_hw_params(xxx)
	{
		...
		if (ret < 0)
			goto xxx_err;
		...
		return ret;

 ^	component_err:
 |		...
 |	interface_err:
(A)		...
 |	codec_err:
 |		...
 v		return ret;
	}

The difference is
soc_pcm_hw_free() is for all dai/component/substream,
rollback          is for succeeded part only.

This kind of duplicated code can be a hotbed of bugs,
thus, we want to share soc_pcm_hw_free() and rollback.

Now, soc_pcm_hw_params/free() are handling
	1) snd_soc_link_hw_params/free()
=>	2) snd_soc_pcm_component_hw_params/free()
	3) snd_soc_dai_hw_params/free()

This patch is for 2) snd_soc_pcm_component_hw_params/free().

The idea of having bit-flag or counter is not enough for this purpose.
For example if one DAI is used for 2xPlaybacks for some reasons,
and if 1st Playback was succeeded but 2nd Playback was failed,
2nd Playback rollback doesn't need to call shutdown.
But it has succeeded bit-flag or counter via 1st Playback,
thus, 2nd Playback rollback will call unneeded shutdown.
And 1st Playback's necessary shutdown will not be called,
because bit-flag or counter was cleared by wrong 2nd Playback rollback.

To avoid such case, this patch marks substream pointer when hw_params() was
succeeded. If rollback needed, it will check rollback flag and marked
substream pointer.

One note here is that it cares *previous* hw_params() only now,
but we might want to check *whole* marked substream in the future.
This patch is using macro named "push/pop", so that it can be easily
update.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87k0wdgqav.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 2c790ce..21f1d12 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -220,6 +220,7 @@ struct snd_soc_component {
        /* function mark */
        struct snd_pcm_substream *mark_module;
        struct snd_pcm_substream *mark_open;
+       struct snd_pcm_substream *mark_hw_params;
        void *mark_pm;
 
 #ifdef CONFIG_DEBUG_FS
@@ -459,10 +460,9 @@ int snd_soc_pcm_component_new(struct snd_soc_pcm_runtime *rtd);
 void snd_soc_pcm_component_free(struct snd_soc_pcm_runtime *rtd);
 int snd_soc_pcm_component_prepare(struct snd_pcm_substream *substream);
 int snd_soc_pcm_component_hw_params(struct snd_pcm_substream *substream,
-                                   struct snd_pcm_hw_params *params,
-                                   struct snd_soc_component **last);
+                                   struct snd_pcm_hw_params *params);
 void snd_soc_pcm_component_hw_free(struct snd_pcm_substream *substream,
-                                  struct snd_soc_component *last);
+                                  int rollback);
 int snd_soc_pcm_component_trigger(struct snd_pcm_substream *substream,
                                  int cmd);
 int snd_soc_pcm_component_pm_runtime_get(struct snd_soc_pcm_runtime *rtd,

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index 728e93f..6d719c2 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -779,8 +779,7 @@ int snd_soc_pcm_component_prepare(struct snd_pcm_substream *substream)
 }
 
 int snd_soc_pcm_component_hw_params(struct snd_pcm_substream *substream,
-                                   struct snd_pcm_hw_params *params,
-                                   struct snd_soc_component **last)
+                                   struct snd_pcm_hw_params *params)
 {
        struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
        struct snd_soc_component *component;
@@ -790,33 +789,35 @@ int snd_soc_pcm_component_hw_params(struct snd_pcm_substream *substream,
                if (component->driver->hw_params) {
                        ret = component->driver->hw_params(component,
                                                           substream, params);
-                       if (ret < 0) {
-                               *last = component;
+                       if (ret < 0)
                                return soc_component_ret(component, ret);
-                       }
                }
+               /* mark substream if succeeded */
+               soc_component_mark_push(component, substream, hw_params);
        }
 
-       *last = NULL;
        return 0;
 }
 
 void snd_soc_pcm_component_hw_free(struct snd_pcm_substream *substream,
-                                  struct snd_soc_component *last)
+                                  int rollback)
 {
        struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
        struct snd_soc_component *component;
        int i, ret;
 
        for_each_rtd_components(rtd, i, component) {
-               if (component == last)
-                       break;
+               if (rollback && !soc_component_mark_match(component, substream, hw_params))
+                       continue;
 
                if (component->driver->hw_free) {
                        ret = component->driver->hw_free(component, substream);
                        if (ret < 0)
                                soc_component_ret(component, ret);
                }
+
+               /* remove marked substream */
+               soc_component_mark_pop(component, substream, hw_params);
        }
 }
 

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 8c69288..6eec0f4 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -889,7 +889,7 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
        snd_soc_link_hw_free(substream, 0);
 
        /* free any component resources */
-       snd_soc_pcm_component_hw_free(substream, NULL);
+       snd_soc_pcm_component_hw_free(substream, 0);
 
        /* now free hw params for the DAIs  */
        for_each_rtd_dais(rtd, i, dai) {
@@ -912,7 +912,6 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
                                struct snd_pcm_hw_params *params)
 {
        struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct snd_soc_component *component;
        struct snd_soc_dai *cpu_dai;
        struct snd_soc_dai *codec_dai;
        int i, ret = 0;
@@ -995,7 +994,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
                snd_soc_dapm_update_dai(substream, params, cpu_dai);
        }
 
-       ret = snd_soc_pcm_component_hw_params(substream, params, &component);
+       ret = snd_soc_pcm_component_hw_params(substream, params);
        if (ret < 0)
                goto component_err;
 
@@ -1004,7 +1003,7 @@ out:
        return ret;
 
 component_err:
-       snd_soc_pcm_component_hw_free(substream, component);
+       snd_soc_pcm_component_hw_free(substream, 1);
 
        i = rtd->num_cpus;