Skip to content

Commit

Permalink
gpiolib: Fix irq_domain resource tracking for gpiochip_irqchip_add_do…
Browse files Browse the repository at this point in the history
…main()

[ Upstream commit ff7a179 ]

Up until commit 6a45b0e ("gpiolib: Introduce
gpiochip_irqchip_add_domain()") all irq_domains were allocated
by gpiolib itself and thus gpiolib also takes care of freeing it.

With gpiochip_irqchip_add_domain() a user of gpiolib can associate an
irq_domain with the gpio_chip. This irq_domain is not managed by
gpiolib and therefore must not be freed by gpiolib.

Fixes: 6a45b0e ("gpiolib: Introduce gpiochip_irqchip_add_domain()")
Reported-by: Jiawen Wu <jiawenwu@trustnetic.com>
Signed-off-by: Michael Walle <mwalle@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
mwalle authored and gregkh committed Jun 28, 2023
1 parent 8592ada commit 0357259
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/gpio/gpiolib.c
Expand Up @@ -1650,7 +1650,7 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gc)
}

/* Remove all IRQ mappings and delete the domain */
if (gc->irq.domain) {
if (!gc->irq.domain_is_allocated_externally && gc->irq.domain) {
unsigned int irq;

for (offset = 0; offset < gc->ngpio; offset++) {
Expand Down Expand Up @@ -1696,6 +1696,7 @@ int gpiochip_irqchip_add_domain(struct gpio_chip *gc,

gc->to_irq = gpiochip_to_irq;
gc->irq.domain = domain;
gc->irq.domain_is_allocated_externally = true;

/*
* Using barrier() here to prevent compiler from reordering
Expand Down
8 changes: 8 additions & 0 deletions include/linux/gpio/driver.h
Expand Up @@ -244,6 +244,14 @@ struct gpio_irq_chip {
*/
bool initialized;

/**
* @domain_is_allocated_externally:
*
* True it the irq_domain was allocated outside of gpiolib, in which
* case gpiolib won't free the irq_domain itself.
*/
bool domain_is_allocated_externally;

/**
* @init_hw: optional routine to initialize hardware before
* an IRQ chip will be added. This is quite useful when
Expand Down

0 comments on commit 0357259

Please sign in to comment.