Unverified Commit 5061e488 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: merge soc_pcm_open() rollback and soc_pcm_close()" from... 

Merge series "ASoC: merge soc_pcm_open() rollback and soc_pcm_close()" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

Hi Mark

1 month past and nothing happened.
This is resend of v2 patch-set.

soc_pcm_open() does rollback when failed (A),
but, it is almost same as soc_pcm_close().

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

 ^	config_err:
 |		...
 |	rtd_startup_err:
(A)		...
 |	component_err:
 |		...
 v		return ret;
	}

This kind of duplicated code can be a hotbed of bugs,
thus, this patch-set share soc_pcm_close() and rollback.

v1 -> v2
	- indicate more detail background/logic on git-log

Link: https://lore.kernel.org/r/87wo2oku0m.wl-kuninori.morimoto.gx@renesas.com
Link: https://lore.kernel.org/r/87wo1kvozz.wl-kuninori.morimoto.gx@renesas.com

Kuninori Morimoto (7):
  ASoC: soc-dai: add mark for snd_soc_dai_startup/shutdown()
  ASoC: soc-link: add mark for snd_soc_link_startup/shutdown()
  ASoC: soc-component: add mark for soc_pcm_components_open/close()
  ASoC: soc-component: add mark for
    snd_soc_pcm_component_pm_runtime_get/put()
  ASoC: soc-pcm: add soc_pcm_clean() and call it from
    soc_pcm_open/close()
  ASoC: soc-pcm: remove unneeded dev_err() for snd_soc_dai_startup()
  ASoC: soc-pcm: remove unneeded dev_err() for
    snd_soc_component_module/open()

 include/sound/soc-component.h |  28 +++++---
 include/sound/soc-dai.h       |   5 +-
 include/sound/soc-link.h      |   3 +-
 include/sound/soc.h           |   3 +
 sound/soc/soc-component.c     |  73 ++++++++++++++++++++-
 sound/soc/soc-compress.c      |  30 +++------
 sound/soc/soc-dai.c           |  21 +++++-
 sound/soc/soc-dapm.c          |   4 +-
 sound/soc/soc-link.c          |  21 +++++-
 sound/soc/soc-pcm.c           | 120 ++++++++++++----------------------
 10 files changed, 190 insertions(+), 118 deletions(-)

--
2.25.1
parents 19895e92 bcae1631

include/sound/soc-component.h

+20 −8
Original line number Diff line number Diff line
@@ -217,6 +217,11 @@ struct snd_soc_component { 
	/* machine specific init */

	int (*init)(struct snd_soc_component *component);



	/* function mark */

	struct snd_pcm_substream *mark_module;

	struct snd_pcm_substream *mark_open;

	void *mark_pm;



#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs_root;

	const char *debugfs_prefix;
@@ -370,17 +375,19 @@ void snd_soc_component_exit_regmap(struct snd_soc_component *component); 
#endif



#define snd_soc_component_module_get_when_probe(component)\

	snd_soc_component_module_get(component, 0)

#define snd_soc_component_module_get_when_open(component)	\

	snd_soc_component_module_get(component, 1)

	snd_soc_component_module_get(component, NULL, 0)

#define snd_soc_component_module_get_when_open(component, substream)	\

	snd_soc_component_module_get(component, substream, 1)

int snd_soc_component_module_get(struct snd_soc_component *component,

				 struct snd_pcm_substream *substream,

				 int upon_open);

#define snd_soc_component_module_put_when_remove(component)	\

	snd_soc_component_module_put(component, 0)

#define snd_soc_component_module_put_when_close(component)	\

	snd_soc_component_module_put(component, 1)

	snd_soc_component_module_put(component, NULL, 0, 0)

#define snd_soc_component_module_put_when_close(component, substream, rollback) \

	snd_soc_component_module_put(component, substream, 1, rollback)

void snd_soc_component_module_put(struct snd_soc_component *component,

				  int upon_open);

				  struct snd_pcm_substream *substream,

				  int upon_open, int rollback);



static inline void snd_soc_component_set_drvdata(struct snd_soc_component *c,

						 void *data)
@@ -424,7 +431,8 @@ int snd_soc_component_force_enable_pin_unlocked( 
int snd_soc_component_open(struct snd_soc_component *component,

			   struct snd_pcm_substream *substream);

int snd_soc_component_close(struct snd_soc_component *component,

			    struct snd_pcm_substream *substream);

			    struct snd_pcm_substream *substream,

			    int rollback);

void snd_soc_component_suspend(struct snd_soc_component *component);

void snd_soc_component_resume(struct snd_soc_component *component);

int snd_soc_component_is_suspended(struct snd_soc_component *component);
@@ -457,5 +465,9 @@ void snd_soc_pcm_component_hw_free(struct snd_pcm_substream *substream, 
				   struct snd_soc_component *last);

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,

					 void *stream);

void snd_soc_pcm_component_pm_runtime_put(struct snd_soc_pcm_runtime *rtd,

					  void *stream, int rollback);



#endif /* __SOC_COMPONENT_H */

include/sound/soc-dai.h

+4 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ void snd_soc_dai_hw_free(struct snd_soc_dai *dai, 
int snd_soc_dai_startup(struct snd_soc_dai *dai,

			struct snd_pcm_substream *substream);

void snd_soc_dai_shutdown(struct snd_soc_dai *dai,

			  struct snd_pcm_substream *substream);

			  struct snd_pcm_substream *substream, int rollback);

snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai,

				    struct snd_pcm_substream *substream);

void snd_soc_dai_suspend(struct snd_soc_dai *dai);
@@ -388,6 +388,9 @@ struct snd_soc_dai { 


	struct list_head list;



	/* function mark */

	struct snd_pcm_substream *mark_startup;



	/* bit field */

	unsigned int probed:1;

};

include/sound/soc-link.h

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ int snd_soc_link_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
				    struct snd_pcm_hw_params *params);



int snd_soc_link_startup(struct snd_pcm_substream *substream);

void snd_soc_link_shutdown(struct snd_pcm_substream *substream);

void snd_soc_link_shutdown(struct snd_pcm_substream *substream,

			   int rollback);

int snd_soc_link_prepare(struct snd_pcm_substream *substream);

int snd_soc_link_hw_params(struct snd_pcm_substream *substream,

			   struct snd_pcm_hw_params *params);

include/sound/soc.h

+3 −0
Original line number Diff line number Diff line
@@ -1159,6 +1159,9 @@ struct snd_soc_pcm_runtime { 
	unsigned int num; /* 0-based and monotonic increasing */

	struct list_head list; /* rtd list of the soc card */



	/* function mark */

	struct snd_pcm_substream *mark_startup;



	/* bit field */

	unsigned int pop_wait:1;

	unsigned int fe_compr:1; /* for Dynamic PCM */

sound/soc/soc-component.c

+71 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
// Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

//

#include <linux/module.h>

#include <linux/pm_runtime.h>

#include <sound/soc.h>



#define soc_component_ret(dai, ret) _soc_component_ret(dai, __func__, ret)
@@ -33,6 +34,14 @@ static inline int _soc_component_ret(struct snd_soc_component *component, 
	return ret;

}



/*

 * We might want to check substream by using list.

 * In such case, we can update these macros.

 */

#define soc_component_mark_push(component, substream, tgt)	((component)->mark_##tgt = substream)

#define soc_component_mark_pop(component, substream, tgt)	((component)->mark_##tgt = NULL)

#define soc_component_mark_match(component, substream, tgt)	((component)->mark_##tgt == substream)



void snd_soc_component_set_aux(struct snd_soc_component *component,

			       struct snd_soc_aux_dev *aux)

{
@@ -238,6 +247,7 @@ int snd_soc_component_set_jack(struct snd_soc_component *component, 
EXPORT_SYMBOL_GPL(snd_soc_component_set_jack);



int snd_soc_component_module_get(struct snd_soc_component *component,

				 struct snd_pcm_substream *substream,

				 int upon_open)

{

	int ret = 0;
@@ -246,14 +256,25 @@ int snd_soc_component_module_get(struct snd_soc_component *component, 
	    !try_module_get(component->dev->driver->owner))

		ret = -ENODEV;



	/* mark substream if succeeded */

	if (ret == 0)

		soc_component_mark_push(component, substream, module);



	return soc_component_ret(component, ret);

}



void snd_soc_component_module_put(struct snd_soc_component *component,

				  int upon_open)

				  struct snd_pcm_substream *substream,

				  int upon_open, int rollback)

{

	if (rollback && !soc_component_mark_match(component, substream, module))

		return;



	if (component->driver->module_get_upon_open == !!upon_open)

		module_put(component->dev->driver->owner);



	/* remove marked substream */

	soc_component_mark_pop(component, substream, module);

}



int snd_soc_component_open(struct snd_soc_component *component,
@@ -264,17 +285,28 @@ int snd_soc_component_open(struct snd_soc_component *component, 
	if (component->driver->open)

		ret = component->driver->open(component, substream);



	/* mark substream if succeeded */

	if (ret == 0)

		soc_component_mark_push(component, substream, open);



	return soc_component_ret(component, ret);

}



int snd_soc_component_close(struct snd_soc_component *component,

			    struct snd_pcm_substream *substream)

			    struct snd_pcm_substream *substream,

			    int rollback)

{

	int ret = 0;



	if (rollback && !soc_component_mark_match(component, substream, open))

		return 0;



	if (component->driver->close)

		ret = component->driver->close(component, substream);



	/* remove marked substream */

	soc_component_mark_pop(component, substream, open);



	return soc_component_ret(component, ret);

}
@@ -805,3 +837,40 @@ int snd_soc_pcm_component_trigger(struct snd_pcm_substream *substream, 


	return 0;

}



int snd_soc_pcm_component_pm_runtime_get(struct snd_soc_pcm_runtime *rtd,

					 void *stream)

{

	struct snd_soc_component *component;

	int i, ret;



	for_each_rtd_components(rtd, i, component) {

		ret = pm_runtime_get_sync(component->dev);

		if (ret < 0 && ret != -EACCES) {

			pm_runtime_put_noidle(component->dev);

			return soc_component_ret(component, ret);

		}

		/* mark stream if succeeded */

		soc_component_mark_push(component, stream, pm);

	}



	return 0;

}



void snd_soc_pcm_component_pm_runtime_put(struct snd_soc_pcm_runtime *rtd,

					  void *stream, int rollback)

{

	struct snd_soc_component *component;

	int i;



	for_each_rtd_components(rtd, i, component) {

		if (rollback && !soc_component_mark_match(component, stream, pm))

			continue;



		pm_runtime_mark_last_busy(component->dev);

		pm_runtime_put_autosuspend(component->dev);



		/* remove marked stream */

		soc_component_mark_pop(component, stream, pm);

	}

}