Message ID | 20191127104509.10196-1-hdegoede@redhat.com |
---|---|
State | New |
Headers | show |
Series | [v2,1/2] gpiolib: acpi: Turn dmi_system_id table into a generic quirk table | expand |
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
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
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;