]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
gpio: pch: use raw_spinlock_t for the register lock
authorJunjie Cao <junjie.cao@intel.com>
Thu, 23 Jul 2026 01:41:29 +0000 (09:41 +0800)
committerBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Mon, 27 Jul 2026 13:07:51 +0000 (15:07 +0200)
pch_irq_type() is registered as the irq_chip .irq_set_type callback and
takes chip->spinlock with spin_lock_irqsave().  This callback is reached
from __setup_irq() -> __irq_set_trigger() -> chip->irq_set_type() while
the caller holds desc->lock, a raw_spinlock_t, with hardirqs disabled.
That context is not sleepable, but on PREEMPT_RT a regular spinlock_t is
an rtmutex-backed sleeping lock, so acquiring it there is invalid.

This was confirmed on a PREEMPT_RT kernel with lockdep
(PROVE_RAW_LOCK_NESTING and DEBUG_ATOMIC_SLEEP).  A grounded PoC mirrored
pch_irq_type()'s locking and drove it through the real genirq carrier
irq_set_irq_type() -> __irq_set_trigger() -> chip->irq_set_type(), i.e.
the same __irq_set_trigger() edge that __setup_irq() takes for a
requested IRQ.  With the original spin_lock_irqsave() edge lockdep
reported an invalid wait context, immediately followed by:

  BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48
  in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 95, name: insmod
  hardirqs last disabled at (3784): _raw_spin_lock_irqsave+0x4f/0x60
   rt_spin_lock+0x3a/0x1c0
   repro_irq_set_type+0x64/0xa0 [pch_repro]
   __irq_set_trigger+0x69/0x140
   irq_set_irq_type+0x78/0xd0

Switching the mirrored lock to raw_spinlock_t made both splats go away.

Convert the register lock to raw_spinlock_t.  The same lock also
serializes the GPIO direction/value callbacks and the suspend/resume
register save/restore, but all of those critical sections only perform
MMIO register accesses (ioread32()/iowrite32()) and
irq_set_handler_locked(); none of them contain sleepable operations.
Keeping this register lock non-sleeping is therefore appropriate for the
irqchip callbacks and does not change the GPIO-side locking contract.

This is the same class of issue and fix as recently addressed for other
GPIO controllers, e.g. commit 286533cb14a3 ("gpio: sch: use raw_spinlock_t
in the irq startup path") and commit 90f0109019e6 ("gpio: eic-sprd: use
raw_spinlock_t in the irq startup path").

Fixes: 38eb18a6f92d ("gpio-pch: Support interrupt function")
Cc: stable@vger.kernel.org
Signed-off-by: Junjie Cao <junjie.cao@intel.com>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Link: https://patch.msgid.link/20260723014129.1129730-1-junjie.cao@intel.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
drivers/gpio/gpio-pch.c

index 4ffa0955a9e3d76f6985b61ed462b448c0532a63..07a5617b314b317bf187738cc8706d0e6f89a1b8 100644 (file)
@@ -96,7 +96,7 @@ struct pch_gpio {
        struct pch_gpio_reg_data pch_gpio_reg;
        int irq_base;
        enum pch_type_t ioh;
-       spinlock_t spinlock;
+       raw_spinlock_t spinlock;
 };
 
 static int pch_gpio_set(struct gpio_chip *gpio, unsigned int nr, int val)
@@ -105,7 +105,7 @@ static int pch_gpio_set(struct gpio_chip *gpio, unsigned int nr, int val)
        struct pch_gpio *chip = gpiochip_get_data(gpio);
        unsigned long flags;
 
-       spin_lock_irqsave(&chip->spinlock, flags);
+       raw_spin_lock_irqsave(&chip->spinlock, flags);
        reg_val = ioread32(&chip->reg->po);
        if (val)
                reg_val |= BIT(nr);
@@ -113,7 +113,7 @@ static int pch_gpio_set(struct gpio_chip *gpio, unsigned int nr, int val)
                reg_val &= ~BIT(nr);
 
        iowrite32(reg_val, &chip->reg->po);
-       spin_unlock_irqrestore(&chip->spinlock, flags);
+       raw_spin_unlock_irqrestore(&chip->spinlock, flags);
 
        return 0;
 }
@@ -133,7 +133,7 @@ static int pch_gpio_direction_output(struct gpio_chip *gpio, unsigned int nr,
        u32 reg_val;
        unsigned long flags;
 
-       spin_lock_irqsave(&chip->spinlock, flags);
+       raw_spin_lock_irqsave(&chip->spinlock, flags);
 
        reg_val = ioread32(&chip->reg->po);
        if (val)
@@ -147,7 +147,7 @@ static int pch_gpio_direction_output(struct gpio_chip *gpio, unsigned int nr,
        pm |= BIT(nr);
        iowrite32(pm, &chip->reg->pm);
 
-       spin_unlock_irqrestore(&chip->spinlock, flags);
+       raw_spin_unlock_irqrestore(&chip->spinlock, flags);
 
        return 0;
 }
@@ -158,12 +158,12 @@ static int pch_gpio_direction_input(struct gpio_chip *gpio, unsigned int nr)
        u32 pm;
        unsigned long flags;
 
-       spin_lock_irqsave(&chip->spinlock, flags);
+       raw_spin_lock_irqsave(&chip->spinlock, flags);
        pm = ioread32(&chip->reg->pm);
        pm &= BIT(gpio_pins[chip->ioh]) - 1;
        pm &= ~BIT(nr);
        iowrite32(pm, &chip->reg->pm);
-       spin_unlock_irqrestore(&chip->spinlock, flags);
+       raw_spin_unlock_irqrestore(&chip->spinlock, flags);
 
        return 0;
 }
@@ -265,7 +265,7 @@ static int pch_irq_type(struct irq_data *d, unsigned int type)
                return 0;
        }
 
-       spin_lock_irqsave(&chip->spinlock, flags);
+       raw_spin_lock_irqsave(&chip->spinlock, flags);
 
        /* Set interrupt mode */
        im = ioread32(im_reg) & ~(PCH_IM_MASK << (im_pos * 4));
@@ -277,7 +277,7 @@ static int pch_irq_type(struct irq_data *d, unsigned int type)
        else if (type & IRQ_TYPE_EDGE_BOTH)
                irq_set_handler_locked(d, handle_edge_irq);
 
-       spin_unlock_irqrestore(&chip->spinlock, flags);
+       raw_spin_unlock_irqrestore(&chip->spinlock, flags);
        return 0;
 }
 
@@ -374,7 +374,7 @@ static int pch_gpio_probe(struct pci_dev *pdev,
        chip->ioh = id->driver_data;
        chip->reg = chip->base;
        pci_set_drvdata(pdev, chip);
-       spin_lock_init(&chip->spinlock);
+       raw_spin_lock_init(&chip->spinlock);
        pch_gpio_setup(chip);
 
        ret = devm_gpiochip_add_data(dev, &chip->gpio, chip);
@@ -407,9 +407,9 @@ static int pch_gpio_suspend(struct device *dev)
        struct pch_gpio *chip = dev_get_drvdata(dev);
        unsigned long flags;
 
-       spin_lock_irqsave(&chip->spinlock, flags);
+       raw_spin_lock_irqsave(&chip->spinlock, flags);
        pch_gpio_save_reg_conf(chip);
-       spin_unlock_irqrestore(&chip->spinlock, flags);
+       raw_spin_unlock_irqrestore(&chip->spinlock, flags);
 
        return 0;
 }
@@ -419,11 +419,11 @@ static int pch_gpio_resume(struct device *dev)
        struct pch_gpio *chip = dev_get_drvdata(dev);
        unsigned long flags;
 
-       spin_lock_irqsave(&chip->spinlock, flags);
+       raw_spin_lock_irqsave(&chip->spinlock, flags);
        iowrite32(0x01, &chip->reg->reset);
        iowrite32(0x00, &chip->reg->reset);
        pch_gpio_restore_reg_conf(chip);
-       spin_unlock_irqrestore(&chip->spinlock, flags);
+       raw_spin_unlock_irqrestore(&chip->spinlock, flags);
 
        return 0;
 }