ASoC: wm8962: Hold a runtime PM reference while handling interrupts
Subsystems (3)
Mark Brown
maintainerPATCH 1/4 ASoC: wm8962: Hold a runtime PM reference while handling interrupts
From: Mark Brown <[email protected]>
If the device is runtime suspended then we can't interact with it as it may have been powered off and the register map will be in cache only mode.
--- sound/soc/codecs/wm8962.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
sound/soc/codecs/wm8962.c +11 -1
@@ -3003,6 +3003,12 @@ static irqreturn_t wm8962_irq(int irq, void *data)unsigned int active;int reg, ret; + ret =pm_runtime_get_sync (dev); +if (ret <0 ) { +dev_err (dev,"Failed to resume: %d\n" , ret); +return ret; + } + ret =regmap_read (wm8962->regmap,WM8962_INTERRUPT_STATUS_2_MASK , &mask);if (ret !=0 ) {
@@ -3019,8 +3025,10 @@ static irqreturn_t wm8962_irq(int irq, void *data) active &= ~mask; -if (!active) +if (!active) { +pm_runtime_put (dev);return IRQ_NONE ; + }/* Acknowledge the interrupts */ ret =regmap_write (wm8962->regmap,WM8962_INTERRUPT_STATUS_2 , active);
@@ -3070,6 +3078,8 @@ static irqreturn_t wm8962_irq(int irq, void *data) msecs_to_jiffies(250)); } +pm_runtime_put (dev); +return IRQ_HANDLED ; }
Signature · 1 line
1.9.rc1
Mark Brown
maintainerPATCH 2/4 ASoC: wm8962: Check if we runtime resume the device when starting FLL
From: Mark Brown <[email protected]>
--- sound/soc/codecs/wm8962.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/codecs/wm8962.c +5 -1
@@ -2886,7 +2886,11 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source,try_wait_for_completion (&wm8962->fll_lock); -pm_runtime_get_sync (codec->dev); + ret =pm_runtime_get_sync (codec->dev); +if (ret <0 ) { +dev_err (codec->dev,"Failed to resume device: %d\n" , ret); +return ret; + } snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1, WM8962_FLL_FRAC | WM8962_FLL_REFCLK_SRC_MASK |
Signature · 1 line
1.9.rc1
Mark Brown
maintainerPATCH 3/4 ASoC: wm8962: Clean up error handling for failed FLL start
In reply to Mark BrownFrom: Mark Brown <[email protected]>
Don't record the FLL as having started and leave the hardware disabled ensuring we are in a better state if this does happen to be a transient error and making debugging easier.
--- sound/soc/codecs/wm8962.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
sound/soc/codecs/wm8962.c +5 -4
@@ -2898,8 +2898,6 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source,dev_dbg (codec->dev,"FLL configured for %dHz->%dHz\n" , Fref, Fout); - ret =0 ; -/* This should be a massive overestimate but go even * higher if we'll error out */
@@ -2913,14 +2911,17 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source,if (timeout ==0 && wm8962->irq) {dev_err (codec->dev,"FLL lock timed out" ); - ret = -ETIMEDOUT ; +snd_soc_update_bits (codec,WM8962_FLL_CONTROL_1 , +WM8962_FLL_ENA ,0 ); +pm_runtime_put (codec->dev); +return -ETIMEDOUT ; } wm8962->fll_fref = Fref; wm8962->fll_fout = Fout; wm8962->fll_src = source; -return ret; +return 0 ; }static int wm8962_mute (struct snd_soc_dai *dai,int mute)
Signature · 1 line
1.9.rc1
Mark Brown
maintainerPATCH 4/4 ASoC: wm8962: Reinitialise the IRQ completion rather than just trying it
In reply to Mark BrownFrom: Mark Brown <[email protected]>
This is better practice.
--- sound/soc/codecs/wm8962.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm8962.c +1 -1
@@ -2884,7 +2884,7 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source,snd_soc_write (codec,WM8962_FLL_CONTROL_7 , fll_div.lambda);snd_soc_write (codec,WM8962_FLL_CONTROL_8 , fll_div.n); -try_wait_for_completion (&wm8962->fll_lock); +reinit_completion (&wm8962->fll_lock); ret =pm_runtime_get_sync (codec->dev);if (ret <0 ) {
Signature · 1 line
1.9.rc1
Quoted 7 lines · Mark Brown
From: Mark Brown <[email protected]>
If the device is runtime suspended then we can't interact with it as it may have been powered off and the register map will be in cache only mode.
Signed-off-by Mark Brown <[email protected]>
All look fine to me.
Thanks,
Charles
At Fri, 31 Jan 2014 15:29:58 +0000,
Quoted 17 lines · Mark Brown
From: Mark Brown <[email protected]>
If the device is runtime suspended then we can't interact with it as it may have been powered off and the register map will be in cache only mode.
Signed-off-by Mark Brown <[email protected]>--- sound/soc/codecs/wm8962.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)sound/soc/codecs/wm8962.c +0
-0
sound/soc/codecs/wm8962.c static irqreturn_t wm8962_irq(int irq, void *data) · line 3009
Quoted 7 lines
sound/soc/codecs/wm8962.c +4
-0@@ -3003,6 +3003,12 @@ static irqreturn_t wm8962_irq(int irq, void *data)unsigned int active;int reg, ret; + ret =pm_runtime_get_sync (dev); +if (ret <0 ) { +dev_err (dev,"Failed to resume: %d\n" , ret); +return ret;
Shouldn't here return IRQ_XXX?
Takashi
Quoted 34 lines
sound/soc/codecs/wm8962.c +7
-1+ } + ret =regmap_read (wm8962->regmap,WM8962_INTERRUPT_STATUS_2_MASK , &mask);if (ret !=0 ) {@@ -3019,8 +3025,10 @@ static irqreturn_t wm8962_irq(int irq, void *data) active &= ~mask; -if (!active) +if (!active) { +pm_runtime_put (dev);return IRQ_NONE ; + }/* Acknowledge the interrupts */ ret =regmap_write (wm8962->regmap,WM8962_INTERRUPT_STATUS_2 , active);@@ -3070,6 +3078,8 @@ static irqreturn_t wm8962_irq(int irq, void *data) msecs_to_jiffies(250)); } +pm_runtime_put (dev); +return IRQ_HANDLED ; }Signature · 6 lines
1.9.rc1 _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Mark Brown
maintainerQuoted 6 lines · Takashi Iwai
sound/soc/codecs/wm8962.c static irqreturn_t wm8962_irq(int irq, void *data) · line 3009
Quoted 4 lines
sound/soc/codecs/wm8962.c +4
-0+ ret =pm_runtime_get_sync (dev); +if (ret <0 ) { +dev_err (dev,"Failed to resume: %d\n" , ret); +return ret;Shouldn't here return
IRQ_XXX?
Yeah, it should.