pinctrl: exynos: Add spinlocks to irq_mask and irq_unmask

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 <[email protected]>
Acked-by: Tomasz Figa <[email protected]>
Acked-by: Kukjin Kim <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>

diff --git a/drivers/pinctrl/pinctrl-exynos.c b/drivers/pinctrl/pinctrl-exynos.c
index 2d76f66a2e0b90c3a3ac1cfe9036a42840c15a43..c29a28ee8d259bcc8530eedd29ab4bed6944c742 100644 (file)
--- 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)