From: Grygorii Strashko <grygorii.strashko@ti.com> To: Russell King <rmk@arm.linux.org.uk>, Linus Walleij <linus.walleij@linaro.org>, Tony Lindgren <tony@atomide.com> Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>, linux-omap@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Santosh Shilimkar <ssantosh@kernel.org>, Russell King <rmk+kernel@armlinux.org.uk>, Grygorii Strashko <grygorii.strashko@ti.com> Subject: [PATCH-next 01/20] gpio: gpio-omap: ensure irq is enabled before wakeup Date: Mon, 10 Jun 2019 20:10:44 +0300 [thread overview] Message-ID: <20190610171103.30903-2-grygorii.strashko@ti.com> (raw) In-Reply-To: <20190610171103.30903-1-grygorii.strashko@ti.com> From: Russell King <rmk+kernel@armlinux.org.uk> Documentation states: NOTE: There must be a correlation between the wake-up enable and interrupt-enable registers. If a GPIO pin has a wake-up configured on it, it must also have the corresponding interrupt enabled (on one of the two interrupt lines). Ensure that this condition is always satisfied by enabling the detection events after enabling the interrupt, and disabling the detection before disabling the interrupt. This ensures interrupt/wakeup events can not happen until both the wakeup and interrupt enables correlate. If we do any clearing, clear between the interrupt enable/disable and trigger setting. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> --- drivers/gpio/gpio-omap.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 16289bafa001..2c6d46396834 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -832,9 +832,9 @@ static void omap_gpio_irq_shutdown(struct irq_data *d) raw_spin_lock_irqsave(&bank->lock, flags); bank->irq_usage &= ~(BIT(offset)); - omap_set_gpio_irqenable(bank, offset, 0); - omap_clear_gpio_irqstatus(bank, offset); omap_set_gpio_triggering(bank, offset, IRQ_TYPE_NONE); + omap_clear_gpio_irqstatus(bank, offset); + omap_set_gpio_irqenable(bank, offset, 0); if (!LINE_USED(bank->mod_usage, offset)) omap_clear_gpio_debounce(bank, offset); omap_disable_gpio_module(bank, offset); @@ -870,8 +870,8 @@ static void omap_gpio_mask_irq(struct irq_data *d) unsigned long flags; raw_spin_lock_irqsave(&bank->lock, flags); - omap_set_gpio_irqenable(bank, offset, 0); omap_set_gpio_triggering(bank, offset, IRQ_TYPE_NONE); + omap_set_gpio_irqenable(bank, offset, 0); raw_spin_unlock_irqrestore(&bank->lock, flags); } @@ -883,9 +883,6 @@ static void omap_gpio_unmask_irq(struct irq_data *d) unsigned long flags; raw_spin_lock_irqsave(&bank->lock, flags); - if (trigger) - omap_set_gpio_triggering(bank, offset, trigger); - omap_set_gpio_irqenable(bank, offset, 1); /* @@ -893,9 +890,13 @@ static void omap_gpio_unmask_irq(struct irq_data *d) * is cleared, thus after the handler has run. OMAP4 needs this done * after enabing the interrupt to clear the wakeup status. */ - if (bank->level_mask & BIT(offset)) + if (bank->regs->leveldetect0 && bank->regs->wkup_en && + trigger & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) omap_clear_gpio_irqstatus(bank, offset); + if (trigger) + omap_set_gpio_triggering(bank, offset, trigger); + raw_spin_unlock_irqrestore(&bank->lock, flags); } -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Grygorii Strashko <grygorii.strashko@ti.com> To: Russell King <rmk@arm.linux.org.uk>, Linus Walleij <linus.walleij@linaro.org>, Tony Lindgren <tony@atomide.com> Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>, <linux-omap@vger.kernel.org>, <linux-gpio@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Santosh Shilimkar <ssantosh@kernel.org>, Russell King <rmk+kernel@armlinux.org.uk>, Grygorii Strashko <grygorii.strashko@ti.com> Subject: [PATCH-next 01/20] gpio: gpio-omap: ensure irq is enabled before wakeup Date: Mon, 10 Jun 2019 20:10:44 +0300 [thread overview] Message-ID: <20190610171103.30903-2-grygorii.strashko@ti.com> (raw) In-Reply-To: <20190610171103.30903-1-grygorii.strashko@ti.com> From: Russell King <rmk+kernel@armlinux.org.uk> Documentation states: NOTE: There must be a correlation between the wake-up enable and interrupt-enable registers. If a GPIO pin has a wake-up configured on it, it must also have the corresponding interrupt enabled (on one of the two interrupt lines). Ensure that this condition is always satisfied by enabling the detection events after enabling the interrupt, and disabling the detection before disabling the interrupt. This ensures interrupt/wakeup events can not happen until both the wakeup and interrupt enables correlate. If we do any clearing, clear between the interrupt enable/disable and trigger setting. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> --- drivers/gpio/gpio-omap.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 16289bafa001..2c6d46396834 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -832,9 +832,9 @@ static void omap_gpio_irq_shutdown(struct irq_data *d) raw_spin_lock_irqsave(&bank->lock, flags); bank->irq_usage &= ~(BIT(offset)); - omap_set_gpio_irqenable(bank, offset, 0); - omap_clear_gpio_irqstatus(bank, offset); omap_set_gpio_triggering(bank, offset, IRQ_TYPE_NONE); + omap_clear_gpio_irqstatus(bank, offset); + omap_set_gpio_irqenable(bank, offset, 0); if (!LINE_USED(bank->mod_usage, offset)) omap_clear_gpio_debounce(bank, offset); omap_disable_gpio_module(bank, offset); @@ -870,8 +870,8 @@ static void omap_gpio_mask_irq(struct irq_data *d) unsigned long flags; raw_spin_lock_irqsave(&bank->lock, flags); - omap_set_gpio_irqenable(bank, offset, 0); omap_set_gpio_triggering(bank, offset, IRQ_TYPE_NONE); + omap_set_gpio_irqenable(bank, offset, 0); raw_spin_unlock_irqrestore(&bank->lock, flags); } @@ -883,9 +883,6 @@ static void omap_gpio_unmask_irq(struct irq_data *d) unsigned long flags; raw_spin_lock_irqsave(&bank->lock, flags); - if (trigger) - omap_set_gpio_triggering(bank, offset, trigger); - omap_set_gpio_irqenable(bank, offset, 1); /* @@ -893,9 +890,13 @@ static void omap_gpio_unmask_irq(struct irq_data *d) * is cleared, thus after the handler has run. OMAP4 needs this done * after enabing the interrupt to clear the wakeup status. */ - if (bank->level_mask & BIT(offset)) + if (bank->regs->leveldetect0 && bank->regs->wkup_en && + trigger & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) omap_clear_gpio_irqstatus(bank, offset); + if (trigger) + omap_set_gpio_triggering(bank, offset, trigger); + raw_spin_unlock_irqrestore(&bank->lock, flags); } -- 2.17.1
next prev parent reply other threads:[~2019-06-10 17:10 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-10 17:10 [PATCH-next 00/20] gpio: gpio-omap: set of fixes and big clean-up Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko [this message] 2019-06-10 17:10 ` [PATCH-next 01/20] gpio: gpio-omap: ensure irq is enabled before wakeup Grygorii Strashko 2019-06-12 7:54 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 02/20] gpio: gpio-omap: fix lack of irqstatus_raw0 for OMAP4 Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 7:55 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 03/20] gpio: gpio-omap: remove remainder of list management Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 7:56 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 04/20] gpio: gpio-omap: clean up edge interrupt handling Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 7:57 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 05/20] gpio: gpio-omap: remove irq_ack method Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 8:42 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 06/20] gpio: gpio-omap: move omap_gpio_request() and omap_gpio_free() Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 8:43 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 07/20] gpio: gpio-omap: simplify omap_gpio_get_direction() Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 8:47 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 08/20] gpio: gpio-omap: simplify get() method Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 8:49 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 09/20] gpio: gpio-omap: simplify get_multiple() Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 8:50 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 10/20] gpio: gpio-omap: simplify set_multiple() Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 8:51 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 11/20] gpio: gpio-omap: simplify bank->level_mask Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-10 17:10 ` [PATCH-next 12/20] gpio: gpio-omap: simplify read-modify-write Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 8:53 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 13/20] gpio: gpio-omap: simplify omap_toggle_gpio_edge_triggering() Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 8:54 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 14/20] gpio: gpio-omap: simplify omap_set_gpio_irqenable() Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 8:54 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 15/20] gpio: gpio-omap: remove dataout variation in context handling Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 8:55 ` Linus Walleij 2019-06-10 17:10 ` [PATCH-next 16/20] gpio: gpio-omap: clean up omap_gpio_restore_context() Grygorii Strashko 2019-06-10 17:10 ` Grygorii Strashko 2019-06-12 8:56 ` Linus Walleij 2019-06-10 17:11 ` [PATCH-next 17/20] gpio: gpio-omap: constify register tables Grygorii Strashko 2019-06-10 17:11 ` Grygorii Strashko 2019-06-12 8:57 ` Linus Walleij 2019-06-10 17:11 ` [PATCH-next 18/20] gpio: gpio-omap: clean up wakeup handling Grygorii Strashko 2019-06-10 17:11 ` Grygorii Strashko 2019-06-12 8:58 ` Linus Walleij 2019-06-10 17:11 ` [PATCH-next 19/20] gpio: gpio-omap: irq_startup() must not return error codes Grygorii Strashko 2019-06-10 17:11 ` Grygorii Strashko 2019-06-12 8:59 ` Linus Walleij 2019-06-10 17:11 ` [PATCH-next 20/20] gpio: gpio-omap: clean up register access in omap2_set_gpio_debounce() Grygorii Strashko 2019-06-10 17:11 ` Grygorii Strashko 2019-06-12 9:11 ` Linus Walleij 2019-06-17 18:57 ` grygorii 2019-06-18 11:28 ` Linus Walleij 2019-06-11 7:37 ` [PATCH-next 00/20] gpio: gpio-omap: set of fixes and big clean-up Tony Lindgren 2019-06-12 9:23 ` Linus Walleij
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190610171103.30903-2-grygorii.strashko@ti.com \ --to=grygorii.strashko@ti.com \ --cc=bgolaszewski@baylibre.com \ --cc=linus.walleij@linaro.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=rmk+kernel@armlinux.org.uk \ --cc=rmk@arm.linux.org.uk \ --cc=ssantosh@kernel.org \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.