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

soc_compr_open() does rollback when failed (A),
but, it is almost same as soc_compr_free().

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

 ^	machine_err:
 |		...
 |	out:
(A)		...
 |	pm_err:
 |		...
 v		return ret;
	}

The difference is
soc_compr_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_compr_free() and rollback.
	1) snd_soc_dai_compr_startup/shutdown()
=>	2) snd_soc_component_compr_open/free()
	3) snd_soc_link_compr_startup/shutdown()

This patch is for 2) snd_soc_component_compr_open/free(),
and adds new cstream mark.
It will mark cstream when startup() was suceeded.
If rollback happen *after* that, it will check rollback flag
and marked cstream.

It cares *previous* startup() only now,
but we might want to check *whole* marked cstream in the future.
This patch is using macro so that it can be easily adjust to it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87lfey5iwk.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 984dd73..9140b5f 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -221,6 +221,7 @@ struct snd_soc_component {
        struct snd_pcm_substream *mark_module;
        struct snd_pcm_substream *mark_open;
        struct snd_pcm_substream *mark_hw_params;
+       struct snd_compr_stream  *mark_compr_open;
        void *mark_pm;
 
 #ifdef CONFIG_DEBUG_FS
@@ -444,10 +445,9 @@ int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
 int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,
                                        struct of_phandle_args *args,
                                        const char **dai_name);
-int snd_soc_component_compr_open(struct snd_compr_stream *cstream,
-                                struct snd_soc_component **last);
+int snd_soc_component_compr_open(struct snd_compr_stream *cstream);
 void snd_soc_component_compr_free(struct snd_compr_stream *cstream,
-                                 struct snd_soc_component *last);
+                                 int rollback);
 int snd_soc_component_compr_trigger(struct snd_compr_stream *cstream, int cmd);
 int snd_soc_component_compr_set_params(struct snd_compr_stream *cstream,
                                       struct snd_compr_params *params);

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index 5d3a8dc..434987a 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -421,8 +421,7 @@ EXPORT_SYMBOL_GPL(snd_soc_component_exit_regmap);
 
 #endif
 
-int snd_soc_component_compr_open(struct snd_compr_stream *cstream,
-                                struct snd_soc_component **last)
+int snd_soc_component_compr_open(struct snd_compr_stream *cstream)
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
        struct snd_soc_component *component;
@@ -432,32 +431,32 @@ int snd_soc_component_compr_open(struct snd_compr_stream *cstream,
                if (component->driver->compress_ops &&
                    component->driver->compress_ops->open) {
                        ret = component->driver->compress_ops->open(component, cstream);
-                       if (ret < 0) {
-                               *last = component;
+                       if (ret < 0)
                                return soc_component_ret(component, ret);
-                       }
                }
+               soc_component_mark_push(component, cstream, compr_open);
        }
 
-       *last = NULL;
        return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_component_compr_open);
 
 void snd_soc_component_compr_free(struct snd_compr_stream *cstream,
-                                 struct snd_soc_component *last)
+                                 int rollback)
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
        struct snd_soc_component *component;
        int i;
 
        for_each_rtd_components(rtd, i, component) {
-               if (component == last)
-                       break;
+               if (rollback && !soc_component_mark_match(component, cstream, compr_open))
+                       continue;
 
                if (component->driver->compress_ops &&
                    component->driver->compress_ops->free)
                        component->driver->compress_ops->free(component, cstream);
+
+               soc_component_mark_pop(component, cstream, compr_open);
        }
 }
 EXPORT_SYMBOL_GPL(snd_soc_component_compr_free);

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index d85b6b1..8b6a6bd 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -43,7 +43,7 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
 
        snd_soc_link_compr_shutdown(cstream);
 
-       snd_soc_component_compr_free(cstream, NULL);
+       snd_soc_component_compr_free(cstream, 0);
 
        snd_soc_dai_compr_shutdown(cpu_dai, cstream, 0);
 
@@ -59,7 +59,6 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
 static int soc_compr_open(struct snd_compr_stream *cstream)
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-       struct snd_soc_component *component = NULL;
        struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
        int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */
        int ret;
@@ -74,7 +73,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream)
        if (ret < 0)
                goto out;
 
-       ret = snd_soc_component_compr_open(cstream, &component);
+       ret = snd_soc_component_compr_open(cstream);
        if (ret < 0)
                goto machine_err;
 
@@ -89,7 +88,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream)
        return 0;
 
 machine_err:
-       snd_soc_component_compr_free(cstream, component);
+       snd_soc_component_compr_free(cstream, 1);
 
        snd_soc_dai_compr_shutdown(cpu_dai, cstream, 1);
 out:
@@ -105,7 +104,6 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
        struct snd_soc_pcm_runtime *fe = cstream->private_data;
        struct snd_pcm_substream *fe_substream =
                 fe->pcm->streams[cstream->direction].substream;
-       struct snd_soc_component *component;
        struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(fe, 0);
        struct snd_soc_dpcm *dpcm;
        struct snd_soc_dapm_widget_list *list;
@@ -142,7 +140,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
        if (ret < 0)
                goto out;
 
-       ret = snd_soc_component_compr_open(cstream, &component);
+       ret = snd_soc_component_compr_open(cstream);
        if (ret < 0)
                goto open_err;
 
@@ -163,7 +161,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
        return 0;
 
 machine_err:
-       snd_soc_component_compr_free(cstream, component);
+       snd_soc_component_compr_free(cstream, 1);
 open_err:
        snd_soc_dai_compr_shutdown(cpu_dai, cstream, 1);
 out:
@@ -209,7 +207,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream)
 
        snd_soc_link_compr_shutdown(cstream);
 
-       snd_soc_component_compr_free(cstream, NULL);
+       snd_soc_component_compr_free(cstream, 0);
 
        snd_soc_dai_compr_shutdown(cpu_dai, cstream, 0);