summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiawen Wu <jiawenwu@trustnetic.com>2023-06-07 16:18:03 +0800
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>2023-06-13 14:40:41 +0200
commit8c00914e5438e3636f26b4f814b3297ae2a1b9ee (patch)
tree64e045937c3d697be9ad12b40f7cf6d1ddccd4d2
parent858fd168a95c5b9669aac8db6c14a9aeab446375 (diff)
downloadlinux-stable-8c00914e5438e3636f26b4f814b3297ae2a1b9ee.tar.gz
linux-stable-8c00914e5438e3636f26b4f814b3297ae2a1b9ee.tar.bz2
linux-stable-8c00914e5438e3636f26b4f814b3297ae2a1b9ee.zip
gpiolib: Fix GPIO chip IRQ initialization restriction
In case of gpio-regmap, IRQ chip is added by regmap-irq and associated with GPIO chip by gpiochip_irqchip_add_domain(). The initialization flag was not added in gpiochip_irqchip_add_domain(), causing gpiochip_to_irq() to return -EPROBE_DEFER. Fixes: 5467801f1fcb ("gpio: Restrict usage of GPIO chip irq members before initialization") Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-rw-r--r--drivers/gpio/gpiolib.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index a7220e04a93e..9ecf93cbd801 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1792,6 +1792,14 @@ int gpiochip_irqchip_add_domain(struct gpio_chip *gc,
gc->to_irq = gpiochip_to_irq;
gc->irq.domain = domain;
+ /*
+ * Using barrier() here to prevent compiler from reordering
+ * gc->irq.initialized before adding irqdomain.
+ */
+ barrier();
+
+ gc->irq.initialized = true;
+
return 0;
}
EXPORT_SYMBOL_GPL(gpiochip_irqchip_add_domain);