openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

platform/x86: intel-vbtn: Eval VBDL after registering our notifier 

The VBDL ACPI method enables button/switch reporting through the
intel-vbtn device. In some cases the embedded-controller (EC) might
call Notify() on the intel-vbtn device immediately after the
the VBDL call to make sure that the OS is synced with the EC's
button and switch state.

If we register our notify_handler after evaluating VBDL this means
that we might miss the Notify() calls made by the EC to sync the
state.

E.g. the HP Stream x360 Convertible PC 11 has a VGBS method which
always returns 0, independent of the actual SW_TABLET_MODE state
of the device; and immediately after the VBDL call it calls
Notify(0xCD) or Notify(0xCC) to report the actual state.

Move the evaluation of VBDL to after registering our notify_handler
so that we don't miss any events.

Cc: Elia Devito <eliadevito@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210115161850.117614-4-hdegoede@redhat.com
This commit is contained in:
Hans de Goede 2021-01-15 17:18:50 +01:00
parent 3a2f53cd03
commit 26173179fa
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/platform/x86/intel-vbtn.c
View File

@ -189,14 +189,6 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
sparse_keymap_report_event(input_dev, event, val, autorelease); sparse_keymap_report_event(input_dev, event, val, autorelease);
} }
static bool intel_vbtn_has_buttons(acpi_handle handle)
{
acpi_status status;
status = acpi_evaluate_object(handle, "VBDL", NULL, NULL);
return ACPI_SUCCESS(status);
}
/* /*
* There are several laptops (non 2-in-1) models out there which support VGBS, * There are several laptops (non 2-in-1) models out there which support VGBS,
* but simply always return 0, which we translate to SW_TABLET_MODE=1. This in * but simply always return 0, which we translate to SW_TABLET_MODE=1. This in
@ -271,7 +263,7 @@ static int intel_vbtn_probe(struct platform_device *device)
acpi_status status; acpi_status status;
int err; int err;
has_buttons = intel_vbtn_has_buttons(handle); has_buttons = acpi_has_method(handle, "VBDL");
has_switches = intel_vbtn_has_switches(handle); has_switches = intel_vbtn_has_switches(handle);
if (!has_buttons && !has_switches) { if (!has_buttons && !has_switches) {
@ -300,6 +292,12 @@ static int intel_vbtn_probe(struct platform_device *device)
if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status))
return -EBUSY; return -EBUSY;
if (has_buttons) {
status = acpi_evaluate_object(handle, "VBDL", NULL, NULL);
if (ACPI_FAILURE(status))
dev_err(&device->dev, "Error VBDL failed with ACPI status %d\n", status);
}
device_init_wakeup(&device->dev, true); device_init_wakeup(&device->dev, true);
/* /*
* In order for system wakeup to work, the EC GPE has to be marked as * In order for system wakeup to work, the EC GPE has to be marked as