ASoC: Acknowledge WM8996 interrupts before acting on them
Subsystems (3)
PATCH 1/2 ASoC: Acknowledge WM8996 interrupts before acting on them
This closes the small race between a status being read in response to an interrupt and clearing the interrupt, meaning that if the status changes between those periods we might not get a reassertion of the interrupt.
--- sound/soc/codecs/wm8996.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
sound/soc/codecs/wm8996.c +4 -5
@@ -2404,6 +2404,8 @@ static irqreturn_t wm8996_irq(int irq, void *data) } irq_val &= ~snd_soc_read (codec,WM8996_INTERRUPT_STATUS_2_MASK ); +snd_soc_write (codec,WM8996_INTERRUPT_STATUS_2 , irq_val); +if (irq_val & (WM8996_DCS_DONE_01_EINT |WM8996_DCS_DONE_23_EINT )) {dev_dbg (codec->dev,"DC servo IRQ\n" );complete (&wm8996->dcs_done);
@@ -2420,13 +2422,10 @@ static irqreturn_t wm8996_irq(int irq, void *data)if (irq_val &WM8996_MICD_EINT )wm8996_micd (codec); -if (irq_val) { -snd_soc_write (codec,WM8996_INTERRUPT_STATUS_2 , irq_val); - +if (irq_val)return IRQ_HANDLED ; - }else { +else return IRQ_NONE ; - } }static irqreturn_t wm8996_edge_irq (int irq,void *data)
Signature · 1 line
1.7.5.4
PATCH 2/2 ASoC: Acknowledge WM8962 interrupts before acting on them
This closes the small race between a status being read in response to an interrupt and clearing the interrupt, meaning that if the status changes between those periods we might not get a reassertion of the interrupt.
--- sound/soc/codecs/wm8962.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/wm8962.c +3 -3
@@ -3416,6 +3416,9 @@ static irqreturn_t wm8962_irq(int irq, void *data) active =snd_soc_read (codec,WM8962_INTERRUPT_STATUS_2 ); active &= ~mask; +/* Acknowledge the interrupts */ +snd_soc_write (codec,WM8962_INTERRUPT_STATUS_2 , active); +if (active &WM8962_FLL_LOCK_EINT ) {dev_dbg (codec->dev,"FLL locked\n" );complete (&wm8962->fll_lock);
@@ -3440,9 +3443,6 @@ static irqreturn_t wm8962_irq(int irq, void *data) msecs_to_jiffies(250)); } -/* Acknowledge the interrupts */ -snd_soc_write (codec,WM8962_INTERRUPT_STATUS_2 , active); -return IRQ_HANDLED ; }
Signature · 1 line
1.7.5.4
Quoted 28 lines · Mark Brown
This closes the small race between a status being read in response to an interrupt and clearing the interrupt, meaning that if the status changes between those periods we might not get a reassertion of the interrupt.
Signed-off-by Mark Brown <[email protected]>--- sound/soc/codecs/wm8996.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)sound/soc/codecs/wm8996.c +2
-2@@ -2404,6 +2404,8 @@ static irqreturn_t wm8996_irq(int irq, void *data) } irq_val &= ~snd_soc_read (codec,WM8996_INTERRUPT_STATUS_2_MASK ); +snd_soc_write (codec,WM8996_INTERRUPT_STATUS_2 , irq_val); +if (irq_val & (WM8996_DCS_DONE_01_EINT |WM8996_DCS_DONE_23_EINT )) {dev_dbg (codec->dev,"DC servo IRQ\n" );complete (&wm8996->dcs_done);@@ -2420,13 +2422,10 @@ static irqreturn_t wm8996_irq(int irq, void *data)if (irq_val &WM8996_MICD_EINT )wm8996_micd (codec); -if (irq_val) { -snd_soc_write (codec,WM8996_INTERRUPT_STATUS_2 , irq_val);
sound/soc/codecs/wm8996.c static irqreturn_t wm8996_irq(int irq, void *data) · line 2431
Quoted 10 lines
sound/soc/codecs/wm8996.c +2
-3- +if (irq_val)return IRQ_HANDLED ; - }else { +else return IRQ_NONE ; - } }static irqreturn_t wm8996_edge_irq (int irq,void *data)
Both