* [PATCH v2 1/2] gpiolib: acpi: Turn dmi_system_id table into a generic quirk table
@ 2019-11-27 10:45 Hans de Goede
2019-11-27 10:45 ` [PATCH v2 2/2] gpiolib: acpi: Add honor_wakeup module-option + quirk mechanism Hans de Goede
2019-11-28 13:35 ` [PATCH v2 1/2] gpiolib: acpi: Turn dmi_system_id table into a generic quirk table Linus Walleij
0 siblings, 2 replies; 4+ messages in thread
From: Hans de Goede @ 2019-11-27 10:45 UTC (permalink / raw)
To: Mika Westerberg, Andy Shevchenko, Bartosz Golaszewski, Linus Walleij
Cc: Hans de Goede, linux-gpio, linux-acpi
Turn the existing run_edge_events_on_boot_blacklist dmi_system_id table
into a generic quirk table, storing the quirks in the driver_data ptr.
This is a preparation patch for adding other types of (DMI based) quirks.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/gpio/gpiolib-acpi.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index d30e57dc755c..2b47d906d536 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -21,6 +21,8 @@
#include "gpiolib.h"
#include "gpiolib-acpi.h"
+#define QUIRK_NO_EDGE_EVENTS_ON_BOOT 0x01l
+
static int run_edge_events_on_boot = -1;
module_param(run_edge_events_on_boot, int, 0444);
MODULE_PARM_DESC(run_edge_events_on_boot,
@@ -1309,7 +1311,7 @@ static int acpi_gpio_handle_deferred_request_irqs(void)
/* We must use _sync so that this runs after the first deferred_probe run */
late_initcall_sync(acpi_gpio_handle_deferred_request_irqs);
-static const struct dmi_system_id run_edge_events_on_boot_blacklist[] = {
+static const struct dmi_system_id gpiolib_acpi_quirks[] = {
{
/*
* The Minix Neo Z83-4 has a micro-USB-B id-pin handler for
@@ -1319,7 +1321,8 @@ static const struct dmi_system_id run_edge_events_on_boot_blacklist[] = {
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "MINIX"),
DMI_MATCH(DMI_PRODUCT_NAME, "Z83-4"),
- }
+ },
+ .driver_data = (void *)QUIRK_NO_EDGE_EVENTS_ON_BOOT,
},
{
/*
@@ -1331,15 +1334,23 @@ static const struct dmi_system_id run_edge_events_on_boot_blacklist[] = {
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Wortmann_AG"),
DMI_MATCH(DMI_PRODUCT_NAME, "TERRA_PAD_1061"),
- }
+ },
+ .driver_data = (void *)QUIRK_NO_EDGE_EVENTS_ON_BOOT,
},
{} /* Terminating entry */
};
static int acpi_gpio_setup_params(void)
{
+ const struct dmi_system_id *id;
+ long quirks = 0;
+
+ id = dmi_first_match(gpiolib_acpi_quirks);
+ if (id)
+ quirks = (long)id->driver_data;
+
if (run_edge_events_on_boot < 0) {
- if (dmi_check_system(run_edge_events_on_boot_blacklist))
+ if (quirks & QUIRK_NO_EDGE_EVENTS_ON_BOOT)
run_edge_events_on_boot = 0;
else
run_edge_events_on_boot = 1;
--
2.23.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] gpiolib: acpi: Add honor_wakeup module-option + quirk mechanism
2019-11-27 10:45 [PATCH v2 1/2] gpiolib: acpi: Turn dmi_system_id table into a generic quirk table Hans de Goede
@ 2019-11-27 10:45 ` Hans de Goede
2019-11-28 13:35 ` [PATCH v2 1/2] gpiolib: acpi: Turn dmi_system_id table into a generic quirk table Linus Walleij
1 sibling, 0 replies; 4+ messages in thread
From: Hans de Goede @ 2019-11-27 10:45 UTC (permalink / raw)
To: Mika Westerberg, Andy Shevchenko, Bartosz Golaszewski, Linus Walleij
Cc: Hans de Goede, linux-gpio, linux-acpi
On some laptops enabling wakeup on the GPIO interrupts used for ACPI _AEI
event handling causes spurious wakeups.
This commit adds a new honor_wakeup option, defaulting to true (our current
behavior), which can be used to disable wakeup on troublesome hardware
to avoid these spurious wakeups.
This is a workaround for an architectural problem with s2idle under Linux
where we do not have any mechanism to immediately go back to sleep after
wakeup events, other then for embedded-controller events using the standard
ACPI EC interface, for details see:
https://lore.kernel.org/linux-acpi/61450f9b-cbc6-0c09-8b3a-aff6bf9a0b3c@redhat.com/
One series of laptops which is not able to suspend without this workaround
is the HP x2 10 Cherry Trail models, this commit adds a DMI based quirk
which makes sets honor_wakeup to false on these models.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v2:
- Use honor_wakeup && ... instead of if (honor_wakeup) ...
- Fix some typos in the comment explaining the need for the quirk
---
drivers/gpio/gpiolib-acpi.c | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index 2b47d906d536..31fee5e918b7 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -22,12 +22,18 @@
#include "gpiolib-acpi.h"
#define QUIRK_NO_EDGE_EVENTS_ON_BOOT 0x01l
+#define QUIRK_NO_WAKEUP 0x02l
static int run_edge_events_on_boot = -1;
module_param(run_edge_events_on_boot, int, 0444);
MODULE_PARM_DESC(run_edge_events_on_boot,
"Run edge _AEI event-handlers at boot: 0=no, 1=yes, -1=auto");
+static int honor_wakeup = -1;
+module_param(honor_wakeup, int, 0444);
+MODULE_PARM_DESC(honor_wakeup,
+ "Honor the ACPI wake-capable flag: 0=no, 1=yes, -1=auto");
+
/**
* struct acpi_gpio_event - ACPI GPIO event handler data
*
@@ -283,7 +289,7 @@ static acpi_status acpi_gpiochip_alloc_event(struct acpi_resource *ares,
event->handle = evt_handle;
event->handler = handler;
event->irq = irq;
- event->irq_is_wake = agpio->wake_capable == ACPI_WAKE_CAPABLE;
+ event->irq_is_wake = honor_wakeup && agpio->wake_capable == ACPI_WAKE_CAPABLE;
event->pin = pin;
event->desc = desc;
@@ -1337,6 +1343,23 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] = {
},
.driver_data = (void *)QUIRK_NO_EDGE_EVENTS_ON_BOOT,
},
+ {
+ /*
+ * Various HP X2 10 Cherry Trail models use an external
+ * embedded-controller connected via I2C + an ACPI GPIO
+ * event handler. The embedded controller generates various
+ * spurious wakeup events when suspended. So disable wakeup
+ * for its handler (it uses the only ACPI GPIO event handler).
+ * This breaks wakeup when opening the lid, the user needs
+ * to press the power-button to wakeup the system. The
+ * alternative is suspend simply not working, which is worse.
+ */
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "HP"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "HP x2 Detachable 10-p0XX"),
+ },
+ .driver_data = (void *)QUIRK_NO_WAKEUP,
+ },
{} /* Terminating entry */
};
@@ -1356,6 +1379,13 @@ static int acpi_gpio_setup_params(void)
run_edge_events_on_boot = 1;
}
+ if (honor_wakeup < 0) {
+ if (quirks & QUIRK_NO_WAKEUP)
+ honor_wakeup = 0;
+ else
+ honor_wakeup = 1;
+ }
+
return 0;
}
--
2.23.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] gpiolib: acpi: Turn dmi_system_id table into a generic quirk table
2019-11-27 10:45 [PATCH v2 1/2] gpiolib: acpi: Turn dmi_system_id table into a generic quirk table Hans de Goede
2019-11-27 10:45 ` [PATCH v2 2/2] gpiolib: acpi: Add honor_wakeup module-option + quirk mechanism Hans de Goede
@ 2019-11-28 13:35 ` Linus Walleij
2020-01-05 15:59 ` Hans de Goede
1 sibling, 1 reply; 4+ messages in thread
From: Linus Walleij @ 2019-11-28 13:35 UTC (permalink / raw)
To: Hans de Goede
Cc: Mika Westerberg, Andy Shevchenko, Bartosz Golaszewski,
open list:GPIO SUBSYSTEM, ACPI Devel Maling List
On Wed, Nov 27, 2019 at 11:45 AM Hans de Goede <hdegoede@redhat.com> wrote:
> Turn the existing run_edge_events_on_boot_blacklist dmi_system_id table
> into a generic quirk table, storing the quirks in the driver_data ptr.
>
> This is a preparation patch for adding other types of (DMI based) quirks.
>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This patch does not apply to my "devel" branch, which I am about
to send to Torvalds, so it will very soon be the mainline.
Could you rebase it and I will queue it up for fixes.
Also: should these two be tagged for stable? (I.e. a non-v5.5
problem.) I suppose that requires backporting for -stable
though.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] gpiolib: acpi: Turn dmi_system_id table into a generic quirk table
2019-11-28 13:35 ` [PATCH v2 1/2] gpiolib: acpi: Turn dmi_system_id table into a generic quirk table Linus Walleij
@ 2020-01-05 15:59 ` Hans de Goede
0 siblings, 0 replies; 4+ messages in thread
From: Hans de Goede @ 2020-01-05 15:59 UTC (permalink / raw)
To: Linus Walleij
Cc: Mika Westerberg, Andy Shevchenko, Bartosz Golaszewski,
open list:GPIO SUBSYSTEM, ACPI Devel Maling List
Hi,
On 28-11-2019 14:35, Linus Walleij wrote:
> On Wed, Nov 27, 2019 at 11:45 AM Hans de Goede <hdegoede@redhat.com> wrote:
>
>> Turn the existing run_edge_events_on_boot_blacklist dmi_system_id table
>> into a generic quirk table, storing the quirks in the driver_data ptr.
>>
>> This is a preparation patch for adding other types of (DMI based) quirks.
>>
>> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>
> This patch does not apply to my "devel" branch, which I am about
> to send to Torvalds, so it will very soon be the mainline.
Sorry for being a bit slow with responding to this
(this mail got buried under a bunch of other mails).
> Could you rebase it and I will queue it up for fixes.
Done (on 5.5-rc4, which for gpiolib-acpi.c that is fully up2date with
your for-next).
> Also: should these two be tagged for stable? (I.e. a non-v5.5
> problem.) I suppose that requires backporting for -stable
> though.
Given that the problem which the second patch works around is somewhat
nasty, yes these should probably go to the stable series. I've added
Cc: stable to them for the rebase.
I will send out the new versions right away.
Regards,
Hans
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-05 15:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-27 10:45 [PATCH v2 1/2] gpiolib: acpi: Turn dmi_system_id table into a generic quirk table Hans de Goede
2019-11-27 10:45 ` [PATCH v2 2/2] gpiolib: acpi: Add honor_wakeup module-option + quirk mechanism Hans de Goede
2019-11-28 13:35 ` [PATCH v2 1/2] gpiolib: acpi: Turn dmi_system_id table into a generic quirk table Linus Walleij
2020-01-05 15:59 ` Hans de Goede
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).