Commit 7d80e248 authored by Johan Hovold's avatar Johan Hovold Committed by Bartosz Golaszewski
Browse files

gpio: mmio: fix bad guard conversion 



A recent spinlock guard conversion consistently used the wrong guard so
that interrupts are no longer disabled while holding the chip lock
(which can cause deadlocks).

Fixes: 7e061b46 ("gpio: mmio: use lock guards")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20251203105206.24453-1-johan@kernel.org


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
parent dae97501

drivers/gpio/gpio-mmio.c

+5 −5
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static int gpio_mmio_set(struct gpio_chip *gc, unsigned int gpio, int val) 
	struct gpio_generic_chip *chip = to_gpio_generic_chip(gc);

	unsigned long mask = gpio_mmio_line2mask(gc, gpio);



	guard(raw_spinlock)(&chip->lock);

	guard(raw_spinlock_irqsave)(&chip->lock);



	if (val)

		chip->sdata |= mask;
@@ -262,7 +262,7 @@ static int gpio_mmio_set_set(struct gpio_chip *gc, unsigned int gpio, int val) 
	struct gpio_generic_chip *chip = to_gpio_generic_chip(gc);

	unsigned long mask = gpio_mmio_line2mask(gc, gpio);



	guard(raw_spinlock)(&chip->lock);

	guard(raw_spinlock_irqsave)(&chip->lock);



	if (val)

		chip->sdata |= mask;
@@ -302,7 +302,7 @@ static void gpio_mmio_set_multiple_single_reg(struct gpio_chip *gc, 
	struct gpio_generic_chip *chip = to_gpio_generic_chip(gc);

	unsigned long set_mask, clear_mask;



	guard(raw_spinlock)(&chip->lock);

	guard(raw_spinlock_irqsave)(&chip->lock);



	gpio_mmio_multiple_get_masks(gc, mask, bits, &set_mask, &clear_mask);
@@ -391,7 +391,7 @@ static int gpio_mmio_dir_in(struct gpio_chip *gc, unsigned int gpio) 
{

	struct gpio_generic_chip *chip = to_gpio_generic_chip(gc);



	scoped_guard(raw_spinlock, &chip->lock) {

	scoped_guard(raw_spinlock_irqsave, &chip->lock) {

		chip->sdir &= ~gpio_mmio_line2mask(gc, gpio);



		if (chip->reg_dir_in)
@@ -431,7 +431,7 @@ static void gpio_mmio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) 
{

	struct gpio_generic_chip *chip = to_gpio_generic_chip(gc);



	guard(raw_spinlock)(&chip->lock);

	guard(raw_spinlock_irqsave)(&chip->lock);



	chip->sdir |= gpio_mmio_line2mask(gc, gpio);