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

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

Posted by Kurt Borja 1 day, 16 hours ago

Transition to the new wmi_buffer based WMI API.

Signed-off-by: Kurt Borja <kuurtb@gmail.com>
---
 drivers/platform/x86/dell/alienware-wmi-base.c | 29 ++++++++++++++------------
 1 file changed, 16 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..ef2b4893b7b5 100644
--- a/drivers/platform/x86/dell/alienware-wmi-base.c
+++ b/drivers/platform/x86/dell/alienware-wmi-base.c
@@ -9,7 +9,6 @@
 #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>
@@ -150,23 +149,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 = *(u32 *)out.data;
+	kfree(out.data);
+
 	return 0;
 }
 

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

-- 
Thanks, 
 ~ Kurt

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

Posted by Armin Wolf 1 day, 8 hours ago

Am 30.03.26 um 17:50 schrieb Kurt Borja:

> Transition to the new wmi_buffer based WMI API.
>
> Signed-off-by: Kurt Borja <kuurtb@gmail.com>
> ---
>   drivers/platform/x86/dell/alienware-wmi-base.c | 29 ++++++++++++++------------
>   1 file changed, 16 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..ef2b4893b7b5 100644
> --- a/drivers/platform/x86/dell/alienware-wmi-base.c
> +++ b/drivers/platform/x86/dell/alienware-wmi-base.c
> @@ -9,7 +9,6 @@
>   #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>
> @@ -150,23 +149,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 = *(u32 *)out.data;

Please cast the output data to a __le32 * and use le32_to_cpu() to take the endianess into account.
The rest looks fine to me.

Thanks,
Armin Wolf

> +	kfree(out.data);
> +
>   	return 0;
>   }
>   
>
> ---
> base-commit: fab7c51693e95aa874d6d9db22bfae7bd0b23c66
> change-id: 20260123-aw-new-api-1c18f1011f35
>

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

Posted by Kurt Borja 1 day, 3 hours ago

On Mon Mar 30, 2026 at 6:26 PM -05, Armin Wolf wrote:
> Am 30.03.26 um 17:50 schrieb Kurt Borja:
>
>> Transition to the new wmi_buffer based WMI API.
>>
>> Signed-off-by: Kurt Borja <kuurtb@gmail.com>
>> ---
>>   drivers/platform/x86/dell/alienware-wmi-base.c | 29 ++++++++++++++------------
>>   1 file changed, 16 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..ef2b4893b7b5 100644
>> --- a/drivers/platform/x86/dell/alienware-wmi-base.c
>> +++ b/drivers/platform/x86/dell/alienware-wmi-base.c
>> @@ -9,7 +9,6 @@
>>   #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>
>> @@ -150,23 +149,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 = *(u32 *)out.data;
>
> Please cast the output data to a __le32 * and use le32_to_cpu() to take the endianess into account.
> The rest looks fine to me.

Hi Armin,

Will do -- Thanks!

>
> Thanks,
> Armin Wolf

-- 
Thanks,
 ~ Kurt