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

ASoC: soc-component: add mark for snd_soc_link_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 3) snd_soc_link_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/87k0ui5iwf.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-link.h

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ void snd_soc_link_hw_free(struct snd_pcm_substream *substream, 
int snd_soc_link_trigger(struct snd_pcm_substream *substream, int cmd);



int snd_soc_link_compr_startup(struct snd_compr_stream *cstream);

void snd_soc_link_compr_shutdown(struct snd_compr_stream *cstream);

void snd_soc_link_compr_shutdown(struct snd_compr_stream *cstream,

				 int rollback);

int snd_soc_link_compr_set_params(struct snd_compr_stream *cstream);



#endif /* __SOC_LINK_H */

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,7 @@ struct snd_soc_pcm_runtime { 
	/* 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 pop_wait:1;

sound/soc/soc-compress.c

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static int soc_compr_free(struct snd_compr_stream *cstream) 
	if (!snd_soc_dai_active(codec_dai))

		codec_dai->rate = 0;



	snd_soc_link_compr_shutdown(cstream);

	snd_soc_link_compr_shutdown(cstream, 0);



	snd_soc_component_compr_free(cstream, 0);
@@ -205,7 +205,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) 


	fe->dpcm[stream].runtime = NULL;



	snd_soc_link_compr_shutdown(cstream);

	snd_soc_link_compr_shutdown(cstream, 0);



	snd_soc_component_compr_free(cstream, 0);

sound/soc/soc-link.c

+10 −1
Original line number Diff line number Diff line
@@ -162,17 +162,26 @@ int snd_soc_link_compr_startup(struct snd_compr_stream *cstream) 
	    rtd->dai_link->compr_ops->startup)

		ret = rtd->dai_link->compr_ops->startup(cstream);



	if (ret == 0)

		soc_link_mark_push(rtd, cstream, compr_startup);



	return soc_link_ret(rtd, ret);

}

EXPORT_SYMBOL_GPL(snd_soc_link_compr_startup);



void snd_soc_link_compr_shutdown(struct snd_compr_stream *cstream)

void snd_soc_link_compr_shutdown(struct snd_compr_stream *cstream,

				 int rollback)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;



	if (rollback && !soc_link_mark_match(rtd, cstream, compr_startup))

		return;



	if (rtd->dai_link->compr_ops &&

	    rtd->dai_link->compr_ops->shutdown)

		rtd->dai_link->compr_ops->shutdown(cstream);



	soc_link_mark_pop(rtd, cstream, compr_startup);

}

EXPORT_SYMBOL_GPL(snd_soc_link_compr_shutdown);

CRA Git | Maintained and supported by SUSTech CRA and CCSE