Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757850Ab3FLRdf (ORCPT ); Wed, 12 Jun 2013 13:33:35 -0400 Received: from mail-vc0-f202.google.com ([209.85.220.202]:39282 "EHLO mail-vc0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755392Ab3FLRdb (ORCPT ); Wed, 12 Jun 2013 13:33:31 -0400 From: Doug Anderson To: Linus Walleij Cc: Kukjin Kim , Tomasz Figa , Olof Johansson , Simon Glass , Luigi Semenzato , ilho215.lee@samsung.com, eunki_kim@samsung.com, Doug Anderson , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] pinctrl: exynos: ack level-triggered interrupts before unmasking Date: Wed, 12 Jun 2013 10:33:19 -0700 Message-Id: <1371058399-31933-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.3 In-Reply-To: <1371058399-31933-1-git-send-email-dianders@chromium.org> References: <1371058399-31933-1-git-send-email-dianders@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3204 Lines: 89 A level-triggered interrupt should be acked after the interrupt line becomes inactive and before it is unmasked, or else another interrupt will be immediately triggered. Acking before or after calling the handler is not enough. Signed-off-by: Luigi Semenzato Signed-off-by: Doug Anderson --- drivers/pinctrl/pinctrl-exynos.c | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/pinctrl/pinctrl-exynos.c b/drivers/pinctrl/pinctrl-exynos.c index c0729a3..67b7a27 100644 --- a/drivers/pinctrl/pinctrl-exynos.c +++ b/drivers/pinctrl/pinctrl-exynos.c @@ -81,11 +81,32 @@ static void exynos_gpio_irq_unmask(struct irq_data *irqd) struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd); struct samsung_pinctrl_drv_data *d = bank->drvdata; unsigned long reg_mask = d->ctrl->geint_mask + bank->eint_offset; + unsigned long reg_con = d->ctrl->geint_con + bank->eint_offset; + unsigned int pin = irqd->hwirq; + unsigned int shift = EXYNOS_EINT_CON_LEN * pin; + unsigned int con, trig_type; unsigned long mask; unsigned long flags; spin_lock_irqsave(&bank->slock, flags); + /* + * Ack level interrupts right before unmask + * + * If we don't do this we'll get a double-interrupt. Level triggered + * interrupts must not fire an interrupt if the level is not + * _currently_ active, even if it was active while the interrupt was + * masked. + */ + con = readl(d->virt_base + reg_con); + trig_type = (con >> shift) & EXYNOS_EINT_CON_MASK; + switch (trig_type) { + case EXYNOS_EINT_LEVEL_HIGH: + case EXYNOS_EINT_LEVEL_LOW: + exynos_gpio_irq_ack(irqd); + break; + } + mask = readl(d->virt_base + reg_mask); mask &= ~(1 << irqd->hwirq); writel(mask, d->virt_base + reg_mask); @@ -299,11 +320,32 @@ static void exynos_wkup_irq_unmask(struct irq_data *irqd) struct samsung_pin_bank *b = irq_data_get_irq_chip_data(irqd); struct samsung_pinctrl_drv_data *d = b->drvdata; unsigned long reg_mask = d->ctrl->weint_mask + b->eint_offset; + unsigned long reg_con = d->ctrl->weint_con + b->eint_offset; + unsigned int pin = irqd->hwirq; + unsigned long shift = EXYNOS_EINT_CON_LEN * pin; + unsigned long con, trig_type; unsigned long mask; unsigned long flags; spin_lock_irqsave(&b->slock, flags); + /* + * Ack level interrupts right before unmask + * + * If we don't do this we'll get a double-interrupt. Level triggered + * interrupts must not fire an interrupt if the level is not + * _currently_ active, even if it was active while the interrupt was + * masked. + */ + con = readl(d->virt_base + reg_con); + trig_type = (con >> shift) & EXYNOS_EINT_CON_MASK; + switch (trig_type) { + case EXYNOS_EINT_LEVEL_HIGH: + case EXYNOS_EINT_LEVEL_LOW: + exynos_wkup_irq_ack(irqd); + break; + } + mask = readl(d->virt_base + reg_mask); mask &= ~(1 << irqd->hwirq); writel(mask, d->virt_base + reg_mask); -- 1.8.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/