Re: [PATCH] ASoC: da7219: Improve the IRQ process to increase the stability

[Mark Brown]

On Wed, Feb 15, 2023 at 10:10:45AM +0000, David Rau wrote:
> Remove the sleep control in IRQ thread
> and create an individual task to handel it for Jack plug in event.
> 
> This commit improves the control of ground switches in the AAD IRQ.

Copying in Guenter given the issues he raised with this, not
deleting context for his benefit.  It looks like this should
avoid the issues with the interrupt appearing locked up.

> Signed-off-by: David Rau <David.Rau.opensource@xxxxxxxxxxxxxx>
> ---
>  sound/soc/codecs/da7219-aad.c | 41 +++++++++++++++++++++++++++++------
>  sound/soc/codecs/da7219-aad.h |  4 ++++
>  2 files changed, 38 insertions(+), 7 deletions(-)
> 
> diff --git a/sound/soc/codecs/da7219-aad.c b/sound/soc/codecs/da7219-aad.c
> index c55b033d89da..4a4f09f924bc 100644
> --- a/sound/soc/codecs/da7219-aad.c
> +++ b/sound/soc/codecs/da7219-aad.c
> @@ -339,11 +339,39 @@ static void da7219_aad_hptest_work(struct work_struct *work)
>  				    SND_JACK_HEADSET | SND_JACK_LINEOUT);
>  }
>  
> +static void da7219_aad_jack_det_work(struct work_struct *work)
> +{
> +	struct da7219_aad_priv *da7219_aad =
> +		container_of(work, struct da7219_aad_priv, jack_det_work);
> +	struct snd_soc_component *component = da7219_aad->component;
> +	u8 srm_st;
> +
> +	mutex_lock(&da7219_aad->jack_det_mutex);
> +
> +	srm_st = snd_soc_component_read(component, DA7219_PLL_SRM_STS) & DA7219_PLL_SRM_STS_MCLK;
> +	msleep(da7219_aad->gnd_switch_delay * ((srm_st == 0x0) ? 2 : 1) - 4);
> +	/* Enable ground switch */
> +	snd_soc_component_update_bits(component, 0xFB, 0x01, 0x01);
> +
> +	mutex_unlock(&da7219_aad->jack_det_mutex);

This mutex is only held by this work function - is it needed?

> +}
> +
>  
>  /*
>   * IRQ
>   */
>  
> +static irqreturn_t da7219_aad_pre_irq_thread(int irq, void *data)
> +{
> +
> +	struct da7219_aad_priv *da7219_aad = data;
> +
> +	if (!da7219_aad->jack_inserted)
> +		schedule_work(&da7219_aad->jack_det_work);
> +
> +	return IRQ_WAKE_THREAD;
> +}
> +
>  static irqreturn_t da7219_aad_irq_thread(int irq, void *data)
>  {
>  	struct da7219_aad_priv *da7219_aad = data;
> @@ -351,14 +379,9 @@ static irqreturn_t da7219_aad_irq_thread(int irq, void *data)
>  	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
>  	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
>  	u8 events[DA7219_AAD_IRQ_REG_MAX];
> -	u8 statusa, srm_st;
> +	u8 statusa;
>  	int i, report = 0, mask = 0;
>  
> -	srm_st = snd_soc_component_read(component, DA7219_PLL_SRM_STS) & DA7219_PLL_SRM_STS_MCLK;
> -	msleep(da7219_aad->gnd_switch_delay * ((srm_st == 0x0) ? 2 : 1) - 4);
> -	/* Enable ground switch */
> -	snd_soc_component_update_bits(component, 0xFB, 0x01, 0x01);
> -
>  	/* Read current IRQ events */
>  	regmap_bulk_read(da7219->regmap, DA7219_ACCDET_IRQ_EVENT_A,
>  			 events, DA7219_AAD_IRQ_REG_MAX);
> @@ -377,6 +400,9 @@ static irqreturn_t da7219_aad_irq_thread(int irq, void *data)
>  		events[DA7219_AAD_IRQ_REG_A], events[DA7219_AAD_IRQ_REG_B],
>  		statusa);
>  
> +	if (!da7219_aad->jack_inserted)
> +		cancel_work_sync(&da7219_aad->jack_det_work);
> +
>  	if (statusa & DA7219_JACK_INSERTION_STS_MASK) {
>  		/* Jack Insertion */
>  		if (events[DA7219_AAD_IRQ_REG_A] &
> @@ -940,8 +966,9 @@ int da7219_aad_init(struct snd_soc_component *component)
>  
>  	INIT_WORK(&da7219_aad->btn_det_work, da7219_aad_btn_det_work);
>  	INIT_WORK(&da7219_aad->hptest_work, da7219_aad_hptest_work);
> +	INIT_WORK(&da7219_aad->jack_det_work, da7219_aad_jack_det_work);
>  
> -	ret = request_threaded_irq(da7219_aad->irq, NULL,
> +	ret = request_threaded_irq(da7219_aad->irq, da7219_aad_pre_irq_thread,
>  				   da7219_aad_irq_thread,
>  				   IRQF_TRIGGER_LOW | IRQF_ONESHOT,
>  				   "da7219-aad", da7219_aad);
> diff --git a/sound/soc/codecs/da7219-aad.h b/sound/soc/codecs/da7219-aad.h
> index 21fdf53095cc..be87ee47edde 100644
> --- a/sound/soc/codecs/da7219-aad.h
> +++ b/sound/soc/codecs/da7219-aad.h
> @@ -11,6 +11,7 @@
>  #define __DA7219_AAD_H
>  
>  #include <linux/timer.h>
> +#include <linux/mutex.h>
>  #include <sound/soc.h>
>  #include <sound/jack.h>
>  #include <sound/da7219-aad.h>
> @@ -196,6 +197,9 @@ struct da7219_aad_priv {
>  
>  	struct work_struct btn_det_work;
>  	struct work_struct hptest_work;
> +	struct work_struct jack_det_work;
> +
> +	struct mutex  jack_det_mutex;
>  
>  	struct snd_soc_jack *jack;
>  	bool micbias_resume_enable;
> -- 
> 2.17.1
>

Attachment: signature.asc
Description: PGP signature