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 2/7] gpio: brcmstb: release the bgpio lock during irq handlers Date: Fri, 29 Sep 2017 20:40:52 -0700 [thread overview] Message-ID: <20170930034057.15166-3-opendmb@gmail.com> (raw) In-Reply-To: <20170930034057.15166-1-opendmb@gmail.com> The basic memory-mapped GPIO controller lock must be released before calling the registered GPIO interrupt handlers to allow the interrupt handlers to access the hardware. Otherwise, the hardware accesses will deadlock when they attempt to grab the lock. Since the lock is only needed to protect the calculation of unmasked pending interrupts create a dedicated function to perform this and hide the complexity. Fixes: 19a7b6940b78 ("gpio: brcmstb: Add interrupt and wakeup source support") Signed-off-by: Doug Berger <opendmb@gmail.com> --- drivers/gpio/gpio-brcmstb.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index 7f39b160a4d5..8945861876f9 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -62,6 +62,21 @@ brcmstb_gpio_gc_to_priv(struct gpio_chip *gc) return bank->parent_priv; } +static unsigned long +brcmstb_gpio_get_active_irqs(struct brcmstb_gpio_bank *bank) +{ + void __iomem *reg_base = bank->parent_priv->reg_base; + unsigned long status; + unsigned long flags; + + spin_lock_irqsave(&bank->gc.bgpio_lock, flags); + status = bank->gc.read_reg(reg_base + GIO_STAT(bank->id)) & + bank->gc.read_reg(reg_base + GIO_MASK(bank->id)); + spin_unlock_irqrestore(&bank->gc.bgpio_lock, flags); + + return status; +} + static void brcmstb_gpio_set_imask(struct brcmstb_gpio_bank *bank, unsigned int offset, bool enable) { @@ -204,11 +219,8 @@ static void brcmstb_gpio_irq_bank_handler(struct brcmstb_gpio_bank *bank) struct irq_domain *irq_domain = bank->gc.irqdomain; void __iomem *reg_base = priv->reg_base; unsigned long status; - unsigned long flags; - spin_lock_irqsave(&bank->gc.bgpio_lock, flags); - while ((status = bank->gc.read_reg(reg_base + GIO_STAT(bank->id)) & - bank->gc.read_reg(reg_base + GIO_MASK(bank->id)))) { + while ((status = brcmstb_gpio_get_active_irqs(bank))) { int bit; for_each_set_bit(bit, &status, 32) { @@ -223,7 +235,6 @@ static void brcmstb_gpio_irq_bank_handler(struct brcmstb_gpio_bank *bank) generic_handle_irq(irq_find_mapping(irq_domain, bit)); } } - spin_unlock_irqrestore(&bank->gc.bgpio_lock, flags); } /* Each UPG GIO block has one IRQ for all banks */ -- 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 2/7] gpio: brcmstb: release the bgpio lock during irq handlers Date: Fri, 29 Sep 2017 20:40:52 -0700 [thread overview] Message-ID: <20170930034057.15166-3-opendmb@gmail.com> (raw) In-Reply-To: <20170930034057.15166-1-opendmb@gmail.com> The basic memory-mapped GPIO controller lock must be released before calling the registered GPIO interrupt handlers to allow the interrupt handlers to access the hardware. Otherwise, the hardware accesses will deadlock when they attempt to grab the lock. Since the lock is only needed to protect the calculation of unmasked pending interrupts create a dedicated function to perform this and hide the complexity. Fixes: 19a7b6940b78 ("gpio: brcmstb: Add interrupt and wakeup source support") Signed-off-by: Doug Berger <opendmb@gmail.com> --- drivers/gpio/gpio-brcmstb.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index 7f39b160a4d5..8945861876f9 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -62,6 +62,21 @@ brcmstb_gpio_gc_to_priv(struct gpio_chip *gc) return bank->parent_priv; } +static unsigned long +brcmstb_gpio_get_active_irqs(struct brcmstb_gpio_bank *bank) +{ + void __iomem *reg_base = bank->parent_priv->reg_base; + unsigned long status; + unsigned long flags; + + spin_lock_irqsave(&bank->gc.bgpio_lock, flags); + status = bank->gc.read_reg(reg_base + GIO_STAT(bank->id)) & + bank->gc.read_reg(reg_base + GIO_MASK(bank->id)); + spin_unlock_irqrestore(&bank->gc.bgpio_lock, flags); + + return status; +} + static void brcmstb_gpio_set_imask(struct brcmstb_gpio_bank *bank, unsigned int offset, bool enable) { @@ -204,11 +219,8 @@ static void brcmstb_gpio_irq_bank_handler(struct brcmstb_gpio_bank *bank) struct irq_domain *irq_domain = bank->gc.irqdomain; void __iomem *reg_base = priv->reg_base; unsigned long status; - unsigned long flags; - spin_lock_irqsave(&bank->gc.bgpio_lock, flags); - while ((status = bank->gc.read_reg(reg_base + GIO_STAT(bank->id)) & - bank->gc.read_reg(reg_base + GIO_MASK(bank->id)))) { + while ((status = brcmstb_gpio_get_active_irqs(bank))) { int bit; for_each_set_bit(bit, &status, 32) { @@ -223,7 +235,6 @@ static void brcmstb_gpio_irq_bank_handler(struct brcmstb_gpio_bank *bank) generic_handle_irq(irq_find_mapping(irq_domain, bit)); } } - spin_unlock_irqrestore(&bank->gc.bgpio_lock, flags); } /* Each UPG GIO block has one IRQ for all banks */ -- 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 ` Doug Berger [this message] 2017-09-30 3:40 ` [PATCH 2/7] gpio: brcmstb: release the bgpio lock during irq handlers 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 ` [PATCH 3/7] gpio: brcmstb: switch to handle_level_irq flow Doug Berger 2017-09-30 3:40 ` 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-3-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.