From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 593B4D2FEED for ; Tue, 27 Jan 2026 21:47:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kyfVtk9zi6+NhtDHUj2mssCXD9xCzwzmnho9+XXswKE=; b=gqXjACGdubYxvdC1kAdalQ4YtR WV/f4IggazpqAWfD+RE8h15S+edmjR98iR2Nxh8XSzFn2gymKf50VKiwKBS+zvF9QAGv0RWK1cp0z toq/4mLQ2d1oenLYdUXW84cuNQhCPBKnDff8x8to41chJ3ZKwhB30tUH4ULdPnuhYuazZYK2gjY/7 vupx15lKlIhXHH6ldfsrij5Ts1kaPO69bCaN3ggzA4X3pxz348W8fxKL4iw0eFb9WAaNEuiPCF1Bt IPtH1XKrkOy6NSZE80xwTVxl4p9ZG8U8/r/3LUDDu5uYV9yY29Fa/R+1PAZBI8KwZHG86n+3T3KNI YEpLRU8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vkqtu-0000000F4m0-2MAr; Tue, 27 Jan 2026 21:47:06 +0000 Received: from relay.smtp-ext.broadcom.com ([192.19.166.231]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vkqtr-0000000F4lZ-3K6P for linux-arm-kernel@lists.infradead.org; Tue, 27 Jan 2026 21:47:05 +0000 Received: from mail-lvn-it-01.broadcom.com (mail-lvn-it-01.lvn.broadcom.net [10.36.132.253]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id D6A3EC000722; Tue, 27 Jan 2026 13:46:59 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com D6A3EC000722 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1769550419; bh=Ka4+UYxp5f7tn9EB4qnSBjYo5BPsomks+xzYenlFE4M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vqcn10P4hl/UcLLszJTv6DdwArB8AI177dXMO5LnR4Y0iLUJ33eVdPUT1f7IJA9nF QRN+lPHrADum0vQN2EQKKayrc8rMB5Jf+4adue9NaTM4TYjluk9s4Nf2RKzrj9PJ16 rfqXIX1p6X/h9Ai2Q1LQQ1LnuwpRkP1wCAP1BKrI= Received: from fainelli-desktop.igp.broadcom.net (fainelli-desktop.dhcp.broadcom.net [10.67.48.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-lvn-it-01.broadcom.com (Postfix) with ESMTPSA id BA467199D1; Tue, 27 Jan 2026 13:46:59 -0800 (PST) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Doug Berger , Florian Fainelli , Broadcom internal kernel review list , Linus Walleij , Bartosz Golaszewski , Andy Shevchenko , Christophe Leroy , linux-gpio@vger.kernel.org (open list:GPIO SUBSYSTEM), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM7XXX ARM ARCHITECTURE) Subject: [PATCH v2 3/3] gpio: brcmstb: allow parent_irq to wake Date: Tue, 27 Jan 2026 13:46:56 -0800 Message-ID: <20260127214656.447333-4-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260127214656.447333-1-florian.fainelli@broadcom.com> References: <20260127214656.447333-1-florian.fainelli@broadcom.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260127_134703_986157_DCAB3DC2 X-CRM114-Status: GOOD ( 24.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Doug Berger 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 [florian: port changes after generic gpio chip conversion] Signed-off-by: Florian Fainelli --- drivers/gpio/gpio-brcmstb.c | 90 +++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 28 deletions(-) diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index bf0192b82276..5489c3090aa1 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 @@ -239,6 +240,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 @@ -289,6 +293,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, @@ -462,18 +471,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, @@ -484,6 +493,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); @@ -494,9 +504,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); @@ -519,16 +526,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); @@ -546,8 +548,14 @@ 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); + + /* disable interrupts */ + 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, @@ -563,7 +571,32 @@ 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; + + /* disable interrupts while we save the masks */ + if (priv->parent_irq > 0) + disable_irq(priv->parent_irq); + + brcmstb_gpio_quiesce(priv, true); + + /* Now that the masks have been saved re-enable interrupts */ + if (priv->parent_wake_irq) + enable_irq(priv->parent_irq); + return 0; } @@ -571,25 +604,26 @@ 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); - } + /* disable interrupts while we restore the masks */ + 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) + /* re-enable interrupts */ + 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