Skip to content

Commit 9f973e7

Browse files
eghidolimehmetb0
authored andcommitted
gpio: davinci: fix lazy disable
BugLink: https://bugs.launchpad.net/bugs/2086242 commit 3360d41 upstream. On a few platforms such as TI's AM69 device, disable_irq() fails to keep track of the interrupts that happen between disable_irq() and enable_irq() and those interrupts are missed. Use the ->irq_unmask() and ->irq_mask() methods instead of ->irq_enable() and ->irq_disable() to correctly keep track of edges when disable_irq is called. This solves the issue of disable_irq() not working as expected on such platforms. Fixes: 2326544 ("ARM: davinci: irq_data conversion.") Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com> Signed-off-by: Parth Pancholi <parth.pancholi@toradex.com> Acked-by: Keerthy <j-keerthy@ti.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20240828133207.493961-1-parth105105@gmail.com Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
1 parent 6ca8397 commit 9f973e7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/gpio/gpio-davinci.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ static int davinci_gpio_probe(struct platform_device *pdev)
293293
* serve as EDMA event triggers.
294294
*/
295295

296-
static void gpio_irq_disable(struct irq_data *d)
296+
static void gpio_irq_mask(struct irq_data *d)
297297
{
298298
struct davinci_gpio_regs __iomem *g = irq2regs(d);
299299
uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
@@ -302,7 +302,7 @@ static void gpio_irq_disable(struct irq_data *d)
302302
writel_relaxed(mask, &g->clr_rising);
303303
}
304304

305-
static void gpio_irq_enable(struct irq_data *d)
305+
static void gpio_irq_unmask(struct irq_data *d)
306306
{
307307
struct davinci_gpio_regs __iomem *g = irq2regs(d);
308308
uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
@@ -328,8 +328,8 @@ static int gpio_irq_type(struct irq_data *d, unsigned trigger)
328328

329329
static struct irq_chip gpio_irqchip = {
330330
.name = "GPIO",
331-
.irq_enable = gpio_irq_enable,
332-
.irq_disable = gpio_irq_disable,
331+
.irq_unmask = gpio_irq_unmask,
332+
.irq_mask = gpio_irq_mask,
333333
.irq_set_type = gpio_irq_type,
334334
.flags = IRQCHIP_SET_TYPE_MASKED | IRQCHIP_SKIP_SET_WAKE,
335335
};

0 commit comments

Comments
 (0)