[PATCH] misc: microchip: pci1xxxx: use a raw spinlock for GPIO IRQs
From: Shuo Qin
Date: Wed Nov 18 2026 - 21:36:57 EST
Lockdep reports "Invalid wait context" in pci1xxxx_gpio_irq_ack()
during GPIO IRQ mapping. The IRQ core calls mask_ack_irq() with the
raw descriptor lock held. The driver's ACK callback then takes
priv->lock, a spinlock_t that can block on PREEMPT_RT. The mask and
unmask callbacks also take this lock.
Convert priv->lock and all its users to the raw spinlock API. The
lock also protects register accesses in the GPIO callbacks, the
parent IRQ handler and suspend/resume. These critical sections
perform MMIO and bit operations. The parent IRQ handler releases
the register lock before dispatching child IRQs.
Fixes: 1f4d8ae231f4 ("misc: microchip: pci1xxxx: Add gpio irq handler and irq helper functions irq_ack, irq_mask, irq_unmask and irq_set_type of irq_chip.")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Shuo Qin <23159100078@xxxxxxxxxxxxxxxxx>
---
drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 52 ++++++++++++-------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
index 82635db04dc534de5faf26d7413a7dc8faa911c0..f8724d5df97feb4af1ef2d61800841dd64bda813 100644
--- a/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
+++ b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
@@ -41,7 +41,7 @@ struct pci1xxxx_gpio {
void __iomem *reg_base;
raw_spinlock_t wa_lock;
struct gpio_chip gpio;
- spinlock_t lock;
+ raw_spinlock_t lock;
u32 gpio_wake_mask[3];
int irq_base;
u8 dev_rev;
@@ -99,10 +99,10 @@ static int pci1xxxx_gpio_direction_input(struct gpio_chip *gpio, unsigned int nr
struct pci1xxxx_gpio *priv = gpiochip_get_data(gpio);
unsigned long flags;
- spin_lock_irqsave(&priv->lock, flags);
+ raw_spin_lock_irqsave(&priv->lock, flags);
pci1xxx_assign_bit(priv->reg_base, INP_EN_OFFSET(nr), (nr % 32), true);
pci1xxx_assign_bit(priv->reg_base, OUT_EN_OFFSET(nr), (nr % 32), false);
- spin_unlock_irqrestore(&priv->lock, flags);
+ raw_spin_unlock_irqrestore(&priv->lock, flags);
return 0;
}
@@ -121,7 +121,7 @@ static int pci1xxxx_gpio_direction_output(struct gpio_chip *gpio,
unsigned long flags;
u32 data;
- spin_lock_irqsave(&priv->lock, flags);
+ raw_spin_lock_irqsave(&priv->lock, flags);
pci1xxx_assign_bit(priv->reg_base, INP_EN_OFFSET(nr), (nr % 32), false);
pci1xxx_assign_bit(priv->reg_base, OUT_EN_OFFSET(nr), (nr % 32), true);
data = readl(priv->reg_base + OUT_OFFSET(nr));
@@ -130,7 +130,7 @@ static int pci1xxxx_gpio_direction_output(struct gpio_chip *gpio,
else
data &= ~(1 << (nr % 32));
writel(data, priv->reg_base + OUT_OFFSET(nr));
- spin_unlock_irqrestore(&priv->lock, flags);
+ raw_spin_unlock_irqrestore(&priv->lock, flags);
return 0;
}
@@ -140,9 +140,9 @@ static int pci1xxxx_gpio_set(struct gpio_chip *gpio, unsigned int nr, int val)
struct pci1xxxx_gpio *priv = gpiochip_get_data(gpio);
unsigned long flags;
- spin_lock_irqsave(&priv->lock, flags);
+ raw_spin_lock_irqsave(&priv->lock, flags);
pci1xxx_assign_bit(priv->reg_base, OUT_OFFSET(nr), (nr % 32), val);
- spin_unlock_irqrestore(&priv->lock, flags);
+ raw_spin_unlock_irqrestore(&priv->lock, flags);
return 0;
}
@@ -154,7 +154,7 @@ static int pci1xxxx_gpio_set_config(struct gpio_chip *gpio, unsigned int offset,
unsigned long flags;
int ret = 0;
- spin_lock_irqsave(&priv->lock, flags);
+ raw_spin_lock_irqsave(&priv->lock, flags);
switch (pinconf_to_config_param(config)) {
case PIN_CONFIG_BIAS_PULL_UP:
pci1xxx_assign_bit(priv->reg_base, PULLUP_OFFSET(offset), (offset % 32), true);
@@ -176,7 +176,7 @@ static int pci1xxxx_gpio_set_config(struct gpio_chip *gpio, unsigned int offset,
ret = -ENOTSUPP;
break;
}
- spin_unlock_irqrestore(&priv->lock, flags);
+ raw_spin_unlock_irqrestore(&priv->lock, flags);
return ret;
}
@@ -188,9 +188,9 @@ static void pci1xxxx_gpio_irq_ack(struct irq_data *data)
unsigned int gpio = irqd_to_hwirq(data);
unsigned long flags;
- spin_lock_irqsave(&priv->lock, flags);
+ raw_spin_lock_irqsave(&priv->lock, flags);
writel(BIT(gpio % 32), priv->reg_base + INTR_STAT_OFFSET(gpio));
- spin_unlock_irqrestore(&priv->lock, flags);
+ raw_spin_unlock_irqrestore(&priv->lock, flags);
}
static void pci1xxxx_gpio_irq_set_mask(struct irq_data *data, bool set)
@@ -202,9 +202,9 @@ static void pci1xxxx_gpio_irq_set_mask(struct irq_data *data, bool set)
if (!set)
gpiochip_enable_irq(chip, gpio);
- spin_lock_irqsave(&priv->lock, flags);
+ raw_spin_lock_irqsave(&priv->lock, flags);
pci1xxx_assign_bit(priv->reg_base, INTR_MASK_OFFSET(gpio), (gpio % 32), set);
- spin_unlock_irqrestore(&priv->lock, flags);
+ raw_spin_unlock_irqrestore(&priv->lock, flags);
if (set)
gpiochip_disable_irq(chip, gpio);
}
@@ -301,13 +301,13 @@ static irqreturn_t pci1xxxx_gpio_irq_handler(int irq, void *dev_id)
int bit;
u8 gpiobank;
- spin_lock_irqsave(&priv->lock, flags);
+ raw_spin_lock_irqsave(&priv->lock, flags);
pci1xxx_assign_bit(priv->reg_base, PIO_GLOBAL_CONFIG_OFFSET, 16, true);
- spin_unlock_irqrestore(&priv->lock, flags);
+ raw_spin_unlock_irqrestore(&priv->lock, flags);
for (gpiobank = 0; gpiobank < 3; gpiobank++) {
- spin_lock_irqsave(&priv->lock, flags);
+ raw_spin_lock_irqsave(&priv->lock, flags);
int_status = readl(priv->reg_base + INTR_STATUS_OFFSET(gpiobank));
- spin_unlock_irqrestore(&priv->lock, flags);
+ raw_spin_unlock_irqrestore(&priv->lock, flags);
if (gpiobank == 2)
pincount = 29;
else
@@ -315,18 +315,18 @@ static irqreturn_t pci1xxxx_gpio_irq_handler(int irq, void *dev_id)
for_each_set_bit(bit, &int_status, pincount) {
unsigned int irq;
- spin_lock_irqsave(&priv->lock, flags);
+ raw_spin_lock_irqsave(&priv->lock, flags);
writel(BIT(bit), priv->reg_base + INTR_STATUS_OFFSET(gpiobank));
- spin_unlock_irqrestore(&priv->lock, flags);
+ raw_spin_unlock_irqrestore(&priv->lock, flags);
irq = irq_find_mapping(gc->irq.domain, (bit + (gpiobank * 32)));
raw_spin_lock_irqsave(&priv->wa_lock, wa_flags);
generic_handle_irq(irq);
raw_spin_unlock_irqrestore(&priv->wa_lock, wa_flags);
}
}
- spin_lock_irqsave(&priv->lock, flags);
+ raw_spin_lock_irqsave(&priv->lock, flags);
pci1xxx_assign_bit(priv->reg_base, PIO_GLOBAL_CONFIG_OFFSET, 16, false);
- spin_unlock_irqrestore(&priv->lock, flags);
+ raw_spin_unlock_irqrestore(&priv->lock, flags);
return IRQ_HANDLED;
}
@@ -365,7 +365,7 @@ static int pci1xxxx_gpio_suspend(struct device *dev)
}
}
- spin_lock_irqsave(&priv->lock, flags);
+ raw_spin_lock_irqsave(&priv->lock, flags);
pci1xxx_assign_bit(priv->reg_base, PIO_GLOBAL_CONFIG_OFFSET,
16, true);
pci1xxx_assign_bit(priv->reg_base, PIO_GLOBAL_CONFIG_OFFSET,
@@ -375,7 +375,7 @@ static int pci1xxxx_gpio_suspend(struct device *dev)
if (priv->dev_rev >= 0xC0)
pci1xxx_assign_bit(priv->reg_base, PERI_GEN_RESET, 17, true);
- spin_unlock_irqrestore(&priv->lock, flags);
+ raw_spin_unlock_irqrestore(&priv->lock, flags);
device_set_wakeup_enable(&pcidev->dev, true);
pci_wake_from_d3(pcidev, true);
@@ -408,7 +408,7 @@ static int pci1xxxx_gpio_resume(struct device *dev)
}
}
- spin_lock_irqsave(&priv->lock, flags);
+ raw_spin_lock_irqsave(&priv->lock, flags);
pci1xxx_assign_bit(priv->reg_base, PIO_GLOBAL_CONFIG_OFFSET,
17, true);
pci1xxx_assign_bit(priv->reg_base, PIO_GLOBAL_CONFIG_OFFSET,
@@ -418,7 +418,7 @@ static int pci1xxxx_gpio_resume(struct device *dev)
if (priv->dev_rev >= 0xC0)
pci1xxx_assign_bit(priv->reg_base, PERI_GEN_RESET, 17, false);
- spin_unlock_irqrestore(&priv->lock, flags);
+ raw_spin_unlock_irqrestore(&priv->lock, flags);
pci_wake_from_d3(pcidev, false);
@@ -484,7 +484,7 @@ static int pci1xxxx_gpio_probe(struct auxiliary_device *aux_dev,
if (!priv)
return -ENOMEM;
- spin_lock_init(&priv->lock);
+ raw_spin_lock_init(&priv->lock);
priv->aux_dev = aux_dev;
if (!devm_request_mem_region(&aux_dev->dev, pdata->region_start, 0x800, aux_dev->name))