| Message ID | 20200302111225.6641-3-hdegoede@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/4] gpiolib: acpi: Correct comment for HP x2 10 honor_wakeup quirk | expand |
On Mon, Mar 02, 2020 at 12:12:24PM +0100, Hans de Goede wrote: > Commit aa23ca3d98f7 ("gpiolib: acpi: Add honor_wakeup module-option + > quirk mechanism") was added to deal with spurious wakeups on one specific > model of the HP x2 10 series. In the mean time I have learned that there > are at least 3 different HP x2 10 models: > > Bay Trail SoC + AXP288 PMIC > Cherry Trail SoC + AXP288 PMIC > Cherry Trail SoC + TI PMIC > > And the original quirk is only correct for (and only matches the) > Cherry Trail SoC + TI PMIC model. > > The Bay Trail SoC + AXP288 PMIC model has different DMI strings, has > the external EC interrupt on a different GPIO pin and only needs to ignore > wakeups on the EC interrupt, the INT0002 device works fine on this model. > > This commit adds an extra DMI based quirk for the HP x2 10 BYT + AXP288 > model, ignoring wakeups for ACPI GPIO events on the EC interrupt pin > on this model. This fixes spurious wakeups from suspend on this model. > > Fixes: aa23ca3d98f7 ("gpiolib: acpi: Add honor_wakeup module-option + quirk mechanism") > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
On Mon, Mar 2, 2020 at 12:12 PM Hans de Goede <hdegoede@redhat.com> wrote: > Commit aa23ca3d98f7 ("gpiolib: acpi: Add honor_wakeup module-option + > quirk mechanism") was added to deal with spurious wakeups on one specific > model of the HP x2 10 series. In the mean time I have learned that there > are at least 3 different HP x2 10 models: > > Bay Trail SoC + AXP288 PMIC > Cherry Trail SoC + AXP288 PMIC > Cherry Trail SoC + TI PMIC > > And the original quirk is only correct for (and only matches the) > Cherry Trail SoC + TI PMIC model. > > The Bay Trail SoC + AXP288 PMIC model has different DMI strings, has > the external EC interrupt on a different GPIO pin and only needs to ignore > wakeups on the EC interrupt, the INT0002 device works fine on this model. > > This commit adds an extra DMI based quirk for the HP x2 10 BYT + AXP288 > model, ignoring wakeups for ACPI GPIO events on the EC interrupt pin > on this model. This fixes spurious wakeups from suspend on this model. > > Fixes: aa23ca3d98f7 ("gpiolib: acpi: Add honor_wakeup module-option + quirk mechanism") > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > Changes in v2: > - Split out new quirk addition into its own patch Patch applied with Mika's ACK. Yours, Linus Walleij
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 87bb0d3c69da..d1ef060a5873 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -1422,6 +1422,21 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] = { .ignore_wake = "INT33FF:01@0,INT0002:00@2", }, }, + { + /* + * HP X2 10 models with Bay Trail SoC + AXP288 PMIC use an + * external embedded-controller connected via I2C + an ACPI GPIO + * event handler on INT33FC:02 pin 28, causing spurious wakeups. + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion x2 Detachable"), + DMI_MATCH(DMI_BOARD_NAME, "815D"), + }, + .driver_data = &(struct acpi_gpiolib_dmi_quirk) { + .ignore_wake = "INT33FC:02@28", + }, + }, {} /* Terminating entry */ };
Commit aa23ca3d98f7 ("gpiolib: acpi: Add honor_wakeup module-option + quirk mechanism") was added to deal with spurious wakeups on one specific model of the HP x2 10 series. In the mean time I have learned that there are at least 3 different HP x2 10 models: Bay Trail SoC + AXP288 PMIC Cherry Trail SoC + AXP288 PMIC Cherry Trail SoC + TI PMIC And the original quirk is only correct for (and only matches the) Cherry Trail SoC + TI PMIC model. The Bay Trail SoC + AXP288 PMIC model has different DMI strings, has the external EC interrupt on a different GPIO pin and only needs to ignore wakeups on the EC interrupt, the INT0002 device works fine on this model. This commit adds an extra DMI based quirk for the HP x2 10 BYT + AXP288 model, ignoring wakeups for ACPI GPIO events on the EC interrupt pin on this model. This fixes spurious wakeups from suspend on this model. Fixes: aa23ca3d98f7 ("gpiolib: acpi: Add honor_wakeup module-option + quirk mechanism") Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v2: - Split out new quirk addition into its own patch --- drivers/gpio/gpiolib-acpi.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)