Commit 6afb10267c1692 ("pinctrl/amd: fix masking of GPIO interrupts") changed to the clearing of interrupt status bits to a RMW in a critical section. This works, but is a bit overkill. The relevant interrupt/wake status bits are in the Most Significant Byte of a 32-bit word. These two are the only write-able bits in this byte. Therefore, it should be safe to just write these bits back as a byte access without any additional locking. Signed-off-by: Daniel Kurtz <djkurtz@xxxxxxxxxxxx> --- drivers/pinctrl/pinctrl-amd.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c index b91db89eb9247c..52efe77ffb9991 100644 --- a/drivers/pinctrl/pinctrl-amd.c +++ b/drivers/pinctrl/pinctrl-amd.c @@ -558,15 +558,11 @@ static irqreturn_t amd_gpio_irq_handler(int irq, void *dev_id) irq = irq_find_mapping(gc->irq.domain, irqnr + i); generic_handle_irq(irq); - /* Clear interrupt. - * We must read the pin register again, in case the - * value was changed while executing - * generic_handle_irq() above. + /* + * Write-1-to-clear irq/wake status bits in MSByte. + * All other bits in this byte are read-only. */ - raw_spin_lock_irqsave(&gpio_dev->lock, flags); - regval = readl(regs + i); - writel(regval, regs + i); - raw_spin_unlock_irqrestore(&gpio_dev->lock, flags); + writeb((regval >> 24), (u8 *)(regs + i) + 3); ret = IRQ_HANDLED; } } -- 2.18.0.203.gfac676dfb9-goog -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html