Re: [PATCH 2.6.34] mfd: Clean up after WM83xx AUXADC interrupt ifit arrives late

[Samuel Ortiz]

Hi Mark,

On Fri, Apr 02, 2010 at 01:08:39PM +0100, Mark Brown wrote:
> In certain circumstances, especially under heavy load, the AUXADC
> completion interrupt may be detected after we've timed out waiting for
> it.  That conversion would still succeed but the next conversion will
> see the completion that was signalled by the interrupt for the previous
> conversion and therefore not wait for the AUXADC conversion to run,
> causing it to report failure.
> 
> Provide a simple, non-invasive cleanup by using try_wait_for_completion()
> to ensure that the completion is not signalled before we wait.  Since
> the AUXADC is run within a mutex we know there can only have been at
> most one AUXADC interrupt outstanding.  A more involved change should
> follow for the next merge window.
Patch applied to my for-linus branch, thanks.

Cheers,
Samuel.


> Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
>  drivers/mfd/wm831x-core.c |    3 +++
>  drivers/mfd/wm8350-core.c |    4 ++++
>  2 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
> index a3d5728..f2ab025 100644
> --- a/drivers/mfd/wm831x-core.c
> +++ b/drivers/mfd/wm831x-core.c
> @@ -349,6 +349,9 @@ int wm831x_auxadc_read(struct wm831x *wm831x, enum wm831x_auxadc input)
>  		goto disable;
>  	}
>  
> +	/* If an interrupt arrived late clean up after it */
> +	try_wait_for_completion(&wm831x->auxadc_done);
> +
>  	/* Ignore the result to allow us to soldier on without IRQ hookup */
>  	wait_for_completion_timeout(&wm831x->auxadc_done, msecs_to_jiffies(5));
>  
> diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
> index e400a3b..b580748 100644
> --- a/drivers/mfd/wm8350-core.c
> +++ b/drivers/mfd/wm8350-core.c
> @@ -363,6 +363,10 @@ int wm8350_read_auxadc(struct wm8350 *wm8350, int channel, int scale, int vref)
>  	reg |= 1 << channel | WM8350_AUXADC_POLL;
>  	wm8350_reg_write(wm8350, WM8350_DIGITISER_CONTROL_1, reg);
>  
> +	/* If a late IRQ left the completion signalled then consume
> +	 * the completion. */
> +	try_wait_for_completion(&wm8350->auxadc_done);
> +
>  	/* We ignore the result of the completion and just check for a
>  	 * conversion result, allowing us to soldier on if the IRQ
>  	 * infrastructure is not set up for the chip. */
> -- 
> 1.7.0.3
> 

-- 
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/