From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Loic Poulain <loic.poulain@linaro.org>,
Michal Koziel <michal.koziel@emlogic.no>,
Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.10 2/7] gpio: mxc: Fix disabled interrupt wake-up support
Date: Mon, 5 Jul 2021 06:59:52 -0400 [thread overview]
Message-ID: <20210705105957.1513284-3-sashal@kernel.org> (raw)
In-Reply-To: <20210705105957.1513284-1-sashal@kernel.org>
From: Loic Poulain <loic.poulain@linaro.org>
[ Upstream commit 3093e6cca3ba7d47848068cb256c489675125181 ]
A disabled/masked interrupt marked as wakeup source must be re-enable
and unmasked in order to be able to wake-up the host. That can be done
by flaging the irqchip with IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND.
Note: It 'sometimes' works without that change, but only thanks to the
lazy generic interrupt disabling (keeping interrupt unmasked).
Reported-by: Michal Koziel <michal.koziel@emlogic.no>
Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpio/gpio-mxc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 643f4c557ac2..ba6ed2a413f5 100644
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -361,7 +361,7 @@ static int mxc_gpio_init_gc(struct mxc_gpio_port *port, int irq_base)
ct->chip.irq_unmask = irq_gc_mask_set_bit;
ct->chip.irq_set_type = gpio_set_irq_type;
ct->chip.irq_set_wake = gpio_set_wake_irq;
- ct->chip.flags = IRQCHIP_MASK_ON_SUSPEND;
+ ct->chip.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND;
ct->regs.ack = GPIO_ISR;
ct->regs.mask = GPIO_IMR;
--
2.30.2
next prev parent reply other threads:[~2021-07-05 11:00 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-05 10:59 [PATCH 5.10 0/7] 5.10.48-rc1 review Sasha Levin
2021-07-05 10:59 ` [PATCH 5.10 1/7] scsi: sr: Return appropriate error code when disk is ejected Sasha Levin
2021-07-05 10:59 ` Sasha Levin [this message]
2021-07-05 10:59 ` [PATCH 5.10 3/7] drm/nouveau: fix dma_address check for CPU/GPU sync Sasha Levin
2021-07-05 10:59 ` [PATCH 5.10 4/7] gpio: AMD8111 and TQMX86 require HAS_IOPORT_MAP Sasha Levin
2021-07-05 10:59 ` [PATCH 5.10 5/7] RDMA/mlx5: Block FDB rules when not in switchdev mode Sasha Levin
2021-07-05 10:59 ` [PATCH 5.10 6/7] Revert "KVM: x86/mmu: Drop kvm_mmu_extended_role.cr4_la57 hack" Sasha Levin
2021-07-05 10:59 ` [PATCH 5.10 7/7] Linux 5.10.48-rc1 Sasha Levin
2021-07-05 16:23 ` [PATCH 5.10 0/7] 5.10.48-rc1 review Fox Chen
2021-07-05 17:43 ` Pavel Machek
2021-07-07 12:28 ` Sasha Levin
2021-07-05 20:38 ` Guenter Roeck
2021-07-06 2:01 ` Samuel Zou
2021-07-07 12:29 ` Sasha Levin
2021-07-06 5:00 ` Naresh Kamboju
2021-07-06 15:14 ` Sudip Mukherjee
2021-07-07 12:29 ` Sasha Levin
2021-07-06 22:44 ` Shuah Khan
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=20210705105957.1513284-3-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loic.poulain@linaro.org \
--cc=michal.koziel@emlogic.no \
--cc=stable@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).