gpiolib: Fix GPIO chip IRQ initialization restriction
authorJiawen Wu <jiawenwu@trustnetic.com>
Wed, 7 Jun 2023 08:18:03 +0000 (16:18 +0800)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tue, 13 Jun 2023 12:40:41 +0000 (14:40 +0200)
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>
drivers/gpio/gpiolib.c

index a7220e04a93e562dbc345705c36738a8464282f4..9ecf93cbd801e7214af9bf0c34a1f268825f6319 100644 (file)
@@ -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);