Commit 2cba0545 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Bartosz Golaszewski
Browse files

gpio: aggregator: Fix calling into sleeping GPIO controllers 



If the parent GPIO controller is a sleeping controller (e.g. a GPIO
controller connected to I2C), getting or setting a GPIO triggers a
might_sleep() warning.  This happens because the GPIO Aggregator takes
the can_sleep flag into account only for its internal locking, not for
calling into the parent GPIO controller.

Fix this by using the gpiod_[gs]et*_cansleep() APIs when calling into a
sleeping GPIO controller.

Reported-by: default avatarMikko Salomäki <ms@datarespons.se>
Fixes: 828546e2 ("gpio: Add GPIO Aggregator")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent 26291c54

drivers/gpio/gpio-aggregator.c

+14 −4
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ static int gpio_fwd_get(struct gpio_chip *chip, unsigned int offset) 
{

	struct gpiochip_fwd *fwd = gpiochip_get_data(chip);



	return gpiod_get_value(fwd->descs[offset]);

	return chip->can_sleep ? gpiod_get_value_cansleep(fwd->descs[offset])

			       : gpiod_get_value(fwd->descs[offset]);

}



static int gpio_fwd_get_multiple(struct gpiochip_fwd *fwd, unsigned long *mask,
@@ -293,6 +294,9 @@ static int gpio_fwd_get_multiple(struct gpiochip_fwd *fwd, unsigned long *mask, 
	for_each_set_bit(i, mask, fwd->chip.ngpio)

		descs[j++] = fwd->descs[i];



	if (fwd->chip.can_sleep)

		error = gpiod_get_array_value_cansleep(j, descs, NULL, values);

	else

		error = gpiod_get_array_value(j, descs, NULL, values);

	if (error)

		return error;
@@ -328,6 +332,9 @@ static void gpio_fwd_set(struct gpio_chip *chip, unsigned int offset, int value) 
{

	struct gpiochip_fwd *fwd = gpiochip_get_data(chip);



	if (chip->can_sleep)

		gpiod_set_value_cansleep(fwd->descs[offset], value);

	else

		gpiod_set_value(fwd->descs[offset], value);

}
@@ -343,6 +350,9 @@ static void gpio_fwd_set_multiple(struct gpiochip_fwd *fwd, unsigned long *mask, 
		descs[j++] = fwd->descs[i];

	}



	if (fwd->chip.can_sleep)

		gpiod_set_array_value_cansleep(j, descs, NULL, values);

	else

		gpiod_set_array_value(j, descs, NULL, values);

}