platform/x86: x86-android-tablets: Add support for the Dolby button on Peaq C1010
authorHans de Goede <hdegoede@redhat.com>
Mon, 20 Feb 2023 20:26:42 +0000 (21:26 +0100)
committerHans de Goede <hdegoede@redhat.com>
Tue, 7 Mar 2023 11:08:31 +0000 (12:08 +0100)
The Peaq C1010 tablet has a special "Dolby" button. This button has
a WMI interface, but this is broken in several ways:

1. It only supports polling
2. The value read on polling goes from 0 -> 1 for one poll on both edges
   of the button, with no way to tell which edge causes the poll to
   return 1.
3. It uses a non unique GUID (it uses the Microsoft docs WMI example GUID).

There currently is a WMI driver for this, but it uses several kludges
to work around these issues and is not entirely reliable due to 2.

Replace the unreliable WMI driver by using the x86-android-tablets code
to instantiate a gpio_keys device for this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230301092331.7038-11-hdegoede@redhat.com
MAINTAINERS
drivers/platform/x86/Kconfig
drivers/platform/x86/Makefile
drivers/platform/x86/peaq-wmi.c [deleted file]
drivers/platform/x86/x86-android-tablets/dmi.c
drivers/platform/x86/x86-android-tablets/other.c
drivers/platform/x86/x86-android-tablets/x86-android-tablets.h

index 7b08a58506e3d331a8683578718eff88debb2ed0..f3253837316485f305e10cfa4e91c9ff7be9b68a 100644 (file)
@@ -16331,12 +16331,6 @@ S:     Maintained
 F:     crypto/pcrypt.c
 F:     include/crypto/pcrypt.h
 
-PEAQ WMI HOTKEYS DRIVER
-M:     Hans de Goede <hdegoede@redhat.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/x86/peaq-wmi.c
-
 PECI HARDWARE MONITORING DRIVERS
 M:     Iwona Winiarska <iwona.winiarska@intel.com>
 L:     linux-hwmon@vger.kernel.org
index 46d9e3130ebbefe9c8a66c915b57f4c4eea37b9f..d2619e7025c7d9c1b69ee03ee8cf351246132b1e 100644 (file)
@@ -84,13 +84,6 @@ config MXM_WMI
           MXM is a standard for laptop graphics cards, the WMI interface
          is required for switchable nvidia graphics machines
 
-config PEAQ_WMI
-       tristate "PEAQ 2-in-1 WMI hotkey driver"
-       depends on ACPI_WMI
-       depends on INPUT
-       help
-        Say Y here if you want to support WMI-based hotkeys on PEAQ 2-in-1s.
-
 config NVIDIA_WMI_EC_BACKLIGHT
        tristate "EC Backlight Driver for Hybrid Graphics Notebook Systems"
        depends on ACPI_VIDEO
index 0d9cc9af6ba799755d652e33fb7c71988733559e..12407f36d2bee224a9aea903cc8f60a0eabcc2e6 100644 (file)
@@ -12,7 +12,6 @@ obj-$(CONFIG_WMI_BMOF)                += wmi-bmof.o
 obj-$(CONFIG_HUAWEI_WMI)               += huawei-wmi.o
 obj-$(CONFIG_MXM_WMI)                  += mxm-wmi.o
 obj-$(CONFIG_NVIDIA_WMI_EC_BACKLIGHT)  += nvidia-wmi-ec-backlight.o
-obj-$(CONFIG_PEAQ_WMI)                 += peaq-wmi.o
 obj-$(CONFIG_XIAOMI_WMI)               += xiaomi-wmi.o
 obj-$(CONFIG_GIGABYTE_WMI)             += gigabyte-wmi.o
 obj-$(CONFIG_YOGABOOK_WMI)             += lenovo-yogabook-wmi.o
diff --git a/drivers/platform/x86/peaq-wmi.c b/drivers/platform/x86/peaq-wmi.c
deleted file mode 100644 (file)
index cf9c44c..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * PEAQ 2-in-1 WMI hotkey driver
- * Copyright (C) 2017 Hans de Goede <hdegoede@redhat.com>
- */
-
-#include <linux/acpi.h>
-#include <linux/dmi.h>
-#include <linux/input.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-
-#define PEAQ_DOLBY_BUTTON_GUID         "ABBC0F6F-8EA1-11D1-00A0-C90629100000"
-#define PEAQ_DOLBY_BUTTON_METHOD_ID    5
-#define PEAQ_POLL_INTERVAL_MS          250
-#define PEAQ_POLL_IGNORE_MS            500
-#define PEAQ_POLL_MAX_MS               1000
-
-MODULE_ALIAS("wmi:"PEAQ_DOLBY_BUTTON_GUID);
-
-static struct input_dev *peaq_poll_dev;
-
-/*
- * The Dolby button (yes really a Dolby button) causes an ACPI variable to get
- * set on both press and release. The WMI method checks and clears that flag.
- * So for a press + release we will get back One from the WMI method either once
- * (if polling after the release) or twice (polling between press and release).
- * We ignore events for 0.5s after the first event to avoid reporting 2 presses.
- */
-static void peaq_wmi_poll(struct input_dev *input_dev)
-{
-       static unsigned long last_event_time;
-       static bool had_events;
-       union acpi_object obj;
-       acpi_status status;
-       u32 dummy = 0;
-
-       struct acpi_buffer input = { sizeof(dummy), &dummy };
-       struct acpi_buffer output = { sizeof(obj), &obj };
-
-       status = wmi_evaluate_method(PEAQ_DOLBY_BUTTON_GUID, 0,
-                                    PEAQ_DOLBY_BUTTON_METHOD_ID,
-                                    &input, &output);
-       if (ACPI_FAILURE(status))
-               return;
-
-       if (obj.type != ACPI_TYPE_INTEGER) {
-               dev_err(&input_dev->dev,
-                       "Error WMBC did not return an integer\n");
-               return;
-       }
-
-       if (!obj.integer.value)
-               return;
-
-       if (had_events && time_before(jiffies, last_event_time +
-                                       msecs_to_jiffies(PEAQ_POLL_IGNORE_MS)))
-               return;
-
-       input_event(input_dev, EV_KEY, KEY_SOUND, 1);
-       input_sync(input_dev);
-       input_event(input_dev, EV_KEY, KEY_SOUND, 0);
-       input_sync(input_dev);
-
-       last_event_time = jiffies;
-       had_events = true;
-}
-
-/* Some other devices (Shuttle XS35) use the same WMI GUID for other purposes */
-static const struct dmi_system_id peaq_dmi_table[] __initconst = {
-       {
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "PEAQ"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "PEAQ PMM C1010 MD99187"),
-               },
-       },
-       {}
-};
-
-static int __init peaq_wmi_init(void)
-{
-       int err;
-
-       /* WMI GUID is not unique, also check for a DMI match */
-       if (!dmi_check_system(peaq_dmi_table))
-               return -ENODEV;
-
-       if (!wmi_has_guid(PEAQ_DOLBY_BUTTON_GUID))
-               return -ENODEV;
-
-       peaq_poll_dev = input_allocate_device();
-       if (!peaq_poll_dev)
-               return -ENOMEM;
-
-       peaq_poll_dev->name = "PEAQ WMI hotkeys";
-       peaq_poll_dev->phys = "wmi/input0";
-       peaq_poll_dev->id.bustype = BUS_HOST;
-       input_set_capability(peaq_poll_dev, EV_KEY, KEY_SOUND);
-
-       err = input_setup_polling(peaq_poll_dev, peaq_wmi_poll);
-       if (err)
-               goto err_out;
-
-       input_set_poll_interval(peaq_poll_dev, PEAQ_POLL_INTERVAL_MS);
-       input_set_max_poll_interval(peaq_poll_dev, PEAQ_POLL_MAX_MS);
-
-       err = input_register_device(peaq_poll_dev);
-       if (err)
-               goto err_out;
-
-       return 0;
-
-err_out:
-       input_free_device(peaq_poll_dev);
-       return err;
-}
-
-static void __exit peaq_wmi_exit(void)
-{
-       input_unregister_device(peaq_poll_dev);
-}
-
-module_init(peaq_wmi_init);
-module_exit(peaq_wmi_exit);
-
-MODULE_DESCRIPTION("PEAQ 2-in-1 WMI hotkey driver");
-MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
-MODULE_LICENSE("GPL");
index 09bf8732b3cf541c914cc14e405b4f25a51749b7..34af993d53925a5e2d1db3f13323cbb206b342a4 100644 (file)
@@ -125,6 +125,14 @@ const struct dmi_system_id x86_android_tablet_ids[] __initconst = {
                },
                .driver_data = (void *)&nextbook_ares8_info,
        },
+       {
+               /* Peaq C1010 */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "PEAQ"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "PEAQ PMM C1010 MD99187"),
+               },
+               .driver_data = (void *)&peaq_c1010_info,
+       },
        {
                /* Whitelabel (sold as various brands) TM800A550L */
                .matches = {
index c1bde42315c4b5c0c7fba4abb49e8933debecc7a..83cd7e16c84c4bed9209aef808d162def11bec44 100644 (file)
@@ -380,6 +380,34 @@ const struct x86_dev_info nextbook_ares8_info __initconst = {
        .invalid_aei_gpiochip = "INT33FC:02",
 };
 
+/*
+ * Peaq C1010
+ * This is a standard Windows tablet, but it has a special Dolby button.
+ * This button has a WMI interface, but that is broken. Instead of trying to
+ * use the broken WMI interface, instantiate a gpio_keys device for this.
+ */
+static struct x86_gpio_button peaq_c1010_button = {
+       .button = {
+               .code = KEY_SOUND,
+               .active_low = true,
+               .desc = "dolby_key",
+               .type = EV_KEY,
+               .wakeup = false,
+               .debounce_interval = 50,
+       },
+       .chip = "INT33FC:00",
+       .pin = 3,
+};
+
+const struct x86_dev_info peaq_c1010_info __initconst = {
+       .gpio_button = &peaq_c1010_button,
+       /*
+        * Move the ACPI event handler used by the broken WMI interface out of
+        * the way. This is the only event handler on INT33FC:00.
+        */
+       .invalid_aei_gpiochip = "INT33FC:00",
+};
+
 /*
  * Whitelabel (sold as various brands) TM800A550L tablets.
  * These tablet's DSDT contains a whole bunch of bogus ACPI I2C devices
index fb499a2c42d9728f2313260f3322039826c1cee6..f7ee36a30a91c2ecc22a028d62939341caeda34e 100644 (file)
@@ -100,6 +100,7 @@ extern struct x86_dev_info lenovo_yoga_tab2_830_1050_info;
 extern const struct x86_dev_info lenovo_yt3_info;
 extern const struct x86_dev_info medion_lifetab_s10346_info;
 extern const struct x86_dev_info nextbook_ares8_info;
+extern const struct x86_dev_info peaq_c1010_info;
 extern const struct x86_dev_info whitelabel_tm800a550l_info;
 extern const struct x86_dev_info xiaomi_mipad2_info;
 extern const struct dmi_system_id x86_android_tablet_ids[];