From: Grygorii Strashko <grygorii.strashko@ti.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Alexandre Courbot <gnurou@gmail.com>, <ssantosh@kernel.org>,
Kevin Hilman <khilman@deeprootsystems.com>, <tony@atomide.com>
Cc: Javier Martinez Canillas <javier@dowhile0.org>,
<linux-omap@vger.kernel.org>, <linux-gpio@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Grygorii Strashko <grygorii.strashko@ti.com>
Subject: [PATCH 4/7] gpio: omap: protect regs access in omap_gpio_irq_handler
Date: Tue, 18 Aug 2015 14:10:55 +0300 [thread overview]
Message-ID: <1439896258-26449-5-git-send-email-grygorii.strashko@ti.com> (raw)
In-Reply-To: <1439896258-26449-1-git-send-email-grygorii.strashko@ti.com>
The access to HW registers has to be be protected in
omap_gpio_irq_handler(), as it may race with code executed on
another CPUs.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
drivers/gpio/gpio-omap.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 9ed5a67..1f02acd 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -718,6 +718,7 @@ static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
int unmasked = 0;
struct irq_chip *irqchip = irq_desc_get_chip(desc);
struct gpio_chip *chip = irq_desc_get_handler_data(desc);
+ unsigned long lock_flags;
chained_irq_enter(irqchip, desc);
@@ -732,6 +733,8 @@ static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
u32 isr_saved, level_mask = 0;
u32 enabled;
+ raw_spin_lock_irqsave(&bank->lock, lock_flags);
+
enabled = omap_get_gpio_irqbank_mask(bank);
isr_saved = isr = readl_relaxed(isr_reg) & enabled;
@@ -745,6 +748,8 @@ static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
omap_clear_gpio_irqbank(bank, isr_saved & ~level_mask);
omap_enable_gpio_irqbank(bank, isr_saved & ~level_mask);
+ raw_spin_unlock_irqrestore(&bank->lock, lock_flags);
+
/* if there is only edge sensitive GPIO pin interrupts
configured, we could unmask GPIO bank interrupt immediately */
if (!level_mask && !unmasked) {
@@ -759,6 +764,7 @@ static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
bit = __ffs(isr);
isr &= ~(BIT(bit));
+ raw_spin_lock_irqsave(&bank->lock, lock_flags);
/*
* Some chips can't respond to both rising and falling
* at the same time. If this irq was requested with
@@ -769,6 +775,8 @@ static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
if (bank->toggle_mask & (BIT(bit)))
omap_toggle_gpio_edge_triggering(bank, bit);
+ raw_spin_unlock_irqrestore(&bank->lock, lock_flags);
+
generic_handle_irq(irq_find_mapping(bank->chip.irqdomain,
bit));
}
--
2.5.0
next prev parent reply other threads:[~2015-08-18 11:12 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-18 11:10 [PATCH 0/7] gpio: omap: fixes and improvements Grygorii Strashko
2015-08-18 11:10 ` [PATCH 1/7] gpio: omap: remove wrong irq_domain_remove usage in probe Grygorii Strashko
2015-08-26 7:45 ` Linus Walleij
2015-08-18 11:10 ` [PATCH 2/7] gpio: omap: switch to use platform_get_irq Grygorii Strashko
2015-08-26 7:47 ` Linus Walleij
2015-08-18 11:10 ` [PATCH 3/7] gpio: omap: fix omap2_set_gpio_debounce Grygorii Strashko
2015-08-26 7:49 ` Linus Walleij
2015-08-18 11:10 ` Grygorii Strashko [this message]
2015-08-26 7:50 ` [PATCH 4/7] gpio: omap: protect regs access in omap_gpio_irq_handler Linus Walleij
2015-08-18 11:10 ` [PATCH 5/7] gpio: omap: fix clk_prepare/unprepare usage Grygorii Strashko
2015-08-26 7:52 ` Linus Walleij
2015-08-18 11:10 ` [RFC PATCH 6/7] gpio: omap: move pm runtime in irq_chip.irq_bus_lock/sync_unlock Grygorii Strashko
2015-09-24 22:28 ` Linus Walleij
2015-09-24 22:35 ` Grygorii Strashko
2015-08-18 11:10 ` [RFC PATCH 7/7] gpio: omap: convert to use generic irq handler Grygorii Strashko
2015-08-18 16:12 ` [PATCH 0/7] gpio: omap: fixes and improvements santosh shilimkar
2015-08-19 6:38 ` Tony Lindgren
2015-08-21 8:13 ` Tony Lindgren
2015-08-25 11:41 ` Grygorii Strashko
2015-08-26 16:06 ` Tony Lindgren
2015-08-26 7:53 ` Linus Walleij
2015-09-07 11:40 ` Grygorii Strashko
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=1439896258-26449-5-git-send-email-grygorii.strashko@ti.com \
--to=grygorii.strashko@ti.com \
--cc=gnurou@gmail.com \
--cc=javier@dowhile0.org \
--cc=khilman@deeprootsystems.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=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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome