projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86e5fbc
)
pinctrl: amd: Fix an issue with shutdown when system set to s0ix
author
Mario Limonciello
<mario.limonciello@amd.com>
Mon, 9 Aug 2021 20:15:13 +0000
(15:15 -0500)
committer
Linus Walleij
<linus.walleij@linaro.org>
Thu, 12 Aug 2021 09:16:40 +0000
(11:16 +0200)
IRQs are getting armed on shutdown causing the system to immediately
wake back up.
Link:
https://lkml.org/lkml/2021/8/2/1114
Reported-by: nix.or.die@googlemail.com
Acked-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Tested-by: Gabriel Craciunescu <nix.or.die@gmail.com>
CC: Raul E Rangel <rrangel@chromium.org>
Fixes:
d62bd5ce12d7
("pinctrl: amd: Implement irq_set_wake")
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Link:
https://lore.kernel.org/r/20210809201513.12367-1-mario.limonciello@amd.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-amd.c
patch
|
blob
|
history
diff --git
a/drivers/pinctrl/pinctrl-amd.c
b/drivers/pinctrl/pinctrl-amd.c
index
a76be6c
..
5b76474
100644
(file)
--- a/
drivers/pinctrl/pinctrl-amd.c
+++ b/
drivers/pinctrl/pinctrl-amd.c
@@
-444,8
+444,7
@@
static int amd_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
unsigned long flags;
struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct amd_gpio *gpio_dev = gpiochip_get_data(gc);
- u32 wake_mask = BIT(WAKE_CNTRL_OFF_S0I3) | BIT(WAKE_CNTRL_OFF_S3) |
- BIT(WAKE_CNTRL_OFF_S4);
+ u32 wake_mask = BIT(WAKE_CNTRL_OFF_S0I3) | BIT(WAKE_CNTRL_OFF_S3);
raw_spin_lock_irqsave(&gpio_dev->lock, flags);
pin_reg = readl(gpio_dev->base + (d->hwirq)*4);