Update locking for snd_soc_dapm_xxxx_pin functions
Subsystems (8)
v2 cover Update locking for snd_soc_dapm_xxxx_pin functions
This patchset updates the locking around the snd_soc_dapm_xxxx_pin functions. First we add an unlocked version of the functions and add locking to the standard call, this also requires us to remove the few places where these functions are externally locked. Then we patch usages of the functions that look like they are expecting to do an atomic update to do so, using external locking.
Thanks,
Charles
Updates since v1:
- Added helper functions to lock/unlock the dapm mutex
- Added an unlocked version of snd_soc_dapm_sync, so it can be called under the same mutex lock as the pin functions, this is not required just saves a mutex lock
Charles Keepax (17):
Input - arizona-haptics: Fix double lock of dapm_mutex
ASoC: dapm: Add helpers to lock/unlock DAPM mutex
ASoC: dapm: Add locking to snd_soc_dapm_xxxx_pin functions
ASoC: dapm: Add unlocked version of snd_soc_dapm_sync
ASoC: adav80x: Update locking around use of DAPM pin API
ASoC: wm5100: Update locking around use of DAPM pin API
ASoC: wm8962: Update locking around use of DAPM pin API
ASoC: wm8994: Update locking around use of DAPM pin API
ASoC: wm8996: Update locking around use of DAPM pin API
ASoC: mfld_machine: Update locking around use of DAPM pin API
ASoC: ams-delta: Update locking around use of DAPM pin API
ASoC: omap: n810: Update locking around use of DAPM pin API
ASoC: omap: rx51: Update locking around use of DAPM pin API
ASoC: pxa: corgi: Update locking around use of DAPM pin API
ASoC: pxa: magician: Update locking around use of DAPM pin API
ASoC: pxa: spitz: Update locking around use of DAPM pin API
ASoC: pxa: tosa: Update locking around use of DAPM pin API
drivers/extcon/extcon-arizona.c | 12 --- drivers/input/misc/arizona-haptics.c | 19 ---- include/sound/soc-dapm.h | 9 ++ include/sound/soc.h | 9 ++ sound/soc/codecs/adav80x.c | 17 +++-- sound/soc/codecs/wm5100.c | 12 ++- sound/soc/codecs/wm8962.c | 13 ++- sound/soc/codecs/wm8994.c | 45 ++++++---- sound/soc/codecs/wm8996.c | 9 ++- sound/soc/intel/mfld_machine.c | 65 +++++++++----- sound/soc/omap/ams-delta.c | 45 ++++++---- sound/soc/omap/n810.c | 22 +++-- sound/soc/omap/rx51.c | 22 +++-- sound/soc/pxa/corgi.c | 42 +++++---- sound/soc/pxa/magician.c | 22 +++-- sound/soc/pxa/spitz.c | 51 ++++++----- sound/soc/pxa/tosa.c | 28 ++++--- sound/soc/soc-dapm.c | 160 ++++++++++++++++++++++++++++++--- 18 files changed, 399 insertions(+), 203 deletions(-)
Signature · 1 line
1.7.2.5
PATCH v2 1/17 Input - arizona-haptics: Fix double lock of dapm_mutex
snd_soc_dapm_sync takes the dapm_mutex internally, but we currently take it externally as well. This patch fixes this.
--- drivers/input/misc/arizona-haptics.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-)
drivers/input/misc/arizona-haptics.c +4 -7
@@ -77,16 +77,14 @@ static void arizona_haptics_work(struct work_struct *work)return ; } +mutex_unlock (dapm_mutex); + ret =snd_soc_dapm_sync (arizona->dapm);if (ret !=0 ) {dev_err (arizona->dev,"Failed to sync DAPM: %d\n" , ret); -mutex_unlock (dapm_mutex);return ; } - -mutex_unlock (dapm_mutex); - }else {/* This disable sequence will be a noop if already enabled */ mutex_lock_nested (dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME );
@@ -99,16 +97,15 @@ static void arizona_haptics_work(struct work_struct *work)return ; } +mutex_unlock (dapm_mutex); + ret =snd_soc_dapm_sync (arizona->dapm);if (ret !=0 ) {dev_err (arizona->dev,"Failed to sync DAPM: %d\n" , ret); -mutex_unlock (dapm_mutex);return ; } -mutex_unlock (dapm_mutex); - ret = regmap_update_bits(arizona->regmap, ARIZONA_HAPTICS_CONTROL_1, ARIZONA_HAP_CTRL_MASK,
Signature · 1 line
1.7.2.5
Mark Brown
maintainerRe: [PATCH 01/17 v2] Input - arizona-haptics: Fix double lock of dapm_mutex
Quoted 2 lines · Charles Keepax
snd_soc_dapm_synctakes thedapm_mutexinternally, but we currently take it externally as well. This patch fixes this.
Dimitry, are you OK with this being merged via ASoC? The subsequent improvements to the infrastructure and fix this more generally build on top of this one so they'll need to go together.
Dmitry Torokhov
maintainerRe: [PATCH 01/17 v2] Input - arizona-haptics: Fix double lock of dapm_mutex
Quoted 8 lines · Mark Brown
Quoted 1 line · Charles Keepax
snd_soc_dapm_synctakes thedapm_mutexinternally, but we currentlytake
Quoted 1 line
it externally as well. This patch fixes this.
Dimitry, are you OK with this being merged via ASoC? The subsequent improvements to the infrastructure and fix this more generally build on top of this one so they'll need to go together.
Sure, please go ahead.
Thanks.
Signature · 1 line
Dmitry
Re: [PATCH 01/17 v2] Input - arizona-haptics: Fix double lock of dapm_mutex
In reply to Charles KeepaxQuoted 2 lines · Charles Keepax
snd_soc_dapm_synctakes thedapm_mutexinternally, but we currently take it externally as well. This patch fixes this.
Applied, thanks.
PATCH v2 2/17 ASoC: dapm: Add helpers to lock/unlock DAPM mutex
In reply to Charles KeepaxAcquiring the DAPM mutex is necessary before using several DAPM functions and dereference is quite ugly. This patch provides a helper function to simplify this.
--- include/sound/soc.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
include/sound/soc.h +11 -0
@@ -1204,4 +1204,15 @@ 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) +{ +mutex_lock (&dapm->card->dapm_mutex); +} + +static inline void snd_soc_dapm_mutex_unlock (struct snd_soc_dapm_context *dapm) +{ +mutex_unlock (&dapm->card->dapm_mutex); +} +#endif
Signature · 1 line
1.7.2.5
Re: [PATCH 02/17 v2] ASoC: dapm: Add helpers to lock/unlock DAPM mutex
Quoted 3 lines · Charles Keepax
Acquiring the DAPM mutex is necessary before using several DAPM functions and dereference is quite ugly. This patch provides a helper function to simplify this.
Applied, thanks.
PATCH v2 3/17 ASoC: dapm: Add locking to snd_soc_dapm_xxxx_pin functions
In reply to Charles KeepaxThe snd_soc_dapm_xxxx_pin all require the dapm_mutex to be held when they are called as they edit the dirty list, however very few of the callers do so.
This patch adds unlocked versions of all the functions replacing the existing implementations with one that holds the lock internally. We also fix up the places where the lock was actually held on the caller side.
--- drivers/extcon/extcon-arizona.c | 12 --- drivers/input/misc/arizona-haptics.c | 16 ---- include/sound/soc-dapm.h | 8 ++ sound/soc/soc-dapm.c | 133 +++++++++++++++++++++++++++++++--- 4 files changed, 131 insertions(+), 38 deletions(-)
drivers/extcon/extcon-arizona.c +0 -12
@@ -222,27 +222,19 @@ static void arizona_extcon_pulse_micbias(struct arizona_extcon_info *info)struct snd_soc_dapm_context *dapm = arizona->dapm;int ret; -mutex_lock (&dapm->card->dapm_mutex); - ret =snd_soc_dapm_force_enable_pin (dapm, widget);if (ret !=0 )dev_warn (arizona->dev,"Failed to enable %s: %d\n" , widget, ret); -mutex_unlock (&dapm->card->dapm_mutex); -snd_soc_dapm_sync (dapm);if (!arizona->pdata.micd_force_micbias) { -mutex_lock (&dapm->card->dapm_mutex); - ret =snd_soc_dapm_disable_pin (arizona->dapm, widget);if (ret !=0 )dev_warn (arizona->dev,"Failed to disable %s: %d\n" , widget, ret); -mutex_unlock (&dapm->card->dapm_mutex); -snd_soc_dapm_sync (dapm); } }
@@ -304,16 +296,12 @@ static void arizona_stop_mic(struct arizona_extcon_info *info)ARIZONA_MICD_ENA ,0 , &change); -mutex_lock (&dapm->card->dapm_mutex); - ret =snd_soc_dapm_disable_pin (dapm, widget);if (ret !=0 )dev_warn (arizona->dev,"Failed to disable %s: %d\n" , widget, ret); -mutex_unlock (&dapm->card->dapm_mutex); -snd_soc_dapm_sync (dapm);if (info->micd_reva) {
drivers/input/misc/arizona-haptics.c +0 -16
@@ -37,7 +37,6 @@ static void arizona_haptics_work(struct work_struct *work) struct arizona_haptics, work);struct arizona *arizona = haptics->arizona; -struct mutex *dapm_mutex = &arizona->dapm->card->dapm_mutex;int ret;if (!haptics->arizona->dapm) {
@@ -67,18 +66,13 @@ static void arizona_haptics_work(struct work_struct *work)return ; } -mutex_lock_nested (dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); - ret =snd_soc_dapm_enable_pin (arizona->dapm,"HAPTICS" );if (ret !=0 ) {dev_err (arizona->dev,"Failed to start HAPTICS: %d\n" , ret); -mutex_unlock (dapm_mutex);return ; } -mutex_unlock (dapm_mutex); - ret =snd_soc_dapm_sync (arizona->dapm);if (ret !=0 ) { dev_err(arizona->dev, "Failed to sync DAPM: %d\n",
@@ -87,18 +81,13 @@ static void arizona_haptics_work(struct work_struct *work) } }else {/* This disable sequence will be a noop if already enabled */ -mutex_lock_nested (dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); - ret =snd_soc_dapm_disable_pin (arizona->dapm,"HAPTICS" );if (ret !=0 ) {dev_err (arizona->dev,"Failed to disable HAPTICS: %d\n" , ret); -mutex_unlock (dapm_mutex);return ; } -mutex_unlock (dapm_mutex); - ret =snd_soc_dapm_sync (arizona->dapm);if (ret !=0 ) { dev_err(arizona->dev, "Failed to sync DAPM: %d\n",
@@ -152,16 +141,11 @@ static int arizona_haptics_play(struct input_dev *input, void *data,static void arizona_haptics_close (struct input_dev *input) {struct arizona_haptics *haptics =input_get_drvdata (input); -struct mutex *dapm_mutex = &haptics->arizona->dapm->card->dapm_mutex;cancel_work_sync (&haptics->work); -mutex_lock_nested (dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); -if (haptics->arizona->dapm)snd_soc_dapm_disable_pin (haptics->arizona->dapm,"HAPTICS" ); - -mutex_unlock (dapm_mutex); }static int arizona_haptics_probe (struct platform_device *pdev)
include/sound/soc-dapm.h +8 -0
@@ -449,14 +449,22 @@ void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,/* dapm audio pin control and status */ int snd_soc_dapm_enable_pin (struct snd_soc_dapm_context *dapm,const char *pin); +int snd_soc_dapm_enable_pin_unlocked (struct snd_soc_dapm_context *dapm, +const char *pin);int snd_soc_dapm_disable_pin (struct snd_soc_dapm_context *dapm,const char *pin); +int snd_soc_dapm_disable_pin_unlocked (struct snd_soc_dapm_context *dapm, +const char *pin);int snd_soc_dapm_nc_pin (struct snd_soc_dapm_context *dapm,const char *pin); +int snd_soc_dapm_nc_pin_unlocked (struct snd_soc_dapm_context *dapm, +const char *pin);int snd_soc_dapm_get_pin_status (struct snd_soc_dapm_context *dapm,const char *pin);int snd_soc_dapm_sync (struct snd_soc_dapm_context *dapm);int snd_soc_dapm_force_enable_pin (struct snd_soc_dapm_context *dapm,const char *pin); +int snd_soc_dapm_force_enable_pin_unlocked (struct snd_soc_dapm_context *dapm, +const char *pin);int snd_soc_dapm_ignore_suspend (struct snd_soc_dapm_context *dapm,const char *pin);void snd_soc_dapm_auto_nc_codec_pins (struct snd_soc_codec *codec);
sound/soc/soc-dapm.c +123 -10
204 lines not on this page · raw message
Signature · 1 line
1.7.2.5
Re: [PATCH 03/17 v2] ASoC: dapm: Add locking to snd_soc_dapm_xxxx_pin functions
Quoted 3 lines · Charles Keepax
The
snd_soc_dapm_xxxx_pinall require thedapm_mutexto be held when they are called as they edit the dirty list, however very few of the callers do so.
Applied, thanks.
PATCH v2 4/17 ASoC: dapm: Add unlocked version of snd_soc_dapm_sync
In reply to Charles KeepaxWe will often call sync after several functions that require the DAPM mutex to be held. Rather than release and immediately relock the mutex provide an unlocked function for this situation.
--- include/sound/soc-dapm.h | 1 + sound/soc/soc-dapm.c | 27 ++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-)
include/sound/soc-dapm.h +1 -0
@@ -461,6 +461,7 @@ int snd_soc_dapm_nc_pin_unlocked(struct snd_soc_dapm_context *dapm,int snd_soc_dapm_get_pin_status (struct snd_soc_dapm_context *dapm,const char *pin);int snd_soc_dapm_sync (struct snd_soc_dapm_context *dapm); +int snd_soc_dapm_sync_unlocked (struct snd_soc_dapm_context *dapm);int snd_soc_dapm_force_enable_pin (struct snd_soc_dapm_context *dapm,const char *pin); int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,
sound/soc/soc-dapm.c +22 -5
@@ -2342,18 +2342,18 @@ static int snd_soc_dapm_set_pin(struct snd_soc_dapm_context *dapm, }/** -* snd_soc_dapm_sync - scan and power dapm paths +* snd_soc_dapm_sync_unlocked - scan and power dapm paths * @dapm: DAPM context * * Walks all dapm audio paths and powers widgets according to their * stream or path usage. * +* Requires external locking. +* * Returns 0 for success. */ -int snd_soc_dapm_sync (struct snd_soc_dapm_context *dapm) +int snd_soc_dapm_sync_unlocked (struct snd_soc_dapm_context *dapm) { -int ret; -/* * Suppress early reports (eg, jacks syncing their state) to avoid * silly DAPM runs during card startup.
@@ -2361,8 +2361,25 @@ int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm)if (!dapm->card || !dapm->card->instantiated)return 0 ; +return dapm_power_widgets (dapm->card,SND_SOC_DAPM_STREAM_NOP ); +} +EXPORT_SYMBOL_GPL (snd_soc_dapm_sync_unlocked); + +/** +* snd_soc_dapm_sync - scan and power dapm paths +* @dapm: DAPM context +* +* Walks all dapm audio paths and powers widgets according to their +* stream or path usage. +* +* Returns 0 for success. +*/ +int snd_soc_dapm_sync (struct snd_soc_dapm_context *dapm) +{ +int ret; +mutex_lock_nested (&dapm->card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); - ret =dapm_power_widgets (dapm->card,SND_SOC_DAPM_STREAM_NOP ); + ret =snd_soc_dapm_sync_unlocked (dapm);mutex_unlock (&dapm->card->dapm_mutex);return ret; }
Signature · 1 line
1.7.2.5
Lars-Peter Clausen
maintainerRe: [PATCH 04/17 v2] ASoC: dapm: Add unlocked version of snd_soc_dapm_sync
Quoted 5 lines · Charles Keepax
We will often call sync after several functions that require the DAPM mutex to be held. Rather than release and immediately relock the mutex provide an unlocked function for this situation.
Signed-off-by Charles Keepax <[email protected]>
We should add lockdep_assert() to the unlocked versions to catch broken users, but that can be done in a follow-up patch.
Mark Brown
maintainerRe: [PATCH 04/17 v2] ASoC: dapm: Add unlocked version of snd_soc_dapm_sync
Quoted 2 lines · Lars-Peter Clausen
We should add
lockdep_assert()to the unlocked versions to catch broken users, but that can be done in a follow-up patch.
Yes, and not just in these ones either - we've got the other existing APIs that should have annotations added as well.
Re: [PATCH 04/17 v2] ASoC: dapm: Add unlocked version of snd_soc_dapm_sync
In reply to Charles KeepaxQuoted 3 lines · Charles Keepax
We will often call sync after several functions that require the DAPM mutex to be held. Rather than release and immediately relock the mutex provide an unlocked function for this situation.
Applied, thanks.
PATCH v2 5/17 ASoC: adav80x: Update locking around use of DAPM pin API
In reply to Charles KeepaxThe pin updates in this driver look like they are intended to be done atomically, update to do so.
--- sound/soc/codecs/adav80x.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
sound/soc/codecs/adav80x.c +11 -6
@@ -539,6 +539,7 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec, unsigned int freq, int dir) {struct adav80x *adav80x =snd_soc_codec_get_drvdata (codec); +struct snd_soc_dapm_context *dapm = &codec->dapm;if (dir ==SND_SOC_CLOCK_IN ) {switch (clk_id) {
@@ -571,7 +572,7 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec,regmap_write (adav80x->regmap,ADAV80X_ICLK_CTRL2 , iclk_ctrl2); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_sync (dapm); } }else {unsigned int mask;
@@ -598,17 +599,21 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec, adav80x->sysclk_pd[clk_id] = false; } +snd_soc_dapm_mutex_lock (dapm); +if (adav80x->sysclk_pd[0 ]) -snd_soc_dapm_disable_pin (&codec->dapm,"PLL1" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"PLL1" );else -snd_soc_dapm_force_enable_pin (&codec->dapm,"PLL1" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"PLL1" );if (adav80x->sysclk_pd[1 ] || adav80x->sysclk_pd[2 ]) -snd_soc_dapm_disable_pin (&codec->dapm,"PLL2" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"PLL2" );else -snd_soc_dapm_force_enable_pin (&codec->dapm,"PLL2" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"PLL2" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_sync_unlocked (dapm); + +snd_soc_dapm_mutex_unlock (dapm); }return 0 ;
Signature · 1 line
1.7.2.5
Re: [PATCH 05/17 v2] ASoC: adav80x: Update locking around use of DAPM pin API
Quoted 4 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so.
Signed-off-by Charles Keepax <[email protected]>
Thanks.
Quoted 53 lines
--- sound/soc/codecs/adav80x.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)sound/soc/codecs/adav80x.c +11
-6@@ -539,6 +539,7 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec, unsigned int freq, int dir) {struct adav80x *adav80x =snd_soc_codec_get_drvdata (codec); +struct snd_soc_dapm_context *dapm = &codec->dapm;if (dir ==SND_SOC_CLOCK_IN ) {switch (clk_id) {@@ -571,7 +572,7 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec,regmap_write (adav80x->regmap,ADAV80X_ICLK_CTRL2 , iclk_ctrl2); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_sync (dapm); } }else {unsigned int mask;@@ -598,17 +599,21 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec, adav80x->sysclk_pd[clk_id] = false; } +snd_soc_dapm_mutex_lock (dapm); +if (adav80x->sysclk_pd[0 ]) -snd_soc_dapm_disable_pin (&codec->dapm,"PLL1" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"PLL1" );else -snd_soc_dapm_force_enable_pin (&codec->dapm,"PLL1" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"PLL1" );if (adav80x->sysclk_pd[1 ] || adav80x->sysclk_pd[2 ]) -snd_soc_dapm_disable_pin (&codec->dapm,"PLL2" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"PLL2" );else -snd_soc_dapm_force_enable_pin (&codec->dapm,"PLL2" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"PLL2" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_sync_unlocked (dapm); + +snd_soc_dapm_mutex_unlock (dapm); }return 0 ;
Re: [PATCH 05/17 v2] ASoC: adav80x: Update locking around use of DAPM pin API
In reply to Charles KeepaxQuoted 2 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so.
Applied, thanks.
PATCH v2 6/17 ASoC: wm5100: Update locking around use of DAPM pin API
In reply to Charles KeepaxThe pin updates in this driver look like they are intended to be done atomically, update to do so.
--- sound/soc/codecs/wm5100.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)
sound/soc/codecs/wm5100.c +9 -3
@@ -2100,6 +2100,7 @@ static void wm5100_micd_irq(struct wm5100_priv *wm5100)int wm5100_detect (struct snd_soc_codec *codec,struct snd_soc_jack *jack) {struct wm5100_priv *wm5100 =snd_soc_codec_get_drvdata (codec); +struct snd_soc_dapm_context *dapm = &codec->dapm;if (jack) { wm5100->jack = jack;
@@ -2117,9 +2118,14 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) WM5100_ACCDET_RATE_MASK);/* We need the charge pump to power MICBIAS */ -snd_soc_dapm_force_enable_pin (&codec->dapm,"CP2" ); -snd_soc_dapm_force_enable_pin (&codec->dapm,"SYSCLK" ); -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_mutex_lock (dapm); + +snd_soc_dapm_force_enable_pin_unlocked (dapm,"CP2" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"SYSCLK" ); + +snd_soc_dapm_sync_unlocked (dapm); + +snd_soc_dapm_mutex_unlock (dapm);/* We start off just enabling microphone detection - even a * plain headphone will trigger detection.
Signature · 1 line
1.7.2.5
Re: [PATCH 06/17 v2] ASoC: wm5100: Update locking around use of DAPM pin API
Quoted 2 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so.
Applied, thanks.
PATCH v2 7/17 ASoC: wm8962: Update locking around use of DAPM pin API
In reply to Charles KeepaxThe pin updates in this driver look like they are intended to be done atomically, update to do so.
--- sound/soc/codecs/wm8962.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)
sound/soc/codecs/wm8962.c +9 -4
@@ -3106,6 +3106,7 @@ static irqreturn_t wm8962_irq(int irq, void *data)int wm8962_mic_detect (struct snd_soc_codec *codec,struct snd_soc_jack *jack) {struct wm8962_priv *wm8962 =snd_soc_codec_get_drvdata (codec); +struct snd_soc_dapm_context *dapm = &codec->dapm;int irq_mask, enable; wm8962->jack = jack;
@@ -3126,14 +3127,18 @@ int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)snd_soc_jack_report (wm8962->jack,0 ,SND_JACK_MICROPHONE |SND_JACK_BTN_0 ); +snd_soc_dapm_mutex_lock (dapm); +if (jack) { -snd_soc_dapm_force_enable_pin (&codec->dapm,"SYSCLK" ); -snd_soc_dapm_force_enable_pin (&codec->dapm,"MICBIAS" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"SYSCLK" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"MICBIAS" ); }else { -snd_soc_dapm_disable_pin (&codec->dapm,"SYSCLK" ); -snd_soc_dapm_disable_pin (&codec->dapm,"MICBIAS" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"SYSCLK" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"MICBIAS" ); } +snd_soc_dapm_mutex_unlock (dapm); +return 0 ; }EXPORT_SYMBOL_GPL (wm8962_mic_detect);
Signature · 1 line
1.7.2.5
Re: [PATCH 07/17 v2] ASoC: wm8962: Update locking around use of DAPM pin API
Quoted 2 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so.
Applied, thanks.
PATCH v2 8/17 ASoC: wm8994: Update locking around use of DAPM pin API
In reply to Charles KeepaxThe pin updates in this driver look like they are intended to be done atomically, update to do so.
--- sound/soc/codecs/wm8994.c | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-)
sound/soc/codecs/wm8994.c +27 -18
@@ -2549,43 +2549,52 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,int wm8994_vmid_mode (struct snd_soc_codec *codec,enum wm8994_vmid_mode mode) {struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec); +struct snd_soc_dapm_context *dapm = &codec->dapm;switch (mode) {case WM8994_VMID_NORMAL : +snd_soc_dapm_mutex_lock (dapm); +if (wm8994->hubs.lineout1_se) { -snd_soc_dapm_disable_pin (&codec->dapm, -"LINEOUT1N Driver" ); -snd_soc_dapm_disable_pin (&codec->dapm, -"LINEOUT1P Driver" ); +snd_soc_dapm_disable_pin_unlocked (dapm, +"LINEOUT1N Driver" ); +snd_soc_dapm_disable_pin_unlocked (dapm, +"LINEOUT1P Driver" ); }if (wm8994->hubs.lineout2_se) { -snd_soc_dapm_disable_pin (&codec->dapm, -"LINEOUT2N Driver" ); -snd_soc_dapm_disable_pin (&codec->dapm, -"LINEOUT2P Driver" ); +snd_soc_dapm_disable_pin_unlocked (dapm, +"LINEOUT2N Driver" ); +snd_soc_dapm_disable_pin_unlocked (dapm, +"LINEOUT2P Driver" ); }/* Do the sync with the old mode to allow it to clean up */ -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_sync_unlocked (dapm); wm8994->vmid_mode = mode; + +snd_soc_dapm_mutex_unlock (dapm);break ;case WM8994_VMID_FORCE : +snd_soc_dapm_mutex_lock (dapm); +if (wm8994->hubs.lineout1_se) { -snd_soc_dapm_force_enable_pin (&codec->dapm, -"LINEOUT1N Driver" ); -snd_soc_dapm_force_enable_pin (&codec->dapm, -"LINEOUT1P Driver" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm, +"LINEOUT1N Driver" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm, +"LINEOUT1P Driver" ); }if (wm8994->hubs.lineout2_se) { -snd_soc_dapm_force_enable_pin (&codec->dapm, -"LINEOUT2N Driver" ); -snd_soc_dapm_force_enable_pin (&codec->dapm, -"LINEOUT2P Driver" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm, +"LINEOUT2N Driver" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm, +"LINEOUT2P Driver" ); } wm8994->vmid_mode = mode; -snd_soc_dapm_sync (&codec->dapm); +snd_soc_dapm_sync_unlocked (dapm); + +snd_soc_dapm_mutex_unlock (dapm);break ;default :
Signature · 1 line
1.7.2.5
Re: [PATCH 08/17 v2] ASoC: wm8994: Update locking around use of DAPM pin API
Quoted 2 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so.
Applied, thanks.
PATCH v2 9/17 ASoC: wm8996: Update locking around use of DAPM pin API
In reply to Charles KeepaxThe pin updates in this driver look like they are intended to be done atomically, update to do so.
--- sound/soc/codecs/wm8996.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
sound/soc/codecs/wm8996.c +7 -2
@@ -2251,6 +2251,7 @@ int wm8996_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, wm8996_polarity_fn polarity_cb) {struct wm8996_priv *wm8996 =snd_soc_codec_get_drvdata (codec); +struct snd_soc_dapm_context *dapm = &codec->dapm; wm8996->jack = jack; wm8996->detecting = true;
@@ -2267,8 +2268,12 @@ int wm8996_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, WM8996_MICB2_DISCH, 0);/* LDO2 powers the microphones, SYSCLK clocks detection */ -snd_soc_dapm_force_enable_pin (&codec->dapm,"LDO2" ); -snd_soc_dapm_force_enable_pin (&codec->dapm,"SYSCLK" ); +snd_soc_dapm_mutex_lock (dapm); + +snd_soc_dapm_force_enable_pin_unlocked (dapm,"LDO2" ); +snd_soc_dapm_force_enable_pin_unlocked (dapm,"SYSCLK" ); + +snd_soc_dapm_mutex_unlock (dapm);/* We start off just enabling microphone detection - even a * plain headphone will trigger detection.
Signature · 1 line
1.7.2.5
Re: [PATCH 09/17 v2] ASoC: wm8996: Update locking around use of DAPM pin API
Quoted 2 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so.
Applied, thanks.
PATCH v2 10/17 ASoC: mfld_machine: Update locking around use of DAPM pin API
In reply to Charles KeepaxThe pin updates in this driver look like they are intended to be done atomically, update to do so.
--- sound/soc/intel/mfld_machine.c | 65 +++++++++++++++++++++++++--------------- 1 files changed, 41 insertions(+), 24 deletions(-)
sound/soc/intel/mfld_machine.c +41 -24
@@ -101,20 +101,27 @@ static int headset_set_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol); +struct snd_soc_dapm_context *dapm = &codec->dapm;if (ucontrol->value.integer.value[0 ] == hs_switch)return 0 ; +snd_soc_dapm_mutex_lock (dapm); +if (ucontrol->value.integer.value[0 ]) {pr_debug ("hs_set HS path\n" ); -snd_soc_dapm_enable_pin (&codec->dapm,"Headphones" ); -snd_soc_dapm_disable_pin (&codec->dapm,"EPOUT" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Headphones" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"EPOUT" ); }else {pr_debug ("hs_set EP path\n" ); -snd_soc_dapm_disable_pin (&codec->dapm,"Headphones" ); -snd_soc_dapm_enable_pin (&codec->dapm,"EPOUT" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphones" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"EPOUT" ); } -snd_soc_dapm_sync (&codec->dapm); + +snd_soc_dapm_sync_unlocked (dapm); + +snd_soc_dapm_mutex_unlock (dapm); + hs_switch = ucontrol->value.integer.value[0 ];return 0 ;
@@ -122,18 +129,20 @@ static int headset_set_switch(struct snd_kcontrol *kcontrol,static void lo_enable_out_pins (struct snd_soc_codec *codec) { -snd_soc_dapm_enable_pin (&codec->dapm,"IHFOUTL" ); -snd_soc_dapm_enable_pin (&codec->dapm,"IHFOUTR" ); -snd_soc_dapm_enable_pin (&codec->dapm,"LINEOUTL" ); -snd_soc_dapm_enable_pin (&codec->dapm,"LINEOUTR" ); -snd_soc_dapm_enable_pin (&codec->dapm,"VIB1OUT" ); -snd_soc_dapm_enable_pin (&codec->dapm,"VIB2OUT" ); +struct snd_soc_dapm_context *dapm = &codec->dapm; + +snd_soc_dapm_enable_pin_unlocked (dapm,"IHFOUTL" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"IHFOUTR" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"LINEOUTL" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"LINEOUTR" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"VIB1OUT" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"VIB2OUT" );if (hs_switch) { -snd_soc_dapm_enable_pin (&codec->dapm,"Headphones" ); -snd_soc_dapm_disable_pin (&codec->dapm,"EPOUT" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Headphones" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"EPOUT" ); }else { -snd_soc_dapm_disable_pin (&codec->dapm,"Headphones" ); -snd_soc_dapm_enable_pin (&codec->dapm,"EPOUT" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphones" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"EPOUT" ); } }
@@ -148,44 +157,52 @@ static int lo_set_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol); +struct snd_soc_dapm_context *dapm = &codec->dapm;if (ucontrol->value.integer.value[0 ] == lo_dac)return 0 ; +snd_soc_dapm_mutex_lock (dapm); +/* we dont want to work with last state of lineout so just enable all * pins and then disable pins not required */ lo_enable_out_pins (codec); +switch (ucontrol->value.integer.value[0 ]) {case 0 :pr_debug ("set vibra path\n" ); -snd_soc_dapm_disable_pin (&codec->dapm,"VIB1OUT" ); -snd_soc_dapm_disable_pin (&codec->dapm,"VIB2OUT" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"VIB1OUT" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"VIB2OUT" );snd_soc_update_bits (codec,SN95031_LOCTL ,0x66 ,0 );break ;case 1 :pr_debug ("set hs path\n" ); -snd_soc_dapm_disable_pin (&codec->dapm,"Headphones" ); -snd_soc_dapm_disable_pin (&codec->dapm,"EPOUT" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphones" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"EPOUT" );snd_soc_update_bits (codec,SN95031_LOCTL ,0x66 ,0x22 );break ;case 2 :pr_debug ("set spkr path\n" ); -snd_soc_dapm_disable_pin (&codec->dapm,"IHFOUTL" ); -snd_soc_dapm_disable_pin (&codec->dapm,"IHFOUTR" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"IHFOUTL" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"IHFOUTR" );snd_soc_update_bits (codec,SN95031_LOCTL ,0x66 ,0x44 );break ;case 3 :pr_debug ("set null path\n" ); -snd_soc_dapm_disable_pin (&codec->dapm,"LINEOUTL" ); -snd_soc_dapm_disable_pin (&codec->dapm,"LINEOUTR" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"LINEOUTL" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"LINEOUTR" );snd_soc_update_bits (codec,SN95031_LOCTL ,0x66 ,0x66 );break ; } -snd_soc_dapm_sync (&codec->dapm); + +snd_soc_dapm_sync_unlocked (dapm); + +snd_soc_dapm_mutex_unlock (dapm); + lo_dac = ucontrol->value.integer.value[0 ];return 0 ; }
Signature · 1 line
1.7.2.5
Re: [PATCH 10/17 v2] ASoC: mfld_machine: Update locking around use of DAPM pin API
Quoted 2 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so.
Applied, thanks.
PATCH v2 11/17 ASoC: ams-delta: Update locking around use of DAPM pin API
In reply to Charles KeepaxThe pin updates in this driver look like they are intended to be done atomically, update to do so. It looks like these were originally locked with the CODEC mutex and not updated since the patch "ASoC: dapm: Use DAPM mutex for DAPM ops instead of codec mutex", so remove the original CODEC mutex locking as well.
--- sound/soc/omap/ams-delta.c | 45 +++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 19 deletions(-)
sound/soc/omap/ams-delta.c +26 -19
@@ -106,57 +106,59 @@ static int ams_delta_set_audio_mode(struct snd_kcontrol *kcontrol,if (ucontrol->value.enumerated.item[0 ] >= control->max)return -EINVAL ; -mutex_lock (&codec->mutex); +snd_soc_dapm_mutex_lock (dapm);/* Translate selection to bitmap */ pins = ams_delta_audio_mode_pins[ucontrol->value.enumerated.item[0 ]];/* Setup pins after corresponding bits if changed */ pin = !!(pins & (1 <<AMS_DELTA_MOUTHPIECE )); +if (pin !=snd_soc_dapm_get_pin_status (dapm,"Mouthpiece" )) { changed =1 ;if (pin) -snd_soc_dapm_enable_pin (dapm,"Mouthpiece" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Mouthpiece" );else -snd_soc_dapm_disable_pin (dapm,"Mouthpiece" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Mouthpiece" ); } pin = !!(pins & (1 <<AMS_DELTA_EARPIECE ));if (pin !=snd_soc_dapm_get_pin_status (dapm,"Earpiece" )) { changed =1 ;if (pin) -snd_soc_dapm_enable_pin (dapm,"Earpiece" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Earpiece" );else -snd_soc_dapm_disable_pin (dapm,"Earpiece" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Earpiece" ); } pin = !!(pins & (1 <<AMS_DELTA_MICROPHONE ));if (pin !=snd_soc_dapm_get_pin_status (dapm,"Microphone" )) { changed =1 ;if (pin) -snd_soc_dapm_enable_pin (dapm,"Microphone" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Microphone" );else -snd_soc_dapm_disable_pin (dapm,"Microphone" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Microphone" ); } pin = !!(pins & (1 <<AMS_DELTA_SPEAKER ));if (pin !=snd_soc_dapm_get_pin_status (dapm,"Speaker" )) { changed =1 ;if (pin) -snd_soc_dapm_enable_pin (dapm,"Speaker" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Speaker" );else -snd_soc_dapm_disable_pin (dapm,"Speaker" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Speaker" ); } pin = !!(pins & (1 <<AMS_DELTA_AGC ));if (pin != ams_delta_audio_agc) { ams_delta_audio_agc = pin; changed =1 ;if (pin) -snd_soc_dapm_enable_pin (dapm,"AGCIN" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"AGCIN" );else -snd_soc_dapm_disable_pin (dapm,"AGCIN" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"AGCIN" ); } +if (changed) -snd_soc_dapm_sync (dapm); +snd_soc_dapm_sync_unlocked (dapm); -mutex_unlock (&codec->mutex); +snd_soc_dapm_mutex_unlock (dapm);return changed; }
@@ -315,12 +317,17 @@ static void cx81801_close(struct tty_struct *tty) v253_ops.close (tty);/* Revert back to default audio input/output constellation */ -snd_soc_dapm_disable_pin (dapm,"Mouthpiece" ); -snd_soc_dapm_enable_pin (dapm,"Earpiece" ); -snd_soc_dapm_enable_pin (dapm,"Microphone" ); -snd_soc_dapm_disable_pin (dapm,"Speaker" ); -snd_soc_dapm_disable_pin (dapm,"AGCIN" ); -snd_soc_dapm_sync (dapm); +snd_soc_dapm_mutex_lock (dapm); + +snd_soc_dapm_disable_pin_unlocked (dapm,"Mouthpiece" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Earpiece" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Microphone" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Speaker" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"AGCIN" ); + +snd_soc_dapm_sync_unlocked (dapm); + +snd_soc_dapm_mutex_unlock (codec); }/* Line discipline .hangup() */
Signature · 1 line
1.7.2.5
Re: [PATCH 11/17 v2] ASoC: ams-delta: Update locking around use of DAPM pin API
Quoted 5 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so. It looks like these were originally locked with the CODEC mutex and not updated since the patch "ASoC: dapm: Use DAPM mutex for DAPM ops instead of codec mutex", so remove the original CODEC mutex locking as well.
Applied, thanks.
PATCH v2 12/17 ASoC: omap: n810: Update locking around use of DAPM pin API
In reply to Charles KeepaxThe pin updates in this driver look like they are intended to be done atomically, update to do so.
--- sound/soc/omap/n810.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-)
sound/soc/omap/n810.c +13 -9
@@ -68,26 +68,30 @@ static void n810_ext_control(struct snd_soc_dapm_context *dapm)break ; } +snd_soc_dapm_mutex_lock (dapm); +if (n810_spk_func) -snd_soc_dapm_enable_pin (dapm,"Ext Spk" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Ext Spk" );else -snd_soc_dapm_disable_pin (dapm,"Ext Spk" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Ext Spk" );if (hp) -snd_soc_dapm_enable_pin (dapm,"Headphone Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Headphone Jack" );else -snd_soc_dapm_disable_pin (dapm,"Headphone Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphone Jack" );if (line1l) -snd_soc_dapm_enable_pin (dapm,"LINE1L" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"LINE1L" );else -snd_soc_dapm_disable_pin (dapm,"LINE1L" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"LINE1L" );if (n810_dmic_func) -snd_soc_dapm_enable_pin (dapm,"DMic" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"DMic" );else -snd_soc_dapm_disable_pin (dapm,"DMic" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"DMic" ); + +snd_soc_dapm_sync_unlocked (dapm); -snd_soc_dapm_sync (dapm); +snd_soc_dapm_mutex_unlock (dapm); }static int n810_startup (struct snd_pcm_substream *substream)
Signature · 1 line
1.7.2.5
Re: [PATCH 12/17 v2] ASoC: omap: n810: Update locking around use of DAPM pin API
Quoted 2 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so.
Applied, thanks.
PATCH v2 13/17 ASoC: omap: rx51: Update locking around use of DAPM pin API
In reply to Charles KeepaxThe pin updates in this driver look like they are intended to be done atomically, update to do so.
--- sound/soc/omap/rx51.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-)
sound/soc/omap/rx51.c +13 -9
@@ -74,26 +74,30 @@ static void rx51_ext_control(struct snd_soc_dapm_context *dapm)break ; } +snd_soc_dapm_mutex_lock (dapm); +if (rx51_spk_func) -snd_soc_dapm_enable_pin (dapm,"Ext Spk" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Ext Spk" );else -snd_soc_dapm_disable_pin (dapm,"Ext Spk" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Ext Spk" );if (rx51_dmic_func) -snd_soc_dapm_enable_pin (dapm,"DMic" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"DMic" );else -snd_soc_dapm_disable_pin (dapm,"DMic" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"DMic" );if (hp) -snd_soc_dapm_enable_pin (dapm,"Headphone Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Headphone Jack" );else -snd_soc_dapm_disable_pin (dapm,"Headphone Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphone Jack" );if (hs) -snd_soc_dapm_enable_pin (dapm,"HS Mic" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"HS Mic" );else -snd_soc_dapm_disable_pin (dapm,"HS Mic" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"HS Mic" );gpio_set_value (RX51_TVOUT_SEL_GPIO , tvout); -snd_soc_dapm_sync (dapm); +snd_soc_dapm_sync_unlocked (dapm); + +snd_soc_dapm_mutex_unlock (dapm); }static int rx51_startup (struct snd_pcm_substream *substream)
Signature · 1 line
1.7.2.5
Re: [PATCH 13/17 v2] ASoC: omap: rx51: Update locking around use of DAPM pin API
Quoted 2 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so.
Applied, thanks.
PATCH v2 14/17 ASoC: pxa: corgi: Update locking around use of DAPM pin API
In reply to Charles KeepaxThe pin updates in this driver look like they are intended to be done atomically, update to do so.
--- sound/soc/pxa/corgi.c | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-)
sound/soc/pxa/corgi.c +23 -19
@@ -47,51 +47,55 @@ static int corgi_spk_func;static void corgi_ext_control (struct snd_soc_dapm_context *dapm) { +snd_soc_dapm_mutex_lock (dapm); +/* set up jack connection */ switch (corgi_jack_func) {case CORGI_HP :/* set = unmute headphone */ gpio_set_value (CORGI_GPIO_MUTE_L ,1 );gpio_set_value (CORGI_GPIO_MUTE_R ,1 ); -snd_soc_dapm_disable_pin (dapm,"Mic Jack" ); -snd_soc_dapm_disable_pin (dapm,"Line Jack" ); -snd_soc_dapm_enable_pin (dapm,"Headphone Jack" ); -snd_soc_dapm_disable_pin (dapm,"Headset Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Mic Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Line Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Headphone Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headset Jack" );break ;case CORGI_MIC :/* reset = mute headphone */ gpio_set_value (CORGI_GPIO_MUTE_L ,0 );gpio_set_value (CORGI_GPIO_MUTE_R ,0 ); -snd_soc_dapm_enable_pin (dapm,"Mic Jack" ); -snd_soc_dapm_disable_pin (dapm,"Line Jack" ); -snd_soc_dapm_disable_pin (dapm,"Headphone Jack" ); -snd_soc_dapm_disable_pin (dapm,"Headset Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Mic Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Line Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphone Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headset Jack" );break ;case CORGI_LINE :gpio_set_value (CORGI_GPIO_MUTE_L ,0 );gpio_set_value (CORGI_GPIO_MUTE_R ,0 ); -snd_soc_dapm_disable_pin (dapm,"Mic Jack" ); -snd_soc_dapm_enable_pin (dapm,"Line Jack" ); -snd_soc_dapm_disable_pin (dapm,"Headphone Jack" ); -snd_soc_dapm_disable_pin (dapm,"Headset Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Mic Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Line Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphone Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headset Jack" );break ;case CORGI_HEADSET :gpio_set_value (CORGI_GPIO_MUTE_L ,0 );gpio_set_value (CORGI_GPIO_MUTE_R ,1 ); -snd_soc_dapm_enable_pin (dapm,"Mic Jack" ); -snd_soc_dapm_disable_pin (dapm,"Line Jack" ); -snd_soc_dapm_disable_pin (dapm,"Headphone Jack" ); -snd_soc_dapm_enable_pin (dapm,"Headset Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Mic Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Line Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphone Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Headset Jack" );break ; }if (corgi_spk_func ==CORGI_SPK_ON ) -snd_soc_dapm_enable_pin (dapm,"Ext Spk" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Ext Spk" );else -snd_soc_dapm_disable_pin (dapm,"Ext Spk" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Ext Spk" );/* signal a DAPM event */ -snd_soc_dapm_sync (dapm); +snd_soc_dapm_sync_unlocked (dapm); + +snd_soc_dapm_mutex_unlock (dapm); }static int corgi_startup (struct snd_pcm_substream *substream)
Signature · 1 line
1.7.2.5
Re: [PATCH 14/17 v2] ASoC: pxa: corgi: Update locking around use of DAPM pin API
Quoted 2 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so.
Applied, thanks.
PATCH v2 15/17 ASoC: pxa: magician: Update locking around use of DAPM pin API
In reply to Charles KeepaxThe pin updates in this driver look like they are intended to be done atomically, update to do so.
--- sound/soc/pxa/magician.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-)
sound/soc/pxa/magician.c +13 -9
@@ -45,27 +45,31 @@ static void magician_ext_control(struct snd_soc_codec *codec) {struct snd_soc_dapm_context *dapm = &codec->dapm; +snd_soc_dapm_mutex_lock (dapm); +if (magician_spk_switch) -snd_soc_dapm_enable_pin (dapm,"Speaker" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Speaker" );else -snd_soc_dapm_disable_pin (dapm,"Speaker" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Speaker" );if (magician_hp_switch) -snd_soc_dapm_enable_pin (dapm,"Headphone Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Headphone Jack" );else -snd_soc_dapm_disable_pin (dapm,"Headphone Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphone Jack" );switch (magician_in_sel) {case MAGICIAN_MIC : -snd_soc_dapm_disable_pin (dapm,"Headset Mic" ); -snd_soc_dapm_enable_pin (dapm,"Call Mic" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headset Mic" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Call Mic" );break ;case MAGICIAN_MIC_EXT : -snd_soc_dapm_disable_pin (dapm,"Call Mic" ); -snd_soc_dapm_enable_pin (dapm,"Headset Mic" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Call Mic" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Headset Mic" );break ; } -snd_soc_dapm_sync (dapm); +snd_soc_dapm_sync_unlocked (dapm); + +snd_soc_dapm_mutex_unlock (dapm); }static int magician_startup (struct snd_pcm_substream *substream)
Signature · 1 line
1.7.2.5
Re: [PATCH 15/17 v2] ASoC: pxa: magician: Update locking around use of DAPM pin API
Quoted 2 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so.
Applied, thanks.
PATCH v2 16/17 ASoC: pxa: spitz: Update locking around use of DAPM pin API
In reply to Charles KeepaxThe pin updates in this driver look like they are intended to be done atomically, update to do so.
--- sound/soc/pxa/spitz.c | 51 ++++++++++++++++++++++++++---------------------- 1 files changed, 28 insertions(+), 23 deletions(-)
sound/soc/pxa/spitz.c +28 -23
@@ -46,61 +46,66 @@ static int spitz_mic_gpio;static void spitz_ext_control (struct snd_soc_dapm_context *dapm) { +snd_soc_dapm_mutex_lock (dapm); +if (spitz_spk_func ==SPITZ_SPK_ON ) -snd_soc_dapm_enable_pin (dapm,"Ext Spk" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Ext Spk" );else -snd_soc_dapm_disable_pin (dapm,"Ext Spk" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Ext Spk" );/* set up jack connection */ switch (spitz_jack_func) {case SPITZ_HP :/* enable and unmute hp jack, disable mic bias */ -snd_soc_dapm_disable_pin (dapm,"Headset Jack" ); -snd_soc_dapm_disable_pin (dapm,"Mic Jack" ); -snd_soc_dapm_disable_pin (dapm,"Line Jack" ); -snd_soc_dapm_enable_pin (dapm,"Headphone Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headset Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Mic Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Line Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Headphone Jack" );gpio_set_value (SPITZ_GPIO_MUTE_L ,1 );gpio_set_value (SPITZ_GPIO_MUTE_R ,1 );break ;case SPITZ_MIC :/* enable mic jack and bias, mute hp */ -snd_soc_dapm_disable_pin (dapm,"Headphone Jack" ); -snd_soc_dapm_disable_pin (dapm,"Headset Jack" ); -snd_soc_dapm_disable_pin (dapm,"Line Jack" ); -snd_soc_dapm_enable_pin (dapm,"Mic Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphone Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headset Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Line Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Mic Jack" );gpio_set_value (SPITZ_GPIO_MUTE_L ,0 );gpio_set_value (SPITZ_GPIO_MUTE_R ,0 );break ;case SPITZ_LINE :/* enable line jack, disable mic bias and mute hp */ -snd_soc_dapm_disable_pin (dapm,"Headphone Jack" ); -snd_soc_dapm_disable_pin (dapm,"Headset Jack" ); -snd_soc_dapm_disable_pin (dapm,"Mic Jack" ); -snd_soc_dapm_enable_pin (dapm,"Line Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphone Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headset Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Mic Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Line Jack" );gpio_set_value (SPITZ_GPIO_MUTE_L ,0 );gpio_set_value (SPITZ_GPIO_MUTE_R ,0 );break ;case SPITZ_HEADSET :/* enable and unmute headset jack enable mic bias, mute L hp */ -snd_soc_dapm_disable_pin (dapm,"Headphone Jack" ); -snd_soc_dapm_enable_pin (dapm,"Mic Jack" ); -snd_soc_dapm_disable_pin (dapm,"Line Jack" ); -snd_soc_dapm_enable_pin (dapm,"Headset Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphone Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Mic Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Line Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Headset Jack" );gpio_set_value (SPITZ_GPIO_MUTE_L ,0 );gpio_set_value (SPITZ_GPIO_MUTE_R ,1 );break ;case SPITZ_HP_OFF :/* jack removed, everything off */ -snd_soc_dapm_disable_pin (dapm,"Headphone Jack" ); -snd_soc_dapm_disable_pin (dapm,"Headset Jack" ); -snd_soc_dapm_disable_pin (dapm,"Mic Jack" ); -snd_soc_dapm_disable_pin (dapm,"Line Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphone Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headset Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Mic Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Line Jack" );gpio_set_value (SPITZ_GPIO_MUTE_L ,0 );gpio_set_value (SPITZ_GPIO_MUTE_R ,0 );break ; } -snd_soc_dapm_sync (dapm); + +snd_soc_dapm_sync_unlocked (dapm); + +snd_soc_dapm_mutex_unlock (dapm); }static int spitz_startup (struct snd_pcm_substream *substream)
Signature · 1 line
1.7.2.5
Re: [PATCH 16/17 v2] ASoC: pxa: spitz: Update locking around use of DAPM pin API
Quoted 2 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so.
Applied, thanks.
PATCH v2 17/17 ASoC: pxa: tosa: Update locking around use of DAPM pin API
In reply to Charles KeepaxThe pin updates in this driver look like they are intended to be done atomically, update to do so.
--- sound/soc/pxa/tosa.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-)
sound/soc/pxa/tosa.c +16 -12
@@ -48,31 +48,35 @@ static void tosa_ext_control(struct snd_soc_codec *codec) {struct snd_soc_dapm_context *dapm = &codec->dapm; +snd_soc_dapm_mutex_lock (dapm); +/* set up jack connection */ switch (tosa_jack_func) {case TOSA_HP : -snd_soc_dapm_disable_pin (dapm,"Mic (Internal)" ); -snd_soc_dapm_enable_pin (dapm,"Headphone Jack" ); -snd_soc_dapm_disable_pin (dapm,"Headset Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Mic (Internal)" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Headphone Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headset Jack" );break ;case TOSA_MIC_INT : -snd_soc_dapm_enable_pin (dapm,"Mic (Internal)" ); -snd_soc_dapm_disable_pin (dapm,"Headphone Jack" ); -snd_soc_dapm_disable_pin (dapm,"Headset Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Mic (Internal)" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphone Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headset Jack" );break ;case TOSA_HEADSET : -snd_soc_dapm_disable_pin (dapm,"Mic (Internal)" ); -snd_soc_dapm_disable_pin (dapm,"Headphone Jack" ); -snd_soc_dapm_enable_pin (dapm,"Headset Jack" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Mic (Internal)" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Headphone Jack" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Headset Jack" );break ; }if (tosa_spk_func ==TOSA_SPK_ON ) -snd_soc_dapm_enable_pin (dapm,"Speaker" ); +snd_soc_dapm_enable_pin_unlocked (dapm,"Speaker" );else -snd_soc_dapm_disable_pin (dapm,"Speaker" ); +snd_soc_dapm_disable_pin_unlocked (dapm,"Speaker" ); + +snd_soc_dapm_sync_unlocked (dapm); -snd_soc_dapm_sync (dapm); +snd_soc_dapm_mutex_unlock (dapm); }static int tosa_startup (struct snd_pcm_substream *substream)
Signature · 1 line
1.7.2.5
Re: [PATCH 17/17 v2] ASoC: pxa: tosa: Update locking around use of DAPM pin API
Quoted 2 lines · Charles Keepax
The pin updates in this driver look like they are intended to be done atomically, update to do so.
Applied, thanks.