pinctrl: armada-37xx: Fix spurious irq management

mvbjzhou · linusw · commit 702d1e81feae · 2018-05-24T10:16:43.000+02:00
Until now, if we found spurious irq in irq_handler, we only updated the status in register but not the status in the code. Due to this the system will got stuck dues to the infinite loop [gregory.clement@bootlin.com: update comment and add fix and stable tags] Fixes: 30ac0d3 ("pinctrl: armada-37xx: Add edge both type gpio irq support") Cc: <stable@vger.kernel.org> Signed-off-by: Terry Zhou <bjzhou@marvell.com> Reviewed-by: Gregory CLEMENT <gregory.clement@bootlin.com> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -666,12 +666,13 @@ static void armada_37xx_irq_handler(struct irq_desc *desc)
 					writel(1 << hwirq,
 					       info->base +
 					       IRQ_STATUS + 4 * i);
-					continue;
+					goto update_status;
 				}
 			}
 
 			generic_handle_irq(virq);
 
+update_status:
 			/* Update status in case a new IRQ appears */
 			spin_lock_irqsave(&info->irq_lock, flags);
 			status = readl_relaxed(info->base +

Original file line number	Diff line number	Diff line change
`@@ -666,12 +666,13 @@ static void armada_37xx_irq_handler(struct irq_desc *desc)`
`666`	`666`	`writel(1 << hwirq,`
`667`	`667`	`info->base +`
`668`	`668`	`IRQ_STATUS + 4 * i);`
`669`		`- continue;`
	`669`	`+ goto update_status;`
`670`	`670`	`}`
`671`	`671`	`}`
`672`	`672`
`673`	`673`	`generic_handle_irq(virq);`
`674`	`674`
	`675`	`+update_status:`
`675`	`676`	`/* Update status in case a new IRQ appears */`
`676`	`677`	`spin_lock_irqsave(&info->irq_lock, flags);`
`677`	`678`	`status = readl_relaxed(info->base +`