shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

gpiolib: Fix irq_domain resource tracking for gpiochip_irqchip_add_domain()

Browse Source 
[ Upstream commit ff7a1790fb ]

Up until commit 6a45b0e258 ("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: 6a45b0e258 ("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>
This commit is contained in:
Michael Walle
2023-06-19 10:56:07 +02:00
committed by Greg Kroah-Hartman
parent 8592ada80e
commit 0357259cb1
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpio/gpiolib.c
View File

@@ -1650,7 +1650,7 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gc)
} }
/* Remove all IRQ mappings and delete the domain */ /* 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; unsigned int irq;
for (offset = 0; offset < gc->ngpio; offset++) { for (offset = 0; offset < gc->ngpio; offset++) {
@@ -1696,6 +1696,7 @@ int gpiochip_irqchip_add_domain(struct gpio_chip *gc,
gc->to_irq = gpiochip_to_irq; gc->to_irq = gpiochip_to_irq;
gc->irq.domain = domain; gc->irq.domain = domain;
gc->irq.domain_is_allocated_externally = true;
/* /*
* Using barrier() here to prevent compiler from reordering * Using barrier() here to prevent compiler from reordering

8
include/linux/gpio/driver.h
View File

@@ -244,6 +244,14 @@ struct gpio_irq_chip {
*/ */
bool initialized; 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 * @init_hw: optional routine to initialize hardware before
* an IRQ chip will be added. This is quite useful when * an IRQ chip will be added. This is quite useful when