gpio: brcmstb: allow parent_irq to wake

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>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Link: https://patch.msgid.link/20260204164333.1146039-4-florian.fainelli@broadcom.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>

diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c
index 7ebf1217f383d095c76f1ea47d1aa30ce89ad2be..44ca798cf832a71d0b5c411f3974ca864439175b 100644 (file)
--- 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),
 };