* [PATCH v5 1/3] gpio: brcmstb: Utilize irqd_to_hwirq(d) instead of d->hwirq
2026-02-04 16:43 [PATCH v5 0/3] gpio: brcmstb: wake-up interrupt improvements Florian Fainelli
@ 2026-02-04 16:43 ` Florian Fainelli
2026-02-04 16:43 ` [PATCH v5 2/3] gpio: brcmstb: implement .irq_mask_ack() Florian Fainelli
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2026-02-04 16:43 UTC (permalink / raw)
To: linux-kernel
Cc: Florian Fainelli, Linus Walleij, Andy Shevchenko, Doug Berger,
Broadcom internal kernel review list, Bartosz Golaszewski,
Andy Shevchenko, Christophe Leroy, open list:GPIO SUBSYSTEM,
moderated list:BROADCOM BCM7XXX ARM ARCHITECTURE
Consistently use irqd_to_hwirq(d) which is the recommended helper to
fetch the hardware IRQ number from an irq_data structure. While at it,
update the brcmstb_gpio_set_imask() function signature to use the proper
type for the "hwirq" argument rather than "unsigned int".
Reviewed-by: Linus Walleij <linusw@kernel.org>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
drivers/gpio/gpio-brcmstb.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c
index 2352d099709c..4c35ed664f65 100644
--- a/drivers/gpio/gpio-brcmstb.c
+++ b/drivers/gpio/gpio-brcmstb.c
@@ -96,7 +96,7 @@ static int brcmstb_gpio_hwirq_to_offset(irq_hw_number_t hwirq,
}
static void brcmstb_gpio_set_imask(struct brcmstb_gpio_bank *bank,
- unsigned int hwirq, bool enable)
+ irq_hw_number_t hwirq, bool enable)
{
struct brcmstb_gpio_priv *priv = bank->parent_priv;
u32 mask = BIT(brcmstb_gpio_hwirq_to_offset(hwirq, bank));
@@ -132,7 +132,7 @@ static void brcmstb_gpio_irq_mask(struct irq_data *d)
struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct brcmstb_gpio_bank *bank = gpiochip_get_data(gc);
- brcmstb_gpio_set_imask(bank, d->hwirq, false);
+ brcmstb_gpio_set_imask(bank, irqd_to_hwirq(d), false);
}
static void brcmstb_gpio_irq_unmask(struct irq_data *d)
@@ -140,7 +140,7 @@ static void brcmstb_gpio_irq_unmask(struct irq_data *d)
struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct brcmstb_gpio_bank *bank = gpiochip_get_data(gc);
- brcmstb_gpio_set_imask(bank, d->hwirq, true);
+ brcmstb_gpio_set_imask(bank, irqd_to_hwirq(d), true);
}
static void brcmstb_gpio_irq_ack(struct irq_data *d)
@@ -148,7 +148,7 @@ 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(brcmstb_gpio_hwirq_to_offset(d->hwirq, bank));
+ u32 mask = BIT(brcmstb_gpio_hwirq_to_offset(irqd_to_hwirq(d), bank));
gpio_generic_write_reg(&bank->chip,
priv->reg_base + GIO_STAT(bank->id), mask);
@@ -159,7 +159,7 @@ 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);
struct brcmstb_gpio_bank *bank = gpiochip_get_data(gc);
struct brcmstb_gpio_priv *priv = bank->parent_priv;
- u32 mask = BIT(brcmstb_gpio_hwirq_to_offset(d->hwirq, bank));
+ u32 mask = BIT(brcmstb_gpio_hwirq_to_offset(irqd_to_hwirq(d), bank));
u32 edge_insensitive, iedge_insensitive;
u32 edge_config, iedge_config;
u32 level, ilevel;
@@ -236,7 +236,7 @@ static int brcmstb_gpio_irq_set_wake(struct irq_data *d, unsigned int enable)
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(brcmstb_gpio_hwirq_to_offset(d->hwirq, bank));
+ u32 mask = BIT(brcmstb_gpio_hwirq_to_offset(irqd_to_hwirq(d), bank));
/*
* Do not do anything specific for now, suspend/resume callbacks will
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v5 2/3] gpio: brcmstb: implement .irq_mask_ack()
2026-02-04 16:43 [PATCH v5 0/3] gpio: brcmstb: wake-up interrupt improvements Florian Fainelli
2026-02-04 16:43 ` [PATCH v5 1/3] gpio: brcmstb: Utilize irqd_to_hwirq(d) instead of d->hwirq Florian Fainelli
@ 2026-02-04 16:43 ` Florian Fainelli
2026-02-04 16:43 ` [PATCH v5 3/3] gpio: brcmstb: allow parent_irq to wake Florian Fainelli
2026-02-23 9:57 ` [PATCH v5 0/3] gpio: brcmstb: wake-up interrupt improvements Bartosz Golaszewski
3 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2026-02-04 16:43 UTC (permalink / raw)
To: linux-kernel
Cc: Doug Berger, Linus Walleij, Andy Shevchenko, Florian Fainelli,
Broadcom internal kernel review list, Bartosz Golaszewski,
Andy Shevchenko, Christophe Leroy, open list:GPIO SUBSYSTEM,
moderated list:BROADCOM BCM7XXX ARM ARCHITECTURE
From: Doug Berger <opendmb@gmail.com>
The .irq_mask_ack() operation is slightly more efficient than doing
.irq_mask() and .irq_ack() separately.
More importantly for this driver it bypasses the check of
irqd_irq_masked ensuring a previously masked but still active
interrupt gets remasked if unmasked at the hardware level. This
allows the driver to more efficiently unmask the wake capable
interrupts when quiescing without needing to enable the irqs
individually to clear the irqd_irq_masked state.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Doug Berger <opendmb@gmail.com>
Co-developed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
drivers/gpio/gpio-brcmstb.c | 30 +++++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c
index 4c35ed664f65..7ebf1217f383 100644
--- a/drivers/gpio/gpio-brcmstb.c
+++ b/drivers/gpio/gpio-brcmstb.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
-// Copyright (C) 2015-2017 Broadcom
+// Copyright (C) 2015-2017, 2026 Broadcom
#include <linux/bitops.h>
#include <linux/gpio/driver.h>
@@ -95,15 +95,13 @@ static int brcmstb_gpio_hwirq_to_offset(irq_hw_number_t hwirq,
return hwirq - bank->chip.gc.offset;
}
-static void brcmstb_gpio_set_imask(struct brcmstb_gpio_bank *bank,
- irq_hw_number_t hwirq, bool enable)
+static void __brcmstb_gpio_set_imask(struct brcmstb_gpio_bank *bank,
+ irq_hw_number_t hwirq, bool enable)
{
struct brcmstb_gpio_priv *priv = bank->parent_priv;
u32 mask = BIT(brcmstb_gpio_hwirq_to_offset(hwirq, bank));
u32 imask;
- guard(gpio_generic_lock_irqsave)(&bank->chip);
-
imask = gpio_generic_read_reg(&bank->chip,
priv->reg_base + GIO_MASK(bank->id));
if (enable)
@@ -114,6 +112,13 @@ static void brcmstb_gpio_set_imask(struct brcmstb_gpio_bank *bank,
priv->reg_base + GIO_MASK(bank->id), imask);
}
+static void brcmstb_gpio_set_imask(struct brcmstb_gpio_bank *bank,
+ irq_hw_number_t hwirq, bool enable)
+{
+ guard(gpio_generic_lock_irqsave)(&bank->chip);
+ __brcmstb_gpio_set_imask(bank, hwirq, enable);
+}
+
static int brcmstb_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
{
struct brcmstb_gpio_priv *priv = brcmstb_gpio_gc_to_priv(gc);
@@ -135,6 +140,20 @@ static void brcmstb_gpio_irq_mask(struct irq_data *d)
brcmstb_gpio_set_imask(bank, irqd_to_hwirq(d), false);
}
+static void brcmstb_gpio_irq_mask_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;
+ irq_hw_number_t hwirq = irqd_to_hwirq(d);
+ u32 mask = BIT(brcmstb_gpio_hwirq_to_offset(hwirq, bank));
+
+ guard(gpio_generic_lock_irqsave)(&bank->chip);
+ __brcmstb_gpio_set_imask(bank, hwirq, false);
+ gpio_generic_write_reg(&bank->chip,
+ priv->reg_base + GIO_STAT(bank->id), mask);
+}
+
static void brcmstb_gpio_irq_unmask(struct irq_data *d)
{
struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
@@ -471,6 +490,7 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,
priv->irq_chip.name = dev_name(dev);
priv->irq_chip.irq_disable = brcmstb_gpio_irq_mask;
priv->irq_chip.irq_mask = brcmstb_gpio_irq_mask;
+ priv->irq_chip.irq_mask_ack = brcmstb_gpio_irq_mask_ack;
priv->irq_chip.irq_unmask = brcmstb_gpio_irq_unmask;
priv->irq_chip.irq_ack = brcmstb_gpio_irq_ack;
priv->irq_chip.irq_set_type = brcmstb_gpio_irq_set_type;
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v5 3/3] gpio: brcmstb: allow parent_irq to wake
2026-02-04 16:43 [PATCH v5 0/3] gpio: brcmstb: wake-up interrupt improvements Florian Fainelli
2026-02-04 16:43 ` [PATCH v5 1/3] gpio: brcmstb: Utilize irqd_to_hwirq(d) instead of d->hwirq Florian Fainelli
2026-02-04 16:43 ` [PATCH v5 2/3] gpio: brcmstb: implement .irq_mask_ack() Florian Fainelli
@ 2026-02-04 16:43 ` Florian Fainelli
2026-02-07 21:47 ` Linus Walleij
2026-02-23 9:57 ` [PATCH v5 0/3] gpio: brcmstb: wake-up interrupt improvements Bartosz Golaszewski
3 siblings, 1 reply; 6+ messages in thread
From: Florian Fainelli @ 2026-02-04 16:43 UTC (permalink / raw)
To: linux-kernel
Cc: Doug Berger, Florian Fainelli,
Broadcom internal kernel review list, Linus Walleij,
Bartosz Golaszewski, Andy Shevchenko, Christophe Leroy,
open list:GPIO SUBSYSTEM,
moderated list:BROADCOM BCM7XXX ARM ARCHITECTURE
From: Doug Berger <opendmb@gmail.com>
The classic parent_wake_irq can only occur after the system has
been placed into a hardware managed power management state. This
prevents its use for waking from software managed suspend states
like s2idle.
By allowing the parent_irq to be enabled for wake enabled GPIO
during suspend, these GPIO can now be used to wake from these
states. The 'suspended' boolean is introduced to support wake
event accounting.
Signed-off-by: Doug Berger <opendmb@gmail.com>
[florian: port changes after generic gpio chip conversion]
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
drivers/gpio/gpio-brcmstb.c | 85 +++++++++++++++++++++++++------------
1 file changed, 57 insertions(+), 28 deletions(-)
diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c
index 7ebf1217f383..44ca798cf832 100644
--- a/drivers/gpio/gpio-brcmstb.c
+++ b/drivers/gpio/gpio-brcmstb.c
@@ -54,6 +54,7 @@ struct brcmstb_gpio_priv {
int parent_irq;
int num_gpios;
int parent_wake_irq;
+ bool suspended;
};
#define MAX_GPIO_PER_BANK 32
@@ -240,6 +241,9 @@ static int brcmstb_gpio_priv_set_wake(struct brcmstb_gpio_priv *priv,
{
int ret = 0;
+ if (priv->parent_wake_irq == priv->parent_irq)
+ return ret;
+
if (enable)
ret = enable_irq_wake(priv->parent_wake_irq);
else
@@ -290,6 +294,11 @@ static void brcmstb_gpio_irq_bank_handler(struct brcmstb_gpio_bank *bank)
while ((status = brcmstb_gpio_get_active_irqs(bank))) {
unsigned int offset;
+ if (priv->suspended && bank->wake_active & status) {
+ priv->suspended = false;
+ pm_wakeup_event(&priv->pdev->dev, 0);
+ }
+
for_each_set_bit(offset, &status, 32) {
if (offset >= bank->width)
dev_warn(&priv->pdev->dev,
@@ -463,18 +472,18 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,
}
if (of_property_read_bool(np, "wakeup-source")) {
+ /*
+ * Set wakeup capability so we can process boot-time
+ * "wakeups" (e.g., from S5 cold boot).
+ */
+ device_set_wakeup_capable(dev, true);
+ device_wakeup_enable(dev);
priv->parent_wake_irq = platform_get_irq(pdev, 1);
if (priv->parent_wake_irq < 0) {
- priv->parent_wake_irq = 0;
+ priv->parent_wake_irq = priv->parent_irq;
dev_warn(dev,
"Couldn't get wake IRQ - GPIOs will not be able to wake from sleep");
} else {
- /*
- * Set wakeup capability so we can process boot-time
- * "wakeups" (e.g., from S5 cold boot)
- */
- device_set_wakeup_capable(dev, true);
- device_wakeup_enable(dev);
err = devm_request_irq(dev, priv->parent_wake_irq,
brcmstb_gpio_wake_irq_handler,
IRQF_SHARED,
@@ -485,6 +494,7 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,
goto out_free_domain;
}
}
+ priv->irq_chip.irq_set_wake = brcmstb_gpio_irq_set_wake;
}
priv->irq_chip.name = dev_name(dev);
@@ -495,9 +505,6 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,
priv->irq_chip.irq_ack = brcmstb_gpio_irq_ack;
priv->irq_chip.irq_set_type = brcmstb_gpio_irq_set_type;
- if (priv->parent_wake_irq)
- priv->irq_chip.irq_set_wake = brcmstb_gpio_irq_set_wake;
-
irq_set_chained_handler_and_data(priv->parent_irq,
brcmstb_gpio_irq_handler, priv);
irq_set_status_flags(priv->parent_irq, IRQ_DISABLE_UNLAZY);
@@ -520,16 +527,11 @@ static void brcmstb_gpio_bank_save(struct brcmstb_gpio_priv *priv,
priv->reg_base + GIO_BANK_OFF(bank->id, i));
}
-static void brcmstb_gpio_quiesce(struct device *dev, bool save)
+static void brcmstb_gpio_quiesce(struct brcmstb_gpio_priv *priv, bool save)
{
- struct brcmstb_gpio_priv *priv = dev_get_drvdata(dev);
struct brcmstb_gpio_bank *bank;
u32 imask;
- /* disable non-wake interrupt */
- if (priv->parent_irq >= 0)
- disable_irq(priv->parent_irq);
-
list_for_each_entry(bank, &priv->bank_list, node) {
if (save)
brcmstb_gpio_bank_save(priv, bank);
@@ -547,8 +549,13 @@ static void brcmstb_gpio_quiesce(struct device *dev, bool save)
static void brcmstb_gpio_shutdown(struct platform_device *pdev)
{
+ struct brcmstb_gpio_priv *priv = dev_get_drvdata(&pdev->dev);
+
+ if (priv->parent_irq > 0)
+ disable_irq(priv->parent_irq);
+
/* Enable GPIO for S5 cold boot */
- brcmstb_gpio_quiesce(&pdev->dev, false);
+ brcmstb_gpio_quiesce(priv, false);
}
static void brcmstb_gpio_bank_restore(struct brcmstb_gpio_priv *priv,
@@ -564,7 +571,30 @@ static void brcmstb_gpio_bank_restore(struct brcmstb_gpio_priv *priv,
static int brcmstb_gpio_suspend(struct device *dev)
{
- brcmstb_gpio_quiesce(dev, true);
+ struct brcmstb_gpio_priv *priv = dev_get_drvdata(dev);
+
+ if (priv->parent_irq > 0)
+ priv->suspended = true;
+
+ return 0;
+}
+
+static int brcmstb_gpio_suspend_noirq(struct device *dev)
+{
+ struct brcmstb_gpio_priv *priv = dev_get_drvdata(dev);
+
+ /* Catch any wakeup sources occurring between suspend and noirq */
+ if (!priv->suspended)
+ return -EBUSY;
+
+ if (priv->parent_irq > 0)
+ disable_irq(priv->parent_irq);
+
+ brcmstb_gpio_quiesce(priv, true);
+
+ if (priv->parent_wake_irq)
+ enable_irq(priv->parent_irq);
+
return 0;
}
@@ -572,25 +602,24 @@ static int brcmstb_gpio_resume(struct device *dev)
{
struct brcmstb_gpio_priv *priv = dev_get_drvdata(dev);
struct brcmstb_gpio_bank *bank;
- bool need_wakeup_event = false;
- list_for_each_entry(bank, &priv->bank_list, node) {
- need_wakeup_event |= !!__brcmstb_gpio_get_active_irqs(bank);
- brcmstb_gpio_bank_restore(priv, bank);
- }
+ if (priv->parent_wake_irq)
+ disable_irq(priv->parent_irq);
- if (priv->parent_wake_irq && need_wakeup_event)
- pm_wakeup_event(dev, 0);
+ priv->suspended = false;
+
+ list_for_each_entry(bank, &priv->bank_list, node)
+ brcmstb_gpio_bank_restore(priv, bank);
- /* enable non-wake interrupt */
- if (priv->parent_irq >= 0)
+ if (priv->parent_irq > 0)
enable_irq(priv->parent_irq);
return 0;
}
static const struct dev_pm_ops brcmstb_gpio_pm_ops = {
- .suspend_noirq = pm_sleep_ptr(brcmstb_gpio_suspend),
+ .suspend = pm_sleep_ptr(brcmstb_gpio_suspend),
+ .suspend_noirq = pm_sleep_ptr(brcmstb_gpio_suspend_noirq),
.resume_noirq = pm_sleep_ptr(brcmstb_gpio_resume),
};
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v5 3/3] gpio: brcmstb: allow parent_irq to wake
2026-02-04 16:43 ` [PATCH v5 3/3] gpio: brcmstb: allow parent_irq to wake Florian Fainelli
@ 2026-02-07 21:47 ` Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2026-02-07 21:47 UTC (permalink / raw)
To: Florian Fainelli
Cc: linux-kernel, Doug Berger, Broadcom internal kernel review list,
Bartosz Golaszewski, Andy Shevchenko, Christophe Leroy,
open list:GPIO SUBSYSTEM,
moderated list:BROADCOM BCM7XXX ARM ARCHITECTURE
On Wed, Feb 4, 2026 at 5:43 PM Florian Fainelli
<florian.fainelli@broadcom.com> wrote:
> From: Doug Berger <opendmb@gmail.com>
>
> The classic parent_wake_irq can only occur after the system has
> been placed into a hardware managed power management state. This
> prevents its use for waking from software managed suspend states
> like s2idle.
>
> By allowing the parent_irq to be enabled for wake enabled GPIO
> during suspend, these GPIO can now be used to wake from these
> states. The 'suspended' boolean is introduced to support wake
> event accounting.
>
> Signed-off-by: Doug Berger <opendmb@gmail.com>
> [florian: port changes after generic gpio chip conversion]
> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
This looks correct as far as I can understand.
I wish all GPIO drivers has as elaborate wakeup handling...
I will look at this driver to see how it should be done properly.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v5 0/3] gpio: brcmstb: wake-up interrupt improvements
2026-02-04 16:43 [PATCH v5 0/3] gpio: brcmstb: wake-up interrupt improvements Florian Fainelli
` (2 preceding siblings ...)
2026-02-04 16:43 ` [PATCH v5 3/3] gpio: brcmstb: allow parent_irq to wake Florian Fainelli
@ 2026-02-23 9:57 ` Bartosz Golaszewski
3 siblings, 0 replies; 6+ messages in thread
From: Bartosz Golaszewski @ 2026-02-23 9:57 UTC (permalink / raw)
To: linux-kernel, Florian Fainelli
Cc: Bartosz Golaszewski, Doug Berger,
Broadcom internal kernel review list, Linus Walleij,
Bartosz Golaszewski, Andy Shevchenko, Christophe Leroy,
linux-gpio, linux-arm-kernel
On Wed, 04 Feb 2026 08:43:30 -0800, Florian Fainelli wrote:
> Changes in v5:
>
> - collected additional Reviewed-by tags
> - utilize irq_hw_number_t in brcmstb_gpio_set_imask()
> - clarified that irq_mask_ack/irq_mask/irq_ack are functions
>
> Changes in v4:
>
> [...]
Applied, thanks!
[1/3] gpio: brcmstb: Utilize irqd_to_hwirq(d) instead of d->hwirq
https://git.kernel.org/brgl/c/5711ae6de0646dcf5bf90cc9d4d7cacd34896472
[2/3] gpio: brcmstb: implement .irq_mask_ack()
https://git.kernel.org/brgl/c/66ff5094240e6e5cea743f5e656e28734de31f1e
[3/3] gpio: brcmstb: allow parent_irq to wake
https://git.kernel.org/brgl/c/2c46f19c9adf7634d1eb4ce89a715ca3b0374134
Best regards,
--
Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 6+ messages in thread