platform/x86: dell-wmi-base: Use new buffer-based WMI API

Use the new buffer-based WMI API to also support ACPI firmware
implementations that do not use ACPI buffers for the event data.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Link: https://patch.msgid.link/20260610203453.816254-5-W_Armin@gmx.de
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/dell/dell-wmi-base.c b/drivers/platform/x86/dell/dell-wmi-base.c
index 2a5804efd3ea89c56bbeab741561e4f80f9a3e90..997383ba18465c299e0b9127dac6611ffabe83a1 100644 (file)
--- a/drivers/platform/x86/dell/dell-wmi-base.c
+++ b/drivers/platform/x86/dell/dell-wmi-base.c
@@ -13,6 +13,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/compiler_attributes.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -414,7 +415,8 @@ static void dell_wmi_switch_event(struct input_dev **subdev,
        input_sync(*subdev);
 }
 
-static int dell_wmi_process_key(struct wmi_device *wdev, int type, int code, u16 *buffer, int remaining)
+static int dell_wmi_process_key(struct wmi_device *wdev, int type, int code, __le16 *buffer,
+                               int remaining)
 {
        struct dell_wmi_priv *priv = dev_get_drvdata(&wdev->dev);
        const struct key_entry *key;
@@ -446,15 +448,15 @@ static int dell_wmi_process_key(struct wmi_device *wdev, int type, int code, u16
        } else if (type == 0x0011 && code == 0xe070 && remaining > 0) {
                dell_wmi_switch_event(&priv->tabletswitch_dev,
                                      "Dell tablet mode switch",
-                                     SW_TABLET_MODE, !buffer[0]);
+                                     SW_TABLET_MODE, !le16_to_cpu(buffer[0]));
                return 1;
        } else if (type == 0x0012 && code == 0x000c && remaining > 0) {
                /* Eprivacy toggle, switch to "on" key entry for on events */
-               if (buffer[0] == 2)
+               if (le16_to_cpu(buffer[0]) == 2)
                        key++;
                used = 1;
        } else if (type == 0x0012 && code == 0x000d && remaining > 0) {
-               value = (buffer[2] == 2);
+               value = (le16_to_cpu(buffer[2]) == 2);
                used = 1;
        }
 
@@ -463,24 +465,17 @@ static int dell_wmi_process_key(struct wmi_device *wdev, int type, int code, u16
        return used;
 }
 
-static void dell_wmi_notify(struct wmi_device *wdev,
-                           union acpi_object *obj)
+static void dell_wmi_notify(struct wmi_device *wdev, const struct wmi_buffer *buffer)
 {
        struct dell_wmi_priv *priv = dev_get_drvdata(&wdev->dev);
-       u16 *buffer_entry, *buffer_end;
-       acpi_size buffer_size;
+       __le16 *buffer_entry, *buffer_end;
+       size_t buffer_size;
        int len, i;
 
-       if (obj->type != ACPI_TYPE_BUFFER) {
-               pr_warn("bad response type %x\n", obj->type);
-               return;
-       }
-
-       pr_debug("Received WMI event (%*ph)\n",
-               obj->buffer.length, obj->buffer.pointer);
+       pr_debug("Received WMI event (%*ph)\n", (int)buffer->length, buffer->data);
 
-       buffer_entry = (u16 *)obj->buffer.pointer;
-       buffer_size = obj->buffer.length/2;
+       buffer_entry = buffer->data;
+       buffer_size = buffer->length / 2;
        buffer_end = buffer_entry + buffer_size;
 
        /*
@@ -496,12 +491,12 @@ static void dell_wmi_notify(struct wmi_device *wdev,
         * one event on devices with WMI interface version 0.
         */
        if (priv->interface_version == 0 && buffer_entry < buffer_end)
-               if (buffer_end > buffer_entry + buffer_entry[0] + 1)
-                       buffer_end = buffer_entry + buffer_entry[0] + 1;
+               if (buffer_end > buffer_entry + le16_to_cpu(buffer_entry[0]) + 1)
+                       buffer_end = buffer_entry + le16_to_cpu(buffer_entry[0]) + 1;
 
        while (buffer_entry < buffer_end) {
 
-               len = buffer_entry[0];
+               len = le16_to_cpu(buffer_entry[0]);
                if (len == 0)
                        break;
 
@@ -514,11 +509,11 @@ static void dell_wmi_notify(struct wmi_device *wdev,
 
                pr_debug("Process buffer (%*ph)\n", len*2, buffer_entry);
 
-               switch (buffer_entry[1]) {
+               switch (le16_to_cpu(buffer_entry[1])) {
                case 0x0000: /* One key pressed or event occurred */
                        if (len > 2)
-                               dell_wmi_process_key(wdev, buffer_entry[1],
-                                                    buffer_entry[2],
+                               dell_wmi_process_key(wdev, le16_to_cpu(buffer_entry[1]),
+                                                    le16_to_cpu(buffer_entry[2]),
                                                     buffer_entry + 3,
                                                     len - 3);
                        /* Extended data is currently ignored */
@@ -526,22 +521,23 @@ static void dell_wmi_notify(struct wmi_device *wdev,
                case 0x0010: /* Sequence of keys pressed */
                case 0x0011: /* Sequence of events occurred */
                        for (i = 2; i < len; ++i)
-                               i += dell_wmi_process_key(wdev, buffer_entry[1],
-                                                         buffer_entry[i],
+                               i += dell_wmi_process_key(wdev, le16_to_cpu(buffer_entry[1]),
+                                                         le16_to_cpu(buffer_entry[i]),
                                                          buffer_entry + i,
                                                          len - i - 1);
                        break;
                case 0x0012:
-                       if ((len > 4) && dell_privacy_process_event(buffer_entry[1], buffer_entry[3],
-                                                                   buffer_entry[4]))
+                       if ((len > 4) && dell_privacy_process_event(le16_to_cpu(buffer_entry[1]),
+                                                                   le16_to_cpu(buffer_entry[3]),
+                                                                   le16_to_cpu(buffer_entry[4])))
                                /* dell_privacy_process_event has handled the event */;
                        else if (len > 2)
-                               dell_wmi_process_key(wdev, buffer_entry[1], buffer_entry[2],
+                               dell_wmi_process_key(wdev, le16_to_cpu(buffer_entry[1]),
+                                                    le16_to_cpu(buffer_entry[2]),
                                                     buffer_entry + 3, len - 3);
                        break;
                default: /* Unknown event */
-                       pr_info("Unknown WMI event type 0x%x\n",
-                               (int)buffer_entry[1]);
+                       pr_info("Unknown WMI event type 0x%x\n", le16_to_cpu(buffer_entry[1]));
                        break;
                }
 
@@ -825,10 +821,10 @@ static struct wmi_driver dell_wmi_driver = {
                .name = "dell-wmi",
        },
        .id_table = dell_wmi_id_table,
-       .min_event_size = sizeof(u16),
+       .min_event_size = sizeof(__le16),
        .probe = dell_wmi_probe,
        .remove = dell_wmi_remove,
-       .notify = dell_wmi_notify,
+       .notify_new = dell_wmi_notify,
 };
 
 static int __init dell_wmi_init(void)