[PATCH v2] platform/x86: alienware-wmi-base: Transition to new WMI API

[PATCH v2] platform/x86: alienware-wmi-base: Transition to new WMI API

[Kurt Borja]

Transition to the new wmi_buffer based WMI API.

Signed-off-by: Kurt Borja <kuurtb@gmail.com>
---
v2:
  - Cast wmi_buffer data to __le32 and then use le32_to_cpu() before
    returning

v1: https://patch.msgid.link/20260330-aw-new-api-v1-1-95910bfa1b38@gmail.com
---
 drivers/platform/x86/dell/alienware-wmi-base.c | 32 +++++++++++++++-----------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/drivers/platform/x86/dell/alienware-wmi-base.c b/drivers/platform/x86/dell/alienware-wmi-base.c
index 64562b92314f..9abdc5de8e23 100644
--- a/drivers/platform/x86/dell/alienware-wmi-base.c
+++ b/drivers/platform/x86/dell/alienware-wmi-base.c
@@ -9,11 +9,13 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/acpi.h>
-#include <linux/cleanup.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/dmi.h>
 #include <linux/leds.h>
+
+#include <asm/byteorder.h>
+
 #include "alienware-wmi.h"
 
 MODULE_AUTHOR("Mario Limonciello <mario.limonciello@outlook.com>");
@@ -150,23 +152,27 @@ u8 alienware_interface;
 int alienware_wmi_command(struct wmi_device *wdev, u32 method_id,
 			  void *in_args, size_t in_size, u32 *out_data)
 {
-	struct acpi_buffer out = {ACPI_ALLOCATE_BUFFER, NULL};
-	struct acpi_buffer in = {in_size, in_args};
-	acpi_status ret;
+	struct wmi_buffer out, in = {
+		.data = in_args,
+		.length = in_size,
+	};
+	int ret;
 
-	ret = wmidev_evaluate_method(wdev, 0, method_id, &in, out_data ? &out : NULL);
-	if (ACPI_FAILURE(ret))
-		return -EIO;
+	ret = wmidev_invoke_method(wdev, 0, method_id, &in, out_data ? &out : NULL);
+	if (ret)
+		return ret;
 
-	union acpi_object *obj __free(kfree) = out.pointer;
+	if (!out_data)
+		return 0;
 
-	if (out_data) {
-		if (obj && obj->type == ACPI_TYPE_INTEGER)
-			*out_data = (u32)obj->integer.value;
-		else
-			return -ENOMSG;
+	if (out.length < sizeof(*out_data)) {
+		kfree(out.data);
+		return -ENOMSG;
 	}
 
+	*out_data = le32_to_cpu(*(__le32 *)out.data);
+	kfree(out.data);
+
 	return 0;
 }
 

---
base-commit: fab7c51693e95aa874d6d9db22bfae7bd0b23c66
change-id: 20260123-aw-new-api-1c18f1011f35

-- 
Thanks, 
 ~ Kurt

Re: [PATCH v2] platform/x86: alienware-wmi-base: Transition to new WMI API

[Ilpo Järvinen]

On Tue, 31 Mar 2026, Kurt Borja wrote:

> Transition to the new wmi_buffer based WMI API.
> 
> Signed-off-by: Kurt Borja <kuurtb@gmail.com>
> ---
> v2:
>   - Cast wmi_buffer data to __le32 and then use le32_to_cpu() before
>     returning
> 
> v1: https://patch.msgid.link/20260330-aw-new-api-v1-1-95910bfa1b38@gmail.com
> ---
>  drivers/platform/x86/dell/alienware-wmi-base.c | 32 +++++++++++++++-----------
>  1 file changed, 19 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/platform/x86/dell/alienware-wmi-base.c b/drivers/platform/x86/dell/alienware-wmi-base.c
> index 64562b92314f..9abdc5de8e23 100644
> --- a/drivers/platform/x86/dell/alienware-wmi-base.c
> +++ b/drivers/platform/x86/dell/alienware-wmi-base.c
> @@ -9,11 +9,13 @@
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>  
>  #include <linux/acpi.h>
> -#include <linux/cleanup.h>
>  #include <linux/module.h>
>  #include <linux/platform_device.h>
>  #include <linux/dmi.h>
>  #include <linux/leds.h>
> +
> +#include <asm/byteorder.h>
> +
>  #include "alienware-wmi.h"
>  
>  MODULE_AUTHOR("Mario Limonciello <mario.limonciello@outlook.com>");
> @@ -150,23 +152,27 @@ u8 alienware_interface;
>  int alienware_wmi_command(struct wmi_device *wdev, u32 method_id,
>  			  void *in_args, size_t in_size, u32 *out_data)
>  {
> -	struct acpi_buffer out = {ACPI_ALLOCATE_BUFFER, NULL};
> -	struct acpi_buffer in = {in_size, in_args};
> -	acpi_status ret;
> +	struct wmi_buffer out, in = {
> +		.data = in_args,
> +		.length = in_size,
> +	};
> +	int ret;
>  
> -	ret = wmidev_evaluate_method(wdev, 0, method_id, &in, out_data ? &out : NULL);
> -	if (ACPI_FAILURE(ret))
> -		return -EIO;
> +	ret = wmidev_invoke_method(wdev, 0, method_id, &in, out_data ? &out : NULL);
> +	if (ret)
> +		return ret;
>  
> -	union acpi_object *obj __free(kfree) = out.pointer;
> +	if (!out_data)
> +		return 0;
>  
> -	if (out_data) {
> -		if (obj && obj->type == ACPI_TYPE_INTEGER)
> -			*out_data = (u32)obj->integer.value;
> -		else
> -			return -ENOMSG;
> +	if (out.length < sizeof(*out_data)) {
> +		kfree(out.data);
> +		return -ENOMSG;
>  	}
>  
> +	*out_data = le32_to_cpu(*(__le32 *)out.data);
> +	kfree(out.data);

Hi,

Please don't bring back duplicated kfree() calls. Just assign out.data 
into a local variable so you can use __free() for it similar to what the 
old code did.

-- 
 i.

Re: [PATCH v2] platform/x86: alienware-wmi-base: Transition to new WMI API

[Kurt Borja]

On Tue Mar 31, 2026 at 3:22 AM -05, Ilpo Järvinen wrote:
> On Tue, 31 Mar 2026, Kurt Borja wrote:
>
>> Transition to the new wmi_buffer based WMI API.
>> 
>> Signed-off-by: Kurt Borja <kuurtb@gmail.com>
>> ---
>> v2:
>>   - Cast wmi_buffer data to __le32 and then use le32_to_cpu() before
>>     returning
>> 
>> v1: https://patch.msgid.link/20260330-aw-new-api-v1-1-95910bfa1b38@gmail.com
>> ---
>>  drivers/platform/x86/dell/alienware-wmi-base.c | 32 +++++++++++++++-----------
>>  1 file changed, 19 insertions(+), 13 deletions(-)
>> 
>> diff --git a/drivers/platform/x86/dell/alienware-wmi-base.c b/drivers/platform/x86/dell/alienware-wmi-base.c
>> index 64562b92314f..9abdc5de8e23 100644
>> --- a/drivers/platform/x86/dell/alienware-wmi-base.c
>> +++ b/drivers/platform/x86/dell/alienware-wmi-base.c
>> @@ -9,11 +9,13 @@
>>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>>  
>>  #include <linux/acpi.h>
>> -#include <linux/cleanup.h>
>>  #include <linux/module.h>
>>  #include <linux/platform_device.h>
>>  #include <linux/dmi.h>
>>  #include <linux/leds.h>
>> +
>> +#include <asm/byteorder.h>
>> +
>>  #include "alienware-wmi.h"
>>  
>>  MODULE_AUTHOR("Mario Limonciello <mario.limonciello@outlook.com>");
>> @@ -150,23 +152,27 @@ u8 alienware_interface;
>>  int alienware_wmi_command(struct wmi_device *wdev, u32 method_id,
>>  			  void *in_args, size_t in_size, u32 *out_data)
>>  {
>> -	struct acpi_buffer out = {ACPI_ALLOCATE_BUFFER, NULL};
>> -	struct acpi_buffer in = {in_size, in_args};
>> -	acpi_status ret;
>> +	struct wmi_buffer out, in = {
>> +		.data = in_args,
>> +		.length = in_size,
>> +	};
>> +	int ret;
>>  
>> -	ret = wmidev_evaluate_method(wdev, 0, method_id, &in, out_data ? &out : NULL);
>> -	if (ACPI_FAILURE(ret))
>> -		return -EIO;
>> +	ret = wmidev_invoke_method(wdev, 0, method_id, &in, out_data ? &out : NULL);
>> +	if (ret)
>> +		return ret;
>>  
>> -	union acpi_object *obj __free(kfree) = out.pointer;
>> +	if (!out_data)
>> +		return 0;
>>  
>> -	if (out_data) {
>> -		if (obj && obj->type == ACPI_TYPE_INTEGER)
>> -			*out_data = (u32)obj->integer.value;
>> -		else
>> -			return -ENOMSG;
>> +	if (out.length < sizeof(*out_data)) {
>> +		kfree(out.data);
>> +		return -ENOMSG;
>>  	}
>>  
>> +	*out_data = le32_to_cpu(*(__le32 *)out.data);
>> +	kfree(out.data);
>
> Hi,
>
> Please don't bring back duplicated kfree() calls. Just assign out.data 
> into a local variable so you can use __free() for it similar to what the 
> old code did.


Hi Ilpo,

Sure! I'll use __free() again.

-- 
Thanks,
 ~ Kurt