diff mbox series

[v2,1/1] pinctrl: iproc: Set irq handler based on trig type

Message ID 20191215210503.15488-2-hamish.martin@alliedtelesis.co.nz (mailing list archive)
State Mainlined
Commit 534ad35798aff40a93acac4c6d204ff8867701aa
Headers show
Series pinctrl: iproc: Fix level interrupt handling | expand

Commit Message

Hamish Martin Dec. 15, 2019, 9:05 p.m. UTC
Rather than always using handle_simple_irq() as the gpio_irq_chip
handler, set a more appropriate handler based on the IRQ trigger type
requested.
This is important for level triggered interrupts which need to be
masked during handling.

Signed-off-by: Hamish Martin <hamish.martin@alliedtelesis.co.nz>
---
v2: Alterations based on Ray Jui's review comments
- shift setting of handler type inside spinlocked region
- install handle_bad_irq as default handler for uninitialised interrupts

 drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Linus Walleij Dec. 16, 2019, 9:43 a.m. UTC | #1
On Sun, Dec 15, 2019 at 10:05 PM Hamish Martin
<hamish.martin@alliedtelesis.co.nz> wrote:

> Rather than always using handle_simple_irq() as the gpio_irq_chip
> handler, set a more appropriate handler based on the IRQ trigger type
> requested.
> This is important for level triggered interrupts which need to be
> masked during handling.
>
> Signed-off-by: Hamish Martin <hamish.martin@alliedtelesis.co.nz>
> ---
> v2: Alterations based on Ray Jui's review comments
> - shift setting of handler type inside spinlocked region
> - install handle_bad_irq as default handler for uninitialised interrupts

Patch applied. It just looks very good.

Yours,
Linus Walleij
diff mbox series

Patch

diff --git a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
index 831a9318c384..aa9b5ba1bf38 100644
--- a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
+++ b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
@@ -286,6 +286,12 @@  static int iproc_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 	iproc_set_bit(chip, IPROC_GPIO_INT_DE_OFFSET, gpio, dual_edge);
 	iproc_set_bit(chip, IPROC_GPIO_INT_EDGE_OFFSET, gpio,
 		       rising_or_high);
+
+	if (type & IRQ_TYPE_EDGE_BOTH)
+		irq_set_handler_locked(d, handle_edge_irq);
+	else
+		irq_set_handler_locked(d, handle_level_irq);
+
 	raw_spin_unlock_irqrestore(&chip->lock, flags);
 
 	dev_dbg(chip->dev,
@@ -868,7 +874,7 @@  static int iproc_gpio_probe(struct platform_device *pdev)
 			return -ENOMEM;
 		girq->parents[0] = irq;
 		girq->default_type = IRQ_TYPE_NONE;
-		girq->handler = handle_simple_irq;
+		girq->handler = handle_bad_irq;
 	}
 
 	ret = gpiochip_add_data(gc, chip);