Unverified Commit 97c236e2 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: cleanup mutex lock 

Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

ASoC is using many type of mutex lock, but
some of them has helper function, but some doesn't.
Or, it has helper function, but is static.

This patch-set adds helper function and use it.
parents 59de6c38 0f3b8184

include/sound/soc-card.h

+16 −1
Original line number Diff line number Diff line
@@ -9,10 +9,25 @@ 
#define __SOC_CARD_H



enum snd_soc_card_subclass {

	SND_SOC_CARD_CLASS_INIT		= 0,

	SND_SOC_CARD_CLASS_ROOT		= 0,

	SND_SOC_CARD_CLASS_RUNTIME	= 1,

};



static inline void snd_soc_card_mutex_lock_root(struct snd_soc_card *card)

{

	mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_ROOT);

}



static inline void snd_soc_card_mutex_lock(struct snd_soc_card *card)

{

	mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_RUNTIME);

}



static inline void snd_soc_card_mutex_unlock(struct snd_soc_card *card)

{

	mutex_unlock(&card->mutex);

}



struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card,

					       const char *name);

int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,

include/sound/soc-dapm.h

+0 −5
Original line number Diff line number Diff line
@@ -527,11 +527,6 @@ enum snd_soc_dapm_type { 
	SND_SOC_DAPM_TYPE_COUNT

};



enum snd_soc_dapm_subclass {

	SND_SOC_DAPM_CLASS_INIT		= 0,

	SND_SOC_DAPM_CLASS_RUNTIME	= 1,

};



/*

 * DAPM audio route definition.

 *

include/sound/soc.h

+100 −5
Original line number Diff line number Diff line
@@ -1364,17 +1364,112 @@ extern struct dentry *snd_soc_debugfs_root; 


extern const struct dev_pm_ops snd_soc_pm_ops;



/* Helper functions */

static inline void snd_soc_dapm_mutex_lock(struct snd_soc_dapm_context *dapm)

/*

 *	DAPM helper functions

 */

enum snd_soc_dapm_subclass {

	SND_SOC_DAPM_CLASS_ROOT		= 0,

	SND_SOC_DAPM_CLASS_RUNTIME	= 1,

};



static inline void _snd_soc_dapm_mutex_lock_root_c(struct snd_soc_card *card)

{

	mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_ROOT);

}



static inline void _snd_soc_dapm_mutex_lock_c(struct snd_soc_card *card)

{

	mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);

}



static inline void _snd_soc_dapm_mutex_unlock_c(struct snd_soc_card *card)

{

	mutex_unlock(&card->dapm_mutex);

}



static inline void _snd_soc_dapm_mutex_assert_held_c(struct snd_soc_card *card)

{

	lockdep_assert_held(&card->dapm_mutex);

}



static inline void _snd_soc_dapm_mutex_lock_root_d(struct snd_soc_dapm_context *dapm)

{

	_snd_soc_dapm_mutex_lock_root_c(dapm->card);

}



static inline void _snd_soc_dapm_mutex_lock_d(struct snd_soc_dapm_context *dapm)

{

	_snd_soc_dapm_mutex_lock_c(dapm->card);

}



static inline void _snd_soc_dapm_mutex_unlock_d(struct snd_soc_dapm_context *dapm)

{

	_snd_soc_dapm_mutex_unlock_c(dapm->card);

}



static inline void _snd_soc_dapm_mutex_assert_held_d(struct snd_soc_dapm_context *dapm)

{

	_snd_soc_dapm_mutex_assert_held_c(dapm->card);

}



#define snd_soc_dapm_mutex_lock_root(x) _Generic((x),			\

	struct snd_soc_card * :		_snd_soc_dapm_mutex_lock_root_c, \

	struct snd_soc_dapm_context * :	_snd_soc_dapm_mutex_lock_root_d)(x)

#define snd_soc_dapm_mutex_lock(x) _Generic((x),			\

	struct snd_soc_card * :		_snd_soc_dapm_mutex_lock_c,	\

	struct snd_soc_dapm_context * :	_snd_soc_dapm_mutex_lock_d)(x)

#define snd_soc_dapm_mutex_unlock(x) _Generic((x),			\

	struct snd_soc_card * :		_snd_soc_dapm_mutex_unlock_c,	\

	struct snd_soc_dapm_context * :	_snd_soc_dapm_mutex_unlock_d)(x)

#define snd_soc_dapm_mutex_assert_held(x) _Generic((x),			\

	struct snd_soc_card * :		_snd_soc_dapm_mutex_assert_held_c, \

	struct snd_soc_dapm_context * :	_snd_soc_dapm_mutex_assert_held_d)(x)



/*

 *	PCM helper functions

 */

static inline void _snd_soc_dpcm_mutex_lock_c(struct snd_soc_card *card)

{

	mutex_lock_nested(&card->pcm_mutex, card->pcm_subclass);

}



static inline void _snd_soc_dpcm_mutex_unlock_c(struct snd_soc_card *card)

{

	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);

	mutex_unlock(&card->pcm_mutex);

}



static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm)

static inline void _snd_soc_dpcm_mutex_assert_held_c(struct snd_soc_card *card)

{

	mutex_unlock(&dapm->card->dapm_mutex);

	lockdep_assert_held(&card->pcm_mutex);

}



static inline void _snd_soc_dpcm_mutex_lock_r(struct snd_soc_pcm_runtime *rtd)

{

	_snd_soc_dpcm_mutex_lock_c(rtd->card);

}



static inline void _snd_soc_dpcm_mutex_unlock_r(struct snd_soc_pcm_runtime *rtd)

{

	_snd_soc_dpcm_mutex_unlock_c(rtd->card);

}



static inline void _snd_soc_dpcm_mutex_assert_held_r(struct snd_soc_pcm_runtime *rtd)

{

	_snd_soc_dpcm_mutex_assert_held_c(rtd->card);

}



#define snd_soc_dpcm_mutex_lock(x) _Generic((x),			\

	 struct snd_soc_card * :	_snd_soc_dpcm_mutex_lock_c,	\

	 struct snd_soc_pcm_runtime * :	_snd_soc_dpcm_mutex_lock_r)(x)



#define snd_soc_dpcm_mutex_unlock(x) _Generic((x),			\

	 struct snd_soc_card * :	_snd_soc_dpcm_mutex_unlock_c,	\

	 struct snd_soc_pcm_runtime * :	_snd_soc_dpcm_mutex_unlock_r)(x)



#define snd_soc_dpcm_mutex_assert_held(x) _Generic((x),		\

	struct snd_soc_card * :		_snd_soc_dpcm_mutex_assert_held_c, \

	struct snd_soc_pcm_runtime * :	_snd_soc_dpcm_mutex_assert_held_r)(x)



#include <sound/soc-component.h>

#include <sound/soc-card.h>

#include <sound/soc-jack.h>

sound/soc/soc-component.c

+6 −6
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ int snd_soc_component_compr_get_caps(struct snd_compr_stream *cstream, 
	struct snd_soc_component *component;

	int i, ret = 0;



	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);

	snd_soc_dpcm_mutex_lock(rtd);



	for_each_rtd_components(rtd, i, component) {

		if (component->driver->compress_ops &&
@@ -561,7 +561,7 @@ int snd_soc_component_compr_get_caps(struct snd_compr_stream *cstream, 
		}

	}



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

	snd_soc_dpcm_mutex_unlock(rtd);



	return soc_component_ret(component, ret);

}
@@ -574,7 +574,7 @@ int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream, 
	struct snd_soc_component *component;

	int i, ret = 0;



	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);

	snd_soc_dpcm_mutex_lock(rtd);



	for_each_rtd_components(rtd, i, component) {

		if (component->driver->compress_ops &&
@@ -585,7 +585,7 @@ int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream, 
		}

	}



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

	snd_soc_dpcm_mutex_unlock(rtd);



	return soc_component_ret(component, ret);

}
@@ -638,7 +638,7 @@ int snd_soc_component_compr_copy(struct snd_compr_stream *cstream, 
	struct snd_soc_component *component;

	int i, ret = 0;



	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);

	snd_soc_dpcm_mutex_lock(rtd);



	for_each_rtd_components(rtd, i, component) {

		if (component->driver->compress_ops &&
@@ -649,7 +649,7 @@ int snd_soc_component_compr_copy(struct snd_compr_stream *cstream, 
		}

	}



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

	snd_soc_dpcm_mutex_unlock(rtd);



	return soc_component_ret(component, ret);

}

sound/soc/soc-compress.c

+30 −30
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int soc_compr_clean(struct snd_compr_stream *cstream, int rollback) 
	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */



	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);

	snd_soc_dpcm_mutex_lock(rtd);



	if (!rollback)

		snd_soc_runtime_deactivate(rtd, stream);
@@ -84,7 +84,7 @@ static int soc_compr_clean(struct snd_compr_stream *cstream, int rollback) 
	if (!rollback)

		snd_soc_dapm_stream_stop(rtd, stream);



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

	snd_soc_dpcm_mutex_unlock(rtd);



	snd_soc_pcm_component_pm_runtime_put(rtd, cstream, rollback);
@@ -107,7 +107,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream) 
	if (ret < 0)

		goto err_no_lock;



	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);

	snd_soc_dpcm_mutex_lock(rtd);



	ret = snd_soc_dai_compr_startup(cpu_dai, cstream);

	if (ret < 0)
@@ -123,7 +123,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream) 


	snd_soc_runtime_activate(rtd, stream);

err:

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

	snd_soc_dpcm_mutex_unlock(rtd);

err_no_lock:

	if (ret < 0)

		soc_compr_clean(cstream, 1);
@@ -140,13 +140,13 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) 
	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */

	int ret;



	mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);

	snd_soc_card_mutex_lock(fe->card);



	ret = dpcm_path_get(fe, stream, &list);

	if (ret < 0)

		goto be_err;



	mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass);

	snd_soc_dpcm_mutex_lock(fe);



	/* calculate valid and active FE <-> BE dpcms */

	dpcm_process_paths(fe, stream, &list, 1);
@@ -182,9 +182,9 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) 
	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;



	snd_soc_runtime_activate(fe, stream);

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

	snd_soc_dpcm_mutex_unlock(fe);



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

	snd_soc_card_mutex_unlock(fe->card);



	return 0;
@@ -196,7 +196,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) 
	dpcm_path_put(&list);

be_err:

	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;

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

	snd_soc_card_mutex_unlock(fe->card);

	return ret;

}
@@ -207,9 +207,9 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) 
	struct snd_soc_dpcm *dpcm;

	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */



	mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);

	snd_soc_card_mutex_lock(fe->card);



	mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass);

	snd_soc_dpcm_mutex_lock(fe);

	snd_soc_runtime_deactivate(fe, stream);



	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE;
@@ -229,7 +229,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) 


	dpcm_be_disconnect(fe, stream);



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

	snd_soc_dpcm_mutex_unlock(fe);



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


	snd_soc_dai_compr_shutdown(cpu_dai, cstream, 0);



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

	snd_soc_card_mutex_unlock(fe->card);

	return 0;

}
@@ -249,7 +249,7 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd) 
	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */

	int ret;



	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);

	snd_soc_dpcm_mutex_lock(rtd);



	ret = snd_soc_component_compr_trigger(cstream, cmd);

	if (ret < 0)
@@ -269,7 +269,7 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd) 
	}



out:

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

	snd_soc_dpcm_mutex_unlock(rtd);

	return ret;

}
@@ -284,7 +284,7 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd) 
	    cmd == SND_COMPR_TRIGGER_DRAIN)

		return snd_soc_component_compr_trigger(cstream, cmd);



	mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);

	snd_soc_card_mutex_lock(fe->card);



	ret = snd_soc_dai_compr_trigger(cpu_dai, cstream, cmd);

	if (ret < 0)
@@ -315,7 +315,7 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd) 


out:

	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;

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

	snd_soc_card_mutex_unlock(fe->card);

	return ret;

}
@@ -327,7 +327,7 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream, 
	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */

	int ret;



	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);

	snd_soc_dpcm_mutex_lock(rtd);



	/*

	 * First we call set_params for the CPU DAI, then the component
@@ -352,14 +352,14 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream, 


	/* cancel any delayed stream shutdown that is pending */

	rtd->pop_wait = 0;

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

	snd_soc_dpcm_mutex_unlock(rtd);



	cancel_delayed_work_sync(&rtd->delayed_work);



	return 0;



err:

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

	snd_soc_dpcm_mutex_unlock(rtd);

	return ret;

}
@@ -373,7 +373,7 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream, 
	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */

	int ret;



	mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);

	snd_soc_card_mutex_lock(fe->card);



	/*

	 * Create an empty hw_params for the BE as the machine driver must
@@ -404,14 +404,14 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream, 
	ret = snd_soc_link_compr_set_params(cstream);

	if (ret < 0)

		goto out;

	mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass);

	snd_soc_dpcm_mutex_lock(fe);

	dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_START);

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

	snd_soc_dpcm_mutex_unlock(fe);

	fe->dpcm[stream].state = SND_SOC_DPCM_STATE_PREPARE;



out:

	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;

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

	snd_soc_card_mutex_unlock(fe->card);

	return ret;

}
@@ -422,7 +422,7 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream, 
	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	int ret = 0;



	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);

	snd_soc_dpcm_mutex_lock(rtd);



	ret = snd_soc_dai_compr_get_params(cpu_dai, cstream, params);

	if (ret < 0)
@@ -430,7 +430,7 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream, 


	ret = snd_soc_component_compr_get_params(cstream, params);

err:

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

	snd_soc_dpcm_mutex_unlock(rtd);

	return ret;

}
@@ -440,7 +440,7 @@ static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes) 
	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	int ret;



	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);

	snd_soc_dpcm_mutex_lock(rtd);



	ret = snd_soc_dai_compr_ack(cpu_dai, cstream, bytes);

	if (ret < 0)
@@ -448,7 +448,7 @@ static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes) 


	ret = snd_soc_component_compr_ack(cstream, bytes);

err:

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

	snd_soc_dpcm_mutex_unlock(rtd);

	return ret;

}
@@ -459,7 +459,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream, 
	int ret;

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);



	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);

	snd_soc_dpcm_mutex_lock(rtd);



	ret = snd_soc_dai_compr_pointer(cpu_dai, cstream, tstamp);

	if (ret < 0)
@@ -467,7 +467,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream, 


	ret = snd_soc_component_compr_pointer(cstream, tstamp);

out:

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

	snd_soc_dpcm_mutex_unlock(rtd);

	return ret;

}