Re: [PATCH] gpio: gpio-omap: Fix lost edge wake-up interrupts

[Tony Lindgren <tony@xxxxxxxxxxx>]

* Tony Lindgren <tony@xxxxxxxxxxx> [190508 20:40]:
> * Tony Lindgren <tony@xxxxxxxxxxx> [190508 11:20]:
> > --- a/drivers/gpio/gpio-omap.c
> > +++ b/drivers/gpio/gpio-omap.c
> > @@ -1279,7 +1279,14 @@ static void omap_gpio_idle(struct gpio_bank *bank, bool may_lose_context)
> >  	void __iomem *base = bank->base;
> >  	u32 nowake;
> >  
> > +	/*
> > +	 * Save datain register to trigger edge interrupts on unidle for GPIOS
> > +	 * that are not wake-up capable. Ignore any enabled_non_wakeup_gpios
> > +	 * that may have just triggered as we're entering idle. Otherwise unidle
> > +	 * will not notice them.
> > +	 */
> >  	bank->saved_datain = readl_relaxed(base + bank->regs->datain);
> > +	bank->saved_datain |= bank->enabled_non_wakeup_gpios;
> 
> Oops, sorry this is not complete yet. We need to enable or clear
> the possible pending interrupt in saved_datain based on the edge
> interrupt polarity. I'll fix and resend.

Below seems to behave for me based on light testing..
Might be worth thinking about this a bit more, anybody got
better ideas? :)

Regards,

Tony

8< --------------------
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1277,10 +1277,24 @@ 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;
 
+	/*
+	 * Save datain register to trigger edge interrupts on unidle for GPIOS
+	 * that are not wake-up capable. Ignore any enabled_non_wakeup_gpios
+	 * that may have just triggered as we're entering idle. Otherwise unidle
+	 * will not notice them. Note that this does not help with EDGE_BOTH.
+	 */
 	bank->saved_datain = readl_relaxed(base + bank->regs->datain);
 
+	mask = bank->enabled_non_wakeup_gpios & bank->context.fallingdetect;
+	mask &= ~bank->context.risingdetect;
+	bank->saved_datain |= mask;
+
+	mask = bank->enabled_non_wakeup_gpios & bank->context.risingdetect;
+	mask &= ~bank->context.fallingdetect;
+	bank->saved_datain &= ~mask;
+
 	if (!bank->enabled_non_wakeup_gpios)
 		goto update_gpio_context_count;
 
-- 
2.21.0