Unverified Commit 1e6a93cf authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-dai: add mark for snd_soc_dai_compr_startup/shutdown() 



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 1) snd_soc_dai_compr_startup/shutdown(),
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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87mtze5iwp.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 15a7b8c1

include/sound/soc-dai.h

+3 −1
Original line number Diff line number Diff line
@@ -196,7 +196,8 @@ int snd_soc_pcm_dai_bespoke_trigger(struct snd_pcm_substream *substream, 
int snd_soc_dai_compr_startup(struct snd_soc_dai *dai,

			      struct snd_compr_stream *cstream);

void snd_soc_dai_compr_shutdown(struct snd_soc_dai *dai,

				struct snd_compr_stream *cstream);

				struct snd_compr_stream *cstream,

				int rollback);

int snd_soc_dai_compr_trigger(struct snd_soc_dai *dai,

			      struct snd_compr_stream *cstream, int cmd);

int snd_soc_dai_compr_set_params(struct snd_soc_dai *dai,
@@ -400,6 +401,7 @@ struct snd_soc_dai { 
	/* function mark */

	struct snd_pcm_substream *mark_startup;

	struct snd_pcm_substream *mark_hw_params;

	struct snd_compr_stream  *mark_compr_startup;



	/* bit field */

	unsigned int probed:1;

sound/soc/soc-compress.c

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static int soc_compr_free(struct snd_compr_stream *cstream) 


	snd_soc_component_compr_free(cstream, NULL);



	snd_soc_dai_compr_shutdown(cpu_dai, cstream);

	snd_soc_dai_compr_shutdown(cpu_dai, cstream, 0);



	snd_soc_dapm_stream_stop(rtd, stream);
@@ -91,7 +91,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream) 
machine_err:

	snd_soc_component_compr_free(cstream, component);



	snd_soc_dai_compr_shutdown(cpu_dai, cstream);

	snd_soc_dai_compr_shutdown(cpu_dai, cstream, 1);

out:

	mutex_unlock(&rtd->card->pcm_mutex);

pm_err:
@@ -165,7 +165,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) 
machine_err:

	snd_soc_component_compr_free(cstream, component);

open_err:

	snd_soc_dai_compr_shutdown(cpu_dai, cstream);

	snd_soc_dai_compr_shutdown(cpu_dai, cstream, 1);

out:

	dpcm_path_put(&list);

be_err:
@@ -211,7 +211,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) 


	snd_soc_component_compr_free(cstream, NULL);



	snd_soc_dai_compr_shutdown(cpu_dai, cstream);

	snd_soc_dai_compr_shutdown(cpu_dai, cstream, 0);



	mutex_unlock(&fe->card->mutex);

	return 0;

sound/soc/soc-dai.c

+12 −1
Original line number Diff line number Diff line
@@ -612,16 +612,27 @@ int snd_soc_dai_compr_startup(struct snd_soc_dai *dai, 
	    dai->driver->cops->startup)

		ret = dai->driver->cops->startup(cstream, dai);



	/* mark cstream if succeeded */

	if (ret == 0)

		soc_dai_mark_push(dai, cstream, compr_startup);



	return soc_dai_ret(dai, ret);

}

EXPORT_SYMBOL_GPL(snd_soc_dai_compr_startup);



void snd_soc_dai_compr_shutdown(struct snd_soc_dai *dai,

				struct snd_compr_stream *cstream)

				struct snd_compr_stream *cstream,

				int rollback)

{

	if (rollback && !soc_dai_mark_match(dai, cstream, compr_startup))

		return;



	if (dai->driver->cops &&

	    dai->driver->cops->shutdown)

		dai->driver->cops->shutdown(cstream, dai);



	/* remove marked cstream */

	soc_dai_mark_pop(dai, cstream, compr_startup);

}

EXPORT_SYMBOL_GPL(snd_soc_dai_compr_shutdown);

CRA Git | Maintained and supported by SUSTech CRA and CCSE