mfd: arizona: Check if AOD interrupts are pending before dispatching

PATCH RESEND Superseded Richard Fitzgerald 1 participant 1 message May 23, 2016

Subsystems (2)

Multifunction devices (MFD) Wolfson microelectronics drivers

lore

Share & tools

lore

Richard Fitzgerald

author

2016-05-23 09:23 UTC #0 lore raw

PATCH RESEND v2 1/1 mfd: arizona: Check if AOD interrupts are pending before dispatching

Previously the arizona_irq_thread implementation would call handle_nested_irqs() to handle AOD interrupts without checking if any were actually pending. The kernel will see these as spurious IRQs and will eventually disable the IRQ.

This patch ensures we only launch the nested handler if there are AOD interrupts pending in the codec.

Signed-off-by Simon Trimmer <[email protected]>

Signed-off-by Richard Fitzgerald <[email protected]>

---
 drivers/mfd/arizona-irq.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

drivers/mfd/arizona-irq.c +14 -2

index edeb495..5e18d3c 100644
@@ -109,8 +109,20 @@ static irqreturn_t arizona_irq_thread(int irq, void *data)
 	do {
 		poll = false;
 
-		if (arizona->aod_irq_chip)
-			handle_nested_irq(irq_find_mapping(arizona->virq, 0));
+		if (arizona->aod_irq_chip) {
+			/*
+			 * Check the AOD status register to determine whether
+			 * the nested IRQ handler should be called.
+			 */
+			ret = regmap_read(arizona->regmap,
+					  ARIZONA_AOD_IRQ1, &val);
+			if (ret)
+				dev_warn(arizona->dev,
+					"Failed to read AOD IRQ1 %d\n", ret);
+			else if (val)
+				handle_nested_irq(
+					irq_find_mapping(arizona->virq, 0));
+		}
 
 		/*
 		 * Check if one of the main interrupts is asserted and only

Signature · 1 line

1.9.1