From nobody Sat Feb 7 22:21:15 2026 Received: from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com [192.19.166.231]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A427234164B; Thu, 22 Jan 2026 01:13:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.166.231 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769044437; cv=none; b=JDWZ8C7JASUcDmQyjxDDxFwCXh22TyEapN46vdmXu/UXSs/qNvfghguef+ZMpmmm+ym4vAEsUTiCGvJf+7LpgFt7vrLO43zAr1o7Xsx3QHlemZi7ymgEBNLqqOMIHVkj/oRjiJ/GeCG38FtKYBhcR0nrEnJnosb002WgZSkSP5E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769044437; c=relaxed/simple; bh=HTp+Do+BE5EGcVI/v3yRKJyoUKPYpIeDXAWsrGMIs+E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hTJhB3IZMv7qQt4qtsMuu7RVLpyotHvRq61uDbw47TqL7Nuc+SXXf5gOnYzvi6+lYn1xiQUbg21vB8j06feTjtgX+Ahl+YLkEP09+n8OzHJcCZ7FphrJX3qsIz5/VYcSe6O9KgUSUP+s7iiNqNnnAB11LbvWt0d/jWR/0zOTNJU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=nsUvtL+k; arc=none smtp.client-ip=192.19.166.231 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="nsUvtL+k" 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 B1161C008DE1; Wed, 21 Jan 2026 17:06:25 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com B1161C008DE1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1769043985; bh=HTp+Do+BE5EGcVI/v3yRKJyoUKPYpIeDXAWsrGMIs+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nsUvtL+kfOAq+lSzB9gWV8gk/+wPQbgTDEHbbWICbYWqeNAUNBkVw4B1yf1qZrAO8 iCxoYXBU89u7Sr35hgzAQZ+Wwaf8xObeyjLEfOo+kpdOz3EB04qZHdR8Tbb9NIoRc8 foZEM+kOqwWM9K8dS7vbDQUz1ofY5yWYDmayLSr4= 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 924B019CD8; Wed, 21 Jan 2026 17:06:25 -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 1/3] gpio: brcmstb: correct hwirq to bank map Date: Wed, 21 Jan 2026 17:05:14 -0800 Message-ID: <20260122010516.1200630-2-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260122010516.1200630-1-florian.fainelli@broadcom.com> References: <20260122010516.1200630-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Doug Berger The brcmstb_gpio_hwirq_to_bank() function was designed to accommodate the downward numbering of dynamic GPIOs by traversing the bank list in the reverse order. However, the dynamic numbering has changed to increment upward which can produce an incorrect mapping. The function is modified to no longer assume an ordering of the list to accommodate either option. Fixes: 7b61212f2a07 ("gpiolib: Get rid of ARCH_NR_GPIOS") Signed-off-by: Doug Berger Signed-off-by: Florian Fainelli --- drivers/gpio/gpio-brcmstb.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index af9287ff5dc4..2352d099709c 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -301,12 +301,10 @@ static struct brcmstb_gpio_bank *brcmstb_gpio_hwirq_t= o_bank( struct brcmstb_gpio_priv *priv, irq_hw_number_t hwirq) { struct brcmstb_gpio_bank *bank; - int i =3D 0; =20 - /* banks are in descending order */ - list_for_each_entry_reverse(bank, &priv->bank_list, node) { - i +=3D bank->chip.gc.ngpio; - if (hwirq < i) + list_for_each_entry(bank, &priv->bank_list, node) { + if (hwirq >=3D bank->chip.gc.offset && + hwirq < (bank->chip.gc.offset + bank->chip.gc.ngpio)) return bank; } return NULL; --=20 2.43.0 From nobody Sat Feb 7 22:21:15 2026 Received: from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com [192.19.166.231]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A41EC340D82; Thu, 22 Jan 2026 01:13:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.166.231 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769044437; cv=none; b=rn4D+QG4YaWEAAt9fDj61CIH5ryLE1aCl8CqT6YMmJf76DxPmCxmWdSJ5DHMLN9PwE14fi77ISloBj5IuvkN4hmBvCT6meJ+F0YdzorhS6+IliWNxAS99ijEU76hD8jG1vkwPvdW394X4bABF8SvC+7LfogxwHKFZO1pxC+L6Mo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769044437; c=relaxed/simple; bh=HexbE4h+Gs6KykT03gyu0tt3owJKTbjX9Kje2L/OQiw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wp8MF7/JINqMPs3/5R+TgXTvXpfjPp8iVxKewkO5tboTIq2PVHEmwGhkCqzxdA4ct/1snY9QlFnLTEWEUceiwhMwsNbHngy5GozyABZr+79+lXMCY0twptu85RmtXVzdUU7BljBWBPVuCLXEz9H4Wkx9zbj564z7uBju/eUHKSc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=sFSILUUs; arc=none smtp.client-ip=192.19.166.231 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="sFSILUUs" 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 D80C7C008DE2; Wed, 21 Jan 2026 17:06:25 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com D80C7C008DE2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1769043985; bh=HexbE4h+Gs6KykT03gyu0tt3owJKTbjX9Kje2L/OQiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sFSILUUstI5k7lriBf2QCHl67LS53vbe/58GskyRyAtxx10FwZ7dODCUNBjXb8oTv Bg+qhFOc+HDU3LP+yvsDZgOHbSC150w2nGQi15V62EfFCc6Y1nRb2ovQmEZL76kW9m YPgythBoocXN2rvmriuuZCE6Sqp9x2bCJAYvgVJM= 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 B8AC119CDA; Wed, 21 Jan 2026 17:06:25 -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 2/3] gpio: brcmstb: implement irq_mask_ack Date: Wed, 21 Jan 2026 17:05:15 -0800 Message-ID: <20260122010516.1200630-3-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260122010516.1200630-1-florian.fainelli@broadcom.com> References: <20260122010516.1200630-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Doug Berger 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. Signed-off-by: Doug Berger [florian: forward ported change after switch to guard()] Signed-off-by: Florian Fainelli --- drivers/gpio/gpio-brcmstb.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index 2352d099709c..5fb6612c2aa5 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-2026 Broadcom =20 #include #include @@ -96,7 +96,7 @@ static int brcmstb_gpio_hwirq_to_offset(irq_hw_number_t h= wirq, } =20 static void brcmstb_gpio_set_imask(struct brcmstb_gpio_bank *bank, - unsigned int hwirq, bool enable) + unsigned int hwirq, bool enable, bool ack) { struct brcmstb_gpio_priv *priv =3D bank->parent_priv; u32 mask =3D BIT(brcmstb_gpio_hwirq_to_offset(hwirq, bank)); @@ -110,8 +110,10 @@ static void brcmstb_gpio_set_imask(struct brcmstb_gpio= _bank *bank, imask |=3D mask; else imask &=3D ~mask; - gpio_generic_write_reg(&bank->chip, - priv->reg_base + GIO_MASK(bank->id), imask); + if (ack) + gpio_generic_write_reg(&bank->chip, + priv->reg_base + GIO_MASK(bank->id), + imask); } =20 static int brcmstb_gpio_to_irq(struct gpio_chip *gc, unsigned offset) @@ -132,7 +134,15 @@ static void brcmstb_gpio_irq_mask(struct irq_data *d) struct gpio_chip *gc =3D irq_data_get_irq_chip_data(d); struct brcmstb_gpio_bank *bank =3D gpiochip_get_data(gc); =20 - brcmstb_gpio_set_imask(bank, d->hwirq, false); + brcmstb_gpio_set_imask(bank, d->hwirq, false, false); +} + +static void brcmstb_gpio_irq_mask_ack(struct irq_data *d) +{ + struct gpio_chip *gc =3D irq_data_get_irq_chip_data(d); + struct brcmstb_gpio_bank *bank =3D gpiochip_get_data(gc); + + brcmstb_gpio_set_imask(bank, d->hwirq, false, true); } =20 static void brcmstb_gpio_irq_unmask(struct irq_data *d) @@ -140,7 +150,7 @@ static void brcmstb_gpio_irq_unmask(struct irq_data *d) struct gpio_chip *gc =3D irq_data_get_irq_chip_data(d); struct brcmstb_gpio_bank *bank =3D gpiochip_get_data(gc); =20 - brcmstb_gpio_set_imask(bank, d->hwirq, true); + brcmstb_gpio_set_imask(bank, d->hwirq, true, false); } =20 static void brcmstb_gpio_irq_ack(struct irq_data *d) @@ -471,6 +481,7 @@ static int brcmstb_gpio_irq_setup(struct platform_devic= e *pdev, priv->irq_chip.name =3D dev_name(dev); priv->irq_chip.irq_disable =3D brcmstb_gpio_irq_mask; priv->irq_chip.irq_mask =3D brcmstb_gpio_irq_mask; + priv->irq_chip.irq_mask_ack =3D brcmstb_gpio_irq_mask_ack; priv->irq_chip.irq_unmask =3D brcmstb_gpio_irq_unmask; priv->irq_chip.irq_ack =3D brcmstb_gpio_irq_ack; priv->irq_chip.irq_set_type =3D brcmstb_gpio_irq_set_type; --=20 2.43.0 From nobody Sat Feb 7 22:21:15 2026 Received: from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com [192.19.166.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B26FD32C302; Thu, 22 Jan 2026 01:06:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.166.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769043988; cv=none; b=NiJA7EZiH1+htE0kukxp+ysGuAqkW21GQH2RzcbTSU9lkEkQ/c8yaGKkPSCylLyINg4heeg/IHsJ8Aw4knWsO5CqBbj1bkSSTKiQ4U1/L2aYL2WPCGwClKG0Jhf/5okr7b3vD1jayUd8Ugqnz7TOQ97wke4///uPbwRPODTw67k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769043988; c=relaxed/simple; bh=HTZKPLow78Th6RRkvDqBVuE806ZcvXA/zQTkQQHIk2I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TM88fcRl0CoyUq62rpwg9LHpnSYWnVI/lmd+0QB+RNvtBV6pzmpGpovafebec1CPwAGznDktxp5Ff6eo13zLueLiYBoDPmpM7/sjK5YcVIu4ybb12+5boMoZ5JqnyqwGllvCMd8djEmp5kRbm7R2bQpJIcS4yA7uwIxN9YsytjA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=gmMY0l8e; arc=none smtp.client-ip=192.19.166.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="gmMY0l8e" 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 0CC25C00B2E2; Wed, 21 Jan 2026 17:06:26 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 0CC25C00B2E2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1769043986; bh=HTZKPLow78Th6RRkvDqBVuE806ZcvXA/zQTkQQHIk2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gmMY0l8eZRUBPfKUNuLFCixbguSAwv1N7r8i4gBc7Fb3YwCSWLsGJmgsUXuxfgs7B osOm79v4Y/hqyKus4Y7q7RZur9sqizxNr2KAIf4yWF+SEAxPLCeuzfcTg3Nyl7CWPo qz2nyFGSfl0THdC7xoEhQW/XHj2/2+EiS6zX/KtU= 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 E31DD19CD8; Wed, 21 Jan 2026 17:06:25 -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 3/3] gpio: brcmstb: allow parent_irq to wake Date: Wed, 21 Jan 2026 17:05:16 -0800 Message-ID: <20260122010516.1200630-4-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260122010516.1200630-1-florian.fainelli@broadcom.com> References: <20260122010516.1200630-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 5fb6612c2aa5..cecc7cf93796 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; }; =20 #define MAX_GPIO_PER_BANK 32 @@ -231,6 +232,9 @@ static int brcmstb_gpio_priv_set_wake(struct brcmstb_gp= io_priv *priv, { int ret =3D 0; =20 + if (priv->parent_wake_irq =3D=3D priv->parent_irq) + return ret; + if (enable) ret =3D enable_irq_wake(priv->parent_wake_irq); else @@ -281,6 +285,11 @@ static void brcmstb_gpio_irq_bank_handler(struct brcms= tb_gpio_bank *bank) while ((status =3D brcmstb_gpio_get_active_irqs(bank))) { unsigned int offset; =20 + if (priv->suspended && bank->wake_active & (u32)status) { + priv->suspended =3D false; + pm_wakeup_event(&priv->pdev->dev, 0); + } + for_each_set_bit(offset, &status, 32) { if (offset >=3D bank->width) dev_warn(&priv->pdev->dev, @@ -454,18 +463,18 @@ static int brcmstb_gpio_irq_setup(struct platform_dev= ice *pdev, } =20 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 =3D platform_get_irq(pdev, 1); if (priv->parent_wake_irq < 0) { - priv->parent_wake_irq =3D 0; + priv->parent_wake_irq =3D 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 =3D devm_request_irq(dev, priv->parent_wake_irq, brcmstb_gpio_wake_irq_handler, IRQF_SHARED, @@ -476,6 +485,7 @@ static int brcmstb_gpio_irq_setup(struct platform_devic= e *pdev, goto out_free_domain; } } + priv->irq_chip.irq_set_wake =3D brcmstb_gpio_irq_set_wake; } =20 priv->irq_chip.name =3D dev_name(dev); @@ -486,9 +496,6 @@ static int brcmstb_gpio_irq_setup(struct platform_devic= e *pdev, priv->irq_chip.irq_ack =3D brcmstb_gpio_irq_ack; priv->irq_chip.irq_set_type =3D brcmstb_gpio_irq_set_type; =20 - if (priv->parent_wake_irq) - priv->irq_chip.irq_set_wake =3D 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); @@ -511,16 +518,11 @@ static void brcmstb_gpio_bank_save(struct brcmstb_gpi= o_priv *priv, priv->reg_base + GIO_BANK_OFF(bank->id, i)); } =20 -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 =3D dev_get_drvdata(dev); struct brcmstb_gpio_bank *bank; u32 imask; =20 - /* disable non-wake interrupt */ - if (priv->parent_irq >=3D 0) - disable_irq(priv->parent_irq); - list_for_each_entry(bank, &priv->bank_list, node) { if (save) brcmstb_gpio_bank_save(priv, bank); @@ -538,8 +540,14 @@ static void brcmstb_gpio_quiesce(struct device *dev, b= ool save) =20 static void brcmstb_gpio_shutdown(struct platform_device *pdev) { + struct brcmstb_gpio_priv *priv =3D 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); } =20 static void brcmstb_gpio_bank_restore(struct brcmstb_gpio_priv *priv, @@ -555,7 +563,32 @@ static void brcmstb_gpio_bank_restore(struct brcmstb_g= pio_priv *priv, =20 static int brcmstb_gpio_suspend(struct device *dev) { - brcmstb_gpio_quiesce(dev, true); + struct brcmstb_gpio_priv *priv =3D dev_get_drvdata(dev); + + if (priv->parent_irq > 0) + priv->suspended =3D true; + + return 0; +} + +static int brcmstb_gpio_suspend_noirq(struct device *dev) +{ + struct brcmstb_gpio_priv *priv =3D 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; } =20 @@ -563,25 +596,26 @@ static int brcmstb_gpio_resume(struct device *dev) { struct brcmstb_gpio_priv *priv =3D dev_get_drvdata(dev); struct brcmstb_gpio_bank *bank; - bool need_wakeup_event =3D false; =20 - list_for_each_entry(bank, &priv->bank_list, node) { - need_wakeup_event |=3D !!__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); =20 - if (priv->parent_wake_irq && need_wakeup_event) - pm_wakeup_event(dev, 0); + priv->suspended =3D false; + + list_for_each_entry(bank, &priv->bank_list, node) + brcmstb_gpio_bank_restore(priv, bank); =20 - /* enable non-wake interrupt */ - if (priv->parent_irq >=3D 0) + /* re-enable interrupts */ + if (priv->parent_irq > 0) enable_irq(priv->parent_irq); =20 return 0; } =20 static const struct dev_pm_ops brcmstb_gpio_pm_ops =3D { - .suspend_noirq =3D pm_sleep_ptr(brcmstb_gpio_suspend), + .suspend =3D pm_sleep_ptr(brcmstb_gpio_suspend), + .suspend_noirq =3D pm_sleep_ptr(brcmstb_gpio_suspend_noirq), .resume_noirq =3D pm_sleep_ptr(brcmstb_gpio_resume), }; =20 --=20 2.43.0