[PATCH] wm8994: avoid to enable dcs done irq before init completion dcs_done

[PATCH] wm8994: avoid to enable dcs done irq before init completion dcs_done

[wangbiao]

From: wang, biao <biao.wang@intel.com>
Date: Wed, 20 Nov 2013 17:53:28 +0800
Subject: [PATCH] wm8994: avoid to enable dcs done irq before init completion dcs_done

once code return from request_threaded_irq, irq was setup enabled by
default, but completion var dcs_done not got initialized yet, if then a
dcs done irq was raised, system will got hung as the sync mechanism is
invalid now.

so this patch try not enable irq when request it until we got things
ready.

Signed-off-by: wang, biao <biao.wang@intel.com>
Signed-off-by: Zhang, Di <di.zhang@intel.com>
---
 sound/soc/codecs/wm8994.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 86426a1..d7e59dd 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3981,6 +3981,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 	struct wm8994 *control = dev_get_drvdata(codec->dev->parent);
 	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 	struct snd_soc_dapm_context *dapm = &codec->dapm;
+	unsigned int dcs_done_irq;
 	unsigned int reg;
 	int ret, i;
 
@@ -4077,6 +4078,9 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 	wm8994_request_irq(wm8994->wm8994, WM8994_IRQ_TEMP_SHUT,
 			   wm8994_temp_shut, "Thermal shutdown", codec);
 
+	dcs_done_irq = regmap_irq_get_virq(wm8994->wm8994->irq_data,
+					   WM8994_IRQ_DCS_DONE);
+	irq_set_status_flags(dcs_done_irq, IRQ_NOAUTOEN);
 	ret = wm8994_request_irq(wm8994->wm8994, WM8994_IRQ_DCS_DONE,
 				 wm_hubs_dcs_done, "DC servo done",
 				 &wm8994->hubs);
@@ -4313,6 +4317,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 	}
 
 	wm_hubs_add_analogue_routes(codec, 0, 0);
+	enable_irq(dcs_done_irq);
 	snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
 
 	switch (control->type) {
-- 
1.7.0.4

Re: [PATCH] wm8994: avoid to enable dcs done irq before init completion dcs_done

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1279 bytes --]

On Thu, Nov 21, 2013 at 09:22:58AM +0800, wangbiao wrote:

> From: wang, biao <biao.wang@intel.com>
> Date: Wed, 20 Nov 2013 17:53:28 +0800
> Subject: [PATCH] wm8994: avoid to enable dcs done irq before init completion dcs_done

Please don't include things like this in the body of your mail unless
you are overriding things in the header, submit things in the format
documented in SubmittingPatches.  This will avoid confusing tools used
to handle patches.

Please also try to send your mail to only relevant people, the CC list
above is very broad.  Many kernel developers get a lot of mail so it's
good to be sure that you know why everyone on the CC list is there.

> once code return from request_threaded_irq, irq was setup enabled by
> default, but completion var dcs_done not got initialized yet, if then a
> dcs done irq was raised, system will got hung as the sync mechanism is
> invalid now.

> so this patch try not enable irq when request it until we got things
> ready.

I would expect to see a patch such as this moving either the interrupt
request or (more likely) the completion init.  However that's not what
this patch does.  Why is this?  The most obvious thing here would be to
move the initialisation of the completion to the start of the probe()
function.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]