diff options
| author |   Hans de Goede <hdegoede@redhat.com> | 2021-11-28 20:00:29 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2021-12-06 22:33:39 +0100 |
| commit | 8c33915d77a565b8b5d44e6368e22b6ea300b7a8 (patch) | |
| tree | 2573addfe6b8bf1ae11d85cdb447c127fbc82468 | |
| parent | platform/x86: wmi: Fix driver->notify() vs ->probe() race (diff) | |
| download | wireguard-linux-8c33915d77a565b8b5d44e6368e22b6ea300b7a8.tar.xz wireguard-linux-8c33915d77a565b8b5d44e6368e22b6ea300b7a8.zip | |
platform/x86: wmi: Add no_notify_data flag to struct wmi_driver
Some WMI implementations do notifies on WMI objects without a _WED method
allow WMI drivers to indicate that _WED should not be called for notifies
on the WMI objects the driver is bound to.
Instead the driver's notify callback will simply be called with a NULL
data argument.
Reported-by: Yauhen Kharuzhy <jekhor@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211128190031.405620-3-hdegoede@redhat.com
| -rw-r--r-- | drivers/platform/x86/wmi.c | 10 | ||||
| -rw-r--r-- | include/linux/wmi.h | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 02aba274c4bc..58a23a9adbef 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -1331,10 +1331,12 @@ static void acpi_wmi_notify_handler(acpi_handle handle, u32 event, struct acpi_buffer evdata = { ACPI_ALLOCATE_BUFFER, NULL }; acpi_status status; - status = get_event_data(wblock, &evdata); - if (ACPI_FAILURE(status)) { - dev_warn(&wblock->dev.dev, "failed to get event data\n"); - return; + if (!driver->no_notify_data) { + status = get_event_data(wblock, &evdata); + if (ACPI_FAILURE(status)) { + dev_warn(&wblock->dev.dev, "failed to get event data\n"); + return; + } } if (driver->notify) diff --git a/include/linux/wmi.h b/include/linux/wmi.h index 2cb3913c1f50..b88d7b58e61e 100644 --- a/include/linux/wmi.h +++ b/include/linux/wmi.h @@ -35,6 +35,7 @@ extern int set_required_buffer_size(struct wmi_device *wdev, u64 length); struct wmi_driver { struct device_driver driver; const struct wmi_device_id *id_table; + bool no_notify_data; int (*probe)(struct wmi_device *wdev, const void *context); void (*remove)(struct wmi_device *wdev); |