Skip to content

Commit c4b68e5

Browse files
superm1Linus Walleij
authored andcommitted
pinctrl: amd: Fix an issue with shutdown when system set to s0ix
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: d62bd5c ("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>
1 parent 86e5fbc commit c4b68e5

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

drivers/pinctrl/pinctrl-amd.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,7 @@ static int amd_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
444444
unsigned long flags;
445445
struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
446446
struct amd_gpio *gpio_dev = gpiochip_get_data(gc);
447-
u32 wake_mask = BIT(WAKE_CNTRL_OFF_S0I3) | BIT(WAKE_CNTRL_OFF_S3) |
448-
BIT(WAKE_CNTRL_OFF_S4);
447+
u32 wake_mask = BIT(WAKE_CNTRL_OFF_S0I3) | BIT(WAKE_CNTRL_OFF_S3);
449448

450449
raw_spin_lock_irqsave(&gpio_dev->lock, flags);
451450
pin_reg = readl(gpio_dev->base + (d->hwirq)*4);

0 commit comments

Comments
 (0)