Commit 7ffa0816 authored Oct 28, 2020 by Tony Lindgren Committed by Linus Walleij Oct 28, 2020

Revert "Revert "gpio: omap: Fix lost edge wake-up interrupts""



This reverts commit 579ced8f.

Turns out I was overly optimistic about cpu_pm blocking idle being a
solution for handling edge interrupts. While it helps in preventing
entering idle states that potentially lose context, we can still get
an edge interrupt triggering while entering idle. So we need to also
add back the workaround for seeing if there are any pending edge
interrupts when waking up.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Keerthy <j-keerthy@ti.com>
Cc: Ladislav Michl <ladis@linux-mips.org>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Cc: Tero Kristo <t-kristo@ti.com>
Link: https://lore.kernel.org/r/20201028060556.56038-1-tony@atomide.com


Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent 2f84a2de

drivers/gpio/gpio-omap.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -1114,13 +1114,23 @@ static void omap_gpio_idle(struct gpio_bank *bank, bool may_lose_context)
		{
		struct device *dev = bank->chip.parent;
		void __iomem *base = bank->base;
		u32 nowake;
		u32 mask, nowake;

		bank->saved_datain = readl_relaxed(base + bank->regs->datain);

		if (!bank->enabled_non_wakeup_gpios)
		goto update_gpio_context_count;

		/* Check for pending EDGE_FALLING, ignore EDGE_BOTH */
		mask = bank->enabled_non_wakeup_gpios & bank->context.fallingdetect;
		mask &= ~bank->context.risingdetect;
		bank->saved_datain \|= mask;

		/* Check for pending EDGE_RISING, ignore EDGE_BOTH */
		mask = bank->enabled_non_wakeup_gpios & bank->context.risingdetect;
		mask &= ~bank->context.fallingdetect;
		bank->saved_datain &= ~mask;

		if (!may_lose_context)
		goto update_gpio_context_count;

Admin message