From: Doug Anderson <dianders@chromium.org>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>,
Tomasz Figa <tomasz.figa@gmail.com>,
Olof Johansson <olof@lixom.net>, Simon Glass <sjg@chromium.org>,
Luigi Semenzato <semenzato@chromium.org>,
ilho215.lee@samsung.com, eunki_kim@samsung.com,
Doug Anderson <dianders@chromium.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/3] pinctrl: exynos: Add spinlocks to irq_mask and irq_unmask
Date: Wed, 12 Jun 2013 10:33:17 -0700 [thread overview]
Message-ID: <1371058399-31933-1-git-send-email-dianders@chromium.org> (raw)
The patch:
1984695 pinctrl: samsung: Protect bank registers with a spinlock
...added spinlocks to protect many accesses. However, the irq_mask
and irq_unmask functions still do an unprotected read/modify/write.
Add the spinlock there.
Signed-off-by: Doug Anderson <dianders@chromium.org>
---
drivers/pinctrl/pinctrl-exynos.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/pinctrl/pinctrl-exynos.c b/drivers/pinctrl/pinctrl-exynos.c
index 2d76f66..c29a28e 100644
--- a/drivers/pinctrl/pinctrl-exynos.c
+++ b/drivers/pinctrl/pinctrl-exynos.c
@@ -56,10 +56,15 @@ static void exynos_gpio_irq_unmask(struct irq_data *irqd)
struct samsung_pinctrl_drv_data *d = bank->drvdata;
unsigned long reg_mask = d->ctrl->geint_mask + bank->eint_offset;
unsigned long mask;
+ unsigned long flags;
+
+ spin_lock_irqsave(&bank->slock, flags);
mask = readl(d->virt_base + reg_mask);
mask &= ~(1 << irqd->hwirq);
writel(mask, d->virt_base + reg_mask);
+
+ spin_unlock_irqrestore(&bank->slock, flags);
}
static void exynos_gpio_irq_mask(struct irq_data *irqd)
@@ -68,10 +73,15 @@ static void exynos_gpio_irq_mask(struct irq_data *irqd)
struct samsung_pinctrl_drv_data *d = bank->drvdata;
unsigned long reg_mask = d->ctrl->geint_mask + bank->eint_offset;
unsigned long mask;
+ unsigned long flags;
+
+ spin_lock_irqsave(&bank->slock, flags);
mask = readl(d->virt_base + reg_mask);
mask |= 1 << irqd->hwirq;
writel(mask, d->virt_base + reg_mask);
+
+ spin_unlock_irqrestore(&bank->slock, flags);
}
static void exynos_gpio_irq_ack(struct irq_data *irqd)
@@ -264,10 +274,15 @@ static void exynos_wkup_irq_unmask(struct irq_data *irqd)
struct samsung_pinctrl_drv_data *d = b->drvdata;
unsigned long reg_mask = d->ctrl->weint_mask + b->eint_offset;
unsigned long mask;
+ unsigned long flags;
+
+ spin_lock_irqsave(&b->slock, flags);
mask = readl(d->virt_base + reg_mask);
mask &= ~(1 << irqd->hwirq);
writel(mask, d->virt_base + reg_mask);
+
+ spin_unlock_irqrestore(&b->slock, flags);
}
static void exynos_wkup_irq_mask(struct irq_data *irqd)
@@ -276,10 +291,15 @@ static void exynos_wkup_irq_mask(struct irq_data *irqd)
struct samsung_pinctrl_drv_data *d = b->drvdata;
unsigned long reg_mask = d->ctrl->weint_mask + b->eint_offset;
unsigned long mask;
+ unsigned long flags;
+
+ spin_lock_irqsave(&b->slock, flags);
mask = readl(d->virt_base + reg_mask);
mask |= 1 << irqd->hwirq;
writel(mask, d->virt_base + reg_mask);
+
+ spin_unlock_irqrestore(&b->slock, flags);
}
static void exynos_wkup_irq_ack(struct irq_data *irqd)
--
1.8.3
next reply other threads:[~2013-06-12 17:33 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-12 17:33 Doug Anderson [this message]
2013-06-12 17:33 ` [PATCH 2/3] pinctrl: exynos: reorder xyz_irq_unmask() so future patch can ack Doug Anderson
2013-06-13 11:14 ` Tomasz Figa
2013-06-13 12:01 ` Kukjin Kim
2013-06-13 12:32 ` Linus Walleij
2013-06-13 16:43 ` Doug Anderson
2013-06-12 17:33 ` [PATCH 3/3] pinctrl: exynos: ack level-triggered interrupts before unmasking Doug Anderson
2013-06-13 10:54 ` Tomasz Figa
2013-06-13 16:34 ` Doug Anderson
2013-06-13 16:40 ` Tomasz Figa
2013-06-13 12:04 ` Kukjin Kim
2013-06-13 16:38 ` Doug Anderson
2013-06-13 16:42 ` Tomasz Figa
2013-06-13 16:50 ` Doug Anderson
2013-06-13 23:13 ` Kukjin Kim
2013-06-14 0:00 ` Doug Anderson
2013-06-14 0:18 ` Kukjin Kim
2013-06-13 12:34 ` Linus Walleij
2013-06-13 11:03 ` [PATCH 1/3] pinctrl: exynos: Add spinlocks to irq_mask and irq_unmask Tomasz Figa
2013-06-13 12:00 ` Kukjin Kim
2013-06-13 12:29 ` Linus Walleij
2013-06-13 16:38 ` [PATCH v2 3/3] pinctrl: exynos: ack level-triggered interrupts before unmasking Doug Anderson
2013-06-13 16:44 ` Tomasz Figa
2013-06-13 18:20 ` Linus Walleij
2013-06-17 16:56 ` 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=1371058399-31933-1-git-send-email-dianders@chromium.org \
--to=dianders@chromium.org \
--cc=eunki_kim@samsung.com \
--cc=ilho215.lee@samsung.com \
--cc=kgene.kim@samsung.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
--cc=semenzato@chromium.org \
--cc=sjg@chromium.org \
--cc=tomasz.figa@gmail.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
all inboxes | Powered by JetHome®