blob: 70f42e9ee24c555d44e847d8f7512cb02c0958d0 [file] [log] [blame]
From f541500b6663b869c9d81d9a8decd9eace1f4f05 Mon Sep 17 00:00:00 2001
From: Linus Walleij <>
Date: Fri, 6 Mar 2020 14:23:26 +0100
Subject: [PATCH] gpiolib: Fix irq_disable() semantics
commit 8959b304c7062889b1276092cc8590dc1ba98f65 upstream.
The implementation if .irq_disable() which kicks in between
the gpiolib and the driver is not properly mimicking the
expected semantics of the irqchip core: the irqchip will
call .irq_disable() if that exists, else it will call
mask_irq() which first checks if .irq_mask() is defined
before calling it.
Since we are calling it unconditionally, we get this bug
from drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c, as it only
defines .irq_mask_ack and not .irq_mask:
Unable to handle kernel NULL pointer dereference at virtual address 00000000
pgd = (ptrval)
PC is at 0x0
LR is at gpiochip_irq_disable+0x20/0x30
Fix this by only calling .irq_mask() if it exists.
Cc: Brian Masney <>
Cc: Hans Verkuil <>
Reviewed-by: Bartosz Golaszewski <>
Fixes: 461c1a7d4733 ("gpiolib: override irq_enable/disable")
Signed-off-by: Linus Walleij <>
Signed-off-by: Paul Gortmaker <>
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 8d27c632e41d..b393dbab1844 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1884,9 +1884,16 @@ static void gpiochip_irq_disable(struct irq_data *d)
struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
+ /*
+ * Since we override .irq_disable() we need to mimic the
+ * behaviour of __irq_disable() in irq/chip.c.
+ * First call .irq_disable() if it exists, else mimic the
+ * behaviour of mask_irq() which calls .irq_mask() if
+ * it exists.
+ */
if (chip->irq.irq_disable)
- else
+ else if (chip->irq.chip->irq_mask)
gpiochip_disable_irq(chip, d->hwirq);