Skip to content

Commit 3360d41

Browse files
eghidoliBartosz Golaszewski
authored andcommitted
gpio: davinci: fix lazy disable
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 <[email protected]> Signed-off-by: Parth Pancholi <[email protected]> Acked-by: Keerthy <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bartosz Golaszewski <[email protected]>
1 parent 9852d85 commit 3360d41

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
@@ -253,7 +253,7 @@ static int davinci_gpio_probe(struct platform_device *pdev)
253253
* serve as EDMA event triggers.
254254
*/
255255

256-
static void gpio_irq_disable(struct irq_data *d)
256+
static void gpio_irq_mask(struct irq_data *d)
257257
{
258258
struct davinci_gpio_regs __iomem *g = irq2regs(d);
259259
uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
@@ -262,7 +262,7 @@ static void gpio_irq_disable(struct irq_data *d)
262262
writel_relaxed(mask, &g->clr_rising);
263263
}
264264

265-
static void gpio_irq_enable(struct irq_data *d)
265+
static void gpio_irq_unmask(struct irq_data *d)
266266
{
267267
struct davinci_gpio_regs __iomem *g = irq2regs(d);
268268
uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
@@ -288,8 +288,8 @@ static int gpio_irq_type(struct irq_data *d, unsigned trigger)
288288

289289
static struct irq_chip gpio_irqchip = {
290290
.name = "GPIO",
291-
.irq_enable = gpio_irq_enable,
292-
.irq_disable = gpio_irq_disable,
291+
.irq_unmask = gpio_irq_unmask,
292+
.irq_mask = gpio_irq_mask,
293293
.irq_set_type = gpio_irq_type,
294294
.flags = IRQCHIP_SET_TYPE_MASKED | IRQCHIP_SKIP_SET_WAKE,
295295
};

0 commit comments

Comments
 (0)