Skip to content

Commit 465dc9d

Browse files
Rongronggg9ij-intel
authored andcommitted
platform/x86: lenovo-wmi-helpers: Convert returned buffer into u32
The Windows WMI-ACPI driver converts all ACPI objects into a common buffer format, so returning a buffer with four bytes will look like an integer for WMI consumers under Windows. Therefore, some devices may simply implement the corresponding ACPI methods to always return a buffer. While lwmi_dev_evaluate_int() expects an integer (u32), convert returned >=4B buffer into u32 to support these devices. Suggested-by: Armin Wolf <W_Armin@gmx.de> Link: https://lore.kernel.org/r/f1787927-b655-4321-b9d9-bc12353c72db@gmx.de/ Signed-off-by: Rong Zhang <i@rong.moe> Reviewed-by: Derek J. Clark <derekjohn.clark@gmail.com> Tested-by: Derek J. Clark <derekjohn.clark@gmail.com> Reviewed-by: Armin Wolf <W_Armin@gmx.de> Link: https://patch.msgid.link/20260120182104.163424-2-i@rong.moe Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
1 parent 2177a02 commit 465dc9d

1 file changed

Lines changed: 18 additions & 3 deletions

File tree

drivers/platform/x86/lenovo/wmi-helpers.c

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <linux/errno.h>
2222
#include <linux/export.h>
2323
#include <linux/module.h>
24+
#include <linux/unaligned.h>
2425
#include <linux/wmi.h>
2526

2627
#include "wmi-helpers.h"
@@ -59,10 +60,24 @@ int lwmi_dev_evaluate_int(struct wmi_device *wdev, u8 instance, u32 method_id,
5960
if (!ret_obj)
6061
return -ENODATA;
6162

62-
if (ret_obj->type != ACPI_TYPE_INTEGER)
63-
return -ENXIO;
63+
switch (ret_obj->type) {
64+
/*
65+
* The ACPI method may simply return a buffer when a u32
66+
* is expected. This is valid on Windows as its WMI-ACPI
67+
* driver converts everything to a common buffer.
68+
*/
69+
case ACPI_TYPE_BUFFER:
70+
if (ret_obj->buffer.length < sizeof(u32))
71+
return -ENXIO;
6472

65-
*retval = (u32)ret_obj->integer.value;
73+
*retval = get_unaligned_le32(ret_obj->buffer.pointer);
74+
return 0;
75+
case ACPI_TYPE_INTEGER:
76+
*retval = (u32)ret_obj->integer.value;
77+
return 0;
78+
default:
79+
return -ENXIO;
80+
}
6681
}
6782

6883
return 0;

0 commit comments

Comments
 (0)