| From 90cf6862b95fd99ee9f8bc711c8de5c88eaf59c2 Mon Sep 17 00:00:00 2001 |
| From: Gregory CLEMENT <gregory.clement@bootlin.com> |
| Date: Fri, 15 Nov 2019 16:57:52 +0100 |
| Subject: [PATCH] pinctrl: armada-37xx: Fix irq mask access in |
| armada_37xx_irq_set_type() |
| |
| commit 04fb02757ae5188031eb71b2f6f189edb1caf5dc upstream. |
| |
| As explained in the following commit a9a1a4833613 ("pinctrl: |
| armada-37xx: Fix gpio interrupt setup") the armada_37xx_irq_set_type() |
| function can be called before the initialization of the mask field. |
| |
| That means that we can't use this field in this function and need to |
| workaround it using hwirq. |
| |
| Fixes: 30ac0d3b0702 ("pinctrl: armada-37xx: Add edge both type gpio irq support") |
| Cc: stable@vger.kernel.org |
| Reported-by: Russell King <rmk+kernel@armlinux.org.uk> |
| Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> |
| Link: https://lore.kernel.org/r/20191115155752.2562-1-gregory.clement@bootlin.com |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c |
| index f2f5fcd9a237..83e585c5a613 100644 |
| --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c |
| +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c |
| @@ -595,10 +595,10 @@ static int armada_37xx_irq_set_type(struct irq_data *d, unsigned int type) |
| regmap_read(info->regmap, in_reg, &in_val); |
| |
| /* Set initial polarity based on current input level. */ |
| - if (in_val & d->mask) |
| - val |= d->mask; /* falling */ |
| + if (in_val & BIT(d->hwirq % GPIO_PER_REG)) |
| + val |= BIT(d->hwirq % GPIO_PER_REG); /* falling */ |
| else |
| - val &= ~d->mask; /* rising */ |
| + val &= ~(BIT(d->hwirq % GPIO_PER_REG)); /* rising */ |
| break; |
| } |
| default: |
| -- |
| 2.7.4 |
| |
