From: Doug Berger <opendmb@gmail.com> To: Gregory Fong <gregory.0xf0@gmail.com> Cc: Doug Berger <opendmb@gmail.com>, Linus Walleij <linus.walleij@linaro.org>, Brian Norris <computersforpeace@gmail.com>, Florian Fainelli <f.fainelli@gmail.com>, bcm-kernel-feedback-list@broadcom.com, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/7] gpio: brcmstb: switch to handle_level_irq flow Date: Fri, 29 Sep 2017 20:40:53 -0700 [thread overview] Message-ID: <20170930034057.15166-4-opendmb@gmail.com> (raw) In-Reply-To: <20170930034057.15166-1-opendmb@gmail.com> Reading and writing the gpio bank status register each time a pending interrupt bit is serviced could cause new pending bits to be cleared without servicing the associated interrupts. By using the handle_level_irq flow instead of the handle_simple_irq flow we get proper handling of interrupt masking as well as acking of interrupts. The irq_ack method is added to support this. Fixes: 19a7b6940b78 ("gpio: brcmstb: Add interrupt and wakeup source support") Signed-off-by: Doug Berger <opendmb@gmail.com> --- drivers/gpio/gpio-brcmstb.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index 8945861876f9..c186141927bb 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -114,6 +114,16 @@ static void brcmstb_gpio_irq_unmask(struct irq_data *d) brcmstb_gpio_set_imask(bank, d->hwirq, true); } +static void brcmstb_gpio_irq_ack(struct irq_data *d) +{ + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + struct brcmstb_gpio_bank *bank = gpiochip_get_data(gc); + struct brcmstb_gpio_priv *priv = bank->parent_priv; + u32 mask = BIT(d->hwirq); + + gc->write_reg(priv->reg_base + GIO_STAT(bank->id), mask); +} + static int brcmstb_gpio_irq_set_type(struct irq_data *d, unsigned int type) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); @@ -217,21 +227,16 @@ static void brcmstb_gpio_irq_bank_handler(struct brcmstb_gpio_bank *bank) { struct brcmstb_gpio_priv *priv = bank->parent_priv; struct irq_domain *irq_domain = bank->gc.irqdomain; - void __iomem *reg_base = priv->reg_base; unsigned long status; while ((status = brcmstb_gpio_get_active_irqs(bank))) { int bit; for_each_set_bit(bit, &status, 32) { - u32 stat = bank->gc.read_reg(reg_base + - GIO_STAT(bank->id)); if (bit >= bank->width) dev_warn(&priv->pdev->dev, "IRQ for invalid GPIO (bank=%d, offset=%d)\n", bank->id, bit); - bank->gc.write_reg(reg_base + GIO_STAT(bank->id), - stat | BIT(bit)); generic_handle_irq(irq_find_mapping(irq_domain, bit)); } } @@ -354,6 +359,7 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev, bank->irq_chip.name = dev_name(dev); bank->irq_chip.irq_mask = brcmstb_gpio_irq_mask; bank->irq_chip.irq_unmask = brcmstb_gpio_irq_unmask; + bank->irq_chip.irq_ack = brcmstb_gpio_irq_ack; bank->irq_chip.irq_set_type = brcmstb_gpio_irq_set_type; /* Ensures that all non-wakeup IRQs are disabled at suspend */ @@ -394,7 +400,7 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev, bank->irq_chip.irq_set_wake = brcmstb_gpio_irq_set_wake; err = gpiochip_irqchip_add(&bank->gc, &bank->irq_chip, 0, - handle_simple_irq, IRQ_TYPE_NONE); + handle_level_irq, IRQ_TYPE_NONE); if (err) return err; gpiochip_set_chained_irqchip(&bank->gc, &bank->irq_chip, -- 2.14.1
WARNING: multiple messages have this Message-ID (diff)
From: opendmb@gmail.com (Doug Berger) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/7] gpio: brcmstb: switch to handle_level_irq flow Date: Fri, 29 Sep 2017 20:40:53 -0700 [thread overview] Message-ID: <20170930034057.15166-4-opendmb@gmail.com> (raw) In-Reply-To: <20170930034057.15166-1-opendmb@gmail.com> Reading and writing the gpio bank status register each time a pending interrupt bit is serviced could cause new pending bits to be cleared without servicing the associated interrupts. By using the handle_level_irq flow instead of the handle_simple_irq flow we get proper handling of interrupt masking as well as acking of interrupts. The irq_ack method is added to support this. Fixes: 19a7b6940b78 ("gpio: brcmstb: Add interrupt and wakeup source support") Signed-off-by: Doug Berger <opendmb@gmail.com> --- drivers/gpio/gpio-brcmstb.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index 8945861876f9..c186141927bb 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -114,6 +114,16 @@ static void brcmstb_gpio_irq_unmask(struct irq_data *d) brcmstb_gpio_set_imask(bank, d->hwirq, true); } +static void brcmstb_gpio_irq_ack(struct irq_data *d) +{ + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + struct brcmstb_gpio_bank *bank = gpiochip_get_data(gc); + struct brcmstb_gpio_priv *priv = bank->parent_priv; + u32 mask = BIT(d->hwirq); + + gc->write_reg(priv->reg_base + GIO_STAT(bank->id), mask); +} + static int brcmstb_gpio_irq_set_type(struct irq_data *d, unsigned int type) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); @@ -217,21 +227,16 @@ static void brcmstb_gpio_irq_bank_handler(struct brcmstb_gpio_bank *bank) { struct brcmstb_gpio_priv *priv = bank->parent_priv; struct irq_domain *irq_domain = bank->gc.irqdomain; - void __iomem *reg_base = priv->reg_base; unsigned long status; while ((status = brcmstb_gpio_get_active_irqs(bank))) { int bit; for_each_set_bit(bit, &status, 32) { - u32 stat = bank->gc.read_reg(reg_base + - GIO_STAT(bank->id)); if (bit >= bank->width) dev_warn(&priv->pdev->dev, "IRQ for invalid GPIO (bank=%d, offset=%d)\n", bank->id, bit); - bank->gc.write_reg(reg_base + GIO_STAT(bank->id), - stat | BIT(bit)); generic_handle_irq(irq_find_mapping(irq_domain, bit)); } } @@ -354,6 +359,7 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev, bank->irq_chip.name = dev_name(dev); bank->irq_chip.irq_mask = brcmstb_gpio_irq_mask; bank->irq_chip.irq_unmask = brcmstb_gpio_irq_unmask; + bank->irq_chip.irq_ack = brcmstb_gpio_irq_ack; bank->irq_chip.irq_set_type = brcmstb_gpio_irq_set_type; /* Ensures that all non-wakeup IRQs are disabled at suspend */ @@ -394,7 +400,7 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev, bank->irq_chip.irq_set_wake = brcmstb_gpio_irq_set_wake; err = gpiochip_irqchip_add(&bank->gc, &bank->irq_chip, 0, - handle_simple_irq, IRQ_TYPE_NONE); + handle_level_irq, IRQ_TYPE_NONE); if (err) return err; gpiochip_set_chained_irqchip(&bank->gc, &bank->irq_chip, -- 2.14.1
next prev parent reply other threads:[~2017-09-30 3:40 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-09-30 3:40 [PATCH 0/7] gpio: brcmstb: improved interrupt and wake support Doug Berger 2017-09-30 3:40 ` Doug Berger 2017-09-30 3:40 ` [PATCH 1/7] gpio: brcmstb: allow all instances to be wakeup sources Doug Berger 2017-09-30 3:40 ` Doug Berger 2017-10-04 1:40 ` Gregory Fong 2017-10-04 1:40 ` Gregory Fong 2017-10-04 1:40 ` Gregory Fong 2017-10-07 10:52 ` Linus Walleij 2017-10-07 10:52 ` Linus Walleij 2017-10-07 10:52 ` Linus Walleij 2017-09-30 3:40 ` [PATCH 2/7] gpio: brcmstb: release the bgpio lock during irq handlers Doug Berger 2017-09-30 3:40 ` Doug Berger 2017-10-04 1:55 ` Gregory Fong 2017-10-04 1:55 ` Gregory Fong 2017-10-04 1:55 ` Gregory Fong 2017-10-04 2:09 ` Doug Berger 2017-10-04 2:09 ` Doug Berger 2017-10-04 2:09 ` Doug Berger 2017-10-04 3:07 ` Gregory Fong 2017-10-04 3:07 ` Gregory Fong 2017-10-04 3:07 ` Gregory Fong 2017-09-30 3:40 ` Doug Berger [this message] 2017-09-30 3:40 ` [PATCH 3/7] gpio: brcmstb: switch to handle_level_irq flow Doug Berger 2017-10-04 1:59 ` Gregory Fong 2017-10-04 1:59 ` Gregory Fong 2017-10-04 1:59 ` Gregory Fong 2017-09-30 3:40 ` [PATCH 4/7] gpio: brcmstb: correct the configuration of level interrupts Doug Berger 2017-09-30 3:40 ` Doug Berger 2017-10-04 2:03 ` Gregory Fong 2017-10-04 2:03 ` Gregory Fong 2017-10-04 2:03 ` Gregory Fong 2017-09-30 3:40 ` [PATCH 5/7] gpio: brcmstb: enable masking of interrupts when changing type Doug Berger 2017-09-30 3:40 ` Doug Berger 2017-10-04 2:10 ` Gregory Fong 2017-10-04 2:10 ` Gregory Fong 2017-10-04 2:10 ` Gregory Fong 2017-10-04 2:22 ` Doug Berger 2017-10-04 2:22 ` Doug Berger 2017-10-04 2:22 ` Doug Berger 2017-10-04 3:15 ` Gregory Fong 2017-10-04 3:15 ` Gregory Fong 2017-10-04 3:15 ` Gregory Fong 2017-09-30 3:40 ` [PATCH 6/7] gpio: brcmstb: consolidate interrupt domains Doug Berger 2017-09-30 3:40 ` Doug Berger 2017-10-04 3:03 ` Gregory Fong 2017-10-04 3:03 ` Gregory Fong 2017-10-04 3:03 ` Gregory Fong 2017-10-04 21:24 ` Doug Berger 2017-10-04 21:24 ` Doug Berger 2017-10-04 21:24 ` Doug Berger 2017-10-16 23:04 ` Doug Berger 2017-10-16 23:04 ` Doug Berger 2017-10-16 23:04 ` Doug Berger 2017-10-19 7:57 ` Gregory Fong 2017-10-19 7:57 ` Gregory Fong 2017-10-19 7:57 ` Gregory Fong 2017-10-19 18:25 ` Doug Berger 2017-10-19 18:25 ` Doug Berger 2017-10-19 18:25 ` Doug Berger 2017-09-30 3:40 ` [PATCH 7/7] gpio: brcmstb: implement suspend/resume/shutdown Doug Berger 2017-09-30 3:40 ` Doug Berger 2017-10-19 9:03 ` Gregory Fong 2017-10-19 9:03 ` Gregory Fong 2017-10-19 18:39 ` Doug Berger 2017-10-19 18:39 ` Doug Berger 2017-10-21 0:54 ` Gregory Fong 2017-10-21 0:54 ` Gregory Fong 2017-10-21 0:54 ` Gregory Fong 2017-10-23 23:06 ` Doug Berger 2017-10-23 23:06 ` Doug Berger 2017-10-23 23:06 ` Doug Berger 2017-09-30 5:34 ` [PATCH 0/7] gpio: brcmstb: improved interrupt and wake support Florian Fainelli 2017-09-30 5:34 ` Florian Fainelli 2017-10-07 10:54 ` Linus Walleij 2017-10-07 10:54 ` Linus Walleij 2017-10-07 10:54 ` 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=20170930034057.15166-4-opendmb@gmail.com \ --to=opendmb@gmail.com \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=computersforpeace@gmail.com \ --cc=f.fainelli@gmail.com \ --cc=gregory.0xf0@gmail.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ /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.