gpio: pl061: lock IRQs when starting them
This uses the new API for tagging GPIO lines as in use by
IRQs. This enforces a few semantic checks on how the underlying
GPIO line is used.
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Deepak Sikri <deepak.sikri@st.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
index eba66c7..93b51e3 100644
--- a/drivers/gpio/gpio-pl061.c
+++ b/drivers/gpio/gpio-pl061.c
@@ -231,11 +231,33 @@
spin_unlock(&chip->lock);
}
+static unsigned int pl061_irq_startup(struct irq_data *d)
+{
+ struct pl061_gpio *chip = irq_data_get_irq_chip_data(d);
+
+ if (gpio_lock_as_irq(&chip->gc, irqd_to_hwirq(d)))
+ dev_err(chip->gc.dev,
+ "unable to lock HW IRQ %lu for IRQ\n",
+ irqd_to_hwirq(d));
+ pl061_irq_unmask(d);
+ return 0;
+}
+
+static void pl061_irq_shutdown(struct irq_data *d)
+{
+ struct pl061_gpio *chip = irq_data_get_irq_chip_data(d);
+
+ pl061_irq_mask(d);
+ gpio_unlock_as_irq(&chip->gc, irqd_to_hwirq(d));
+}
+
static struct irq_chip pl061_irqchip = {
.name = "pl061 gpio",
.irq_mask = pl061_irq_mask,
.irq_unmask = pl061_irq_unmask,
.irq_set_type = pl061_irq_type,
+ .irq_startup = pl061_irq_startup,
+ .irq_shutdown = pl061_irq_shutdown,
};
static int pl061_irq_map(struct irq_domain *d, unsigned int irq,