gpio: mmio: fix bad guard conversion
PATCH 1/1 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 7e061b462b3d ("gpio: mmio: use lock guards")
Cc Bartosz Golaszewski <[email protected]>
Cc Linus Walleij <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
--- drivers/gpio/gpio-mmio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpio/gpio-mmio.c +5 -5
@@ -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);
Signature · 1 line
2.51.2
Quoted 5 lines · Johan Hovold
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).
Eek! Sorry for that. Queued for merge window fixes.
[1/1] gpio: mmio: fix bad guard conversion
https://git.kernel.org/brgl/linux/c/7d80e248e8fc4c70f8feac4989f3666878039565
Best regards,
Signature · 1 line
Bartosz Golaszewski <[email protected]>