pinctrl: amd: Detect internal GPIO0 debounce handling
commit968ab92616
upstream. commit4e5a04be88
("pinctrl: amd: disable and mask interrupts on probe") had a mistake in loop iteration 63 that it would clear offset 0xFC instead of 0x100. Offset 0xFC is actually `WAKE_INT_MASTER_REG`. This was clearing bits 13 and 15 from the register which significantly changed the expected handling for some platforms for GPIO0. commitb26cd9325b
("pinctrl: amd: Disable and mask interrupts on resume") actually fixed this bug, but lead to regressions on Lenovo Z13 and some other systems. This is because there was no handling in the driver for bit 15 debounce behavior. Quoting a public BKDG: ``` EnWinBlueBtn. Read-write. Reset: 0. 0=GPIO0 detect debounced power button; Power button override is 4 seconds. 1=GPIO0 detect debounced power button in S3/S5/S0i3, and detect "pressed less than 2 seconds" and "pressed 2~10 seconds" in S0; Power button override is 10 seconds ``` Cross referencing the same master register in Windows it's obvious that Windows doesn't use debounce values in this configuration. So align the Linux driver to do this as well. This fixes wake on lid when WAKE_INT_MASTER_REG is properly programmed. Cc: stable@vger.kernel.org Link: https://bugzilla.kernel.org/show_bug.cgi?id=217315 Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Link: https://lore.kernel.org/r/20230421120625.3366-2-mario.limonciello@amd.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
cc5050add0
Коммит
dff67c64f6
|
@ -126,6 +126,12 @@ static int amd_gpio_set_debounce(struct gpio_chip *gc, unsigned offset,
|
|||
struct amd_gpio *gpio_dev = gpiochip_get_data(gc);
|
||||
|
||||
raw_spin_lock_irqsave(&gpio_dev->lock, flags);
|
||||
|
||||
/* Use special handling for Pin0 debounce */
|
||||
pin_reg = readl(gpio_dev->base + WAKE_INT_MASTER_REG);
|
||||
if (pin_reg & INTERNAL_GPIO0_DEBOUNCE)
|
||||
debounce = 0;
|
||||
|
||||
pin_reg = readl(gpio_dev->base + offset * 4);
|
||||
|
||||
if (debounce) {
|
||||
|
@ -223,6 +229,7 @@ static void amd_gpio_dbg_show(struct seq_file *s, struct gpio_chip *gc)
|
|||
char debounce_value[40];
|
||||
char *debounce_enable;
|
||||
|
||||
seq_printf(s, "WAKE_INT_MASTER_REG: 0x%08x\n", readl(gpio_dev->base + WAKE_INT_MASTER_REG));
|
||||
for (bank = 0; bank < gpio_dev->hwbank_num; bank++) {
|
||||
seq_printf(s, "GPIO bank%d\t", bank);
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#define AMD_GPIO_PINS_BANK3 32
|
||||
|
||||
#define WAKE_INT_MASTER_REG 0xfc
|
||||
#define INTERNAL_GPIO0_DEBOUNCE (1 << 15)
|
||||
#define EOI_MASK (1 << 29)
|
||||
|
||||
#define WAKE_INT_STATUS_REG0 0x2f8
|
||||
|
|
Загрузка…
Ссылка в новой задаче