platform/x86: alienware-wmi-wmax: Improve internal AWCC API

Inline all AWCC WMI helper methods and directly return the newly
introduced awcc_wmi_command() helper to simplify implementation.

Drop awcc_thermal_control() in favor of awcc_op_activate_profile().

Add awcc_op_get_resource_id(), awcc_op_get_current_profile() and a new
failure code.

Reviewed-by: Armin Wolf <W_Armin@gmx.de>
Signed-off-by: Kurt Borja <kuurtb@gmail.com>
Link: https://lore.kernel.org/r/20250329-hwm-v7-3-a14ea39d8a94@gmail.com
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/alienware-wmi-wmax.c b/drivers/platform/x86/dell/alienware-wmi-wmax.c
index 66755ff21933297568a5262726c05bc60fef56db..c0831c069e366c52b5bc6dcf7996c7b21f4c089d 100644 (file)
--- a/drivers/platform/x86/dell/alienware-wmi-wmax.c
+++ b/drivers/platform/x86/dell/alienware-wmi-wmax.c
@@ -32,6 +32,7 @@
 #define AWCC_THERMAL_MODE_GMODE                        0xAB
 
 #define AWCC_FAILURE_CODE                      0xFFFFFFFF
+#define AWCC_FAILURE_CODE_2                    0xFFFFFFFE
 
 #define AWCC_SENSOR_ID_FLAG                    BIT(8)
 #define AWCC_THERMAL_MODE_MASK                 GENMASK(3, 0)
@@ -444,8 +445,7 @@ const struct attribute_group wmax_deepsleep_attribute_group = {
 };
 
 /*
- * Thermal Profile control
- *  - Provides thermal profile control through the Platform Profile API
+ * AWCC Helpers
  */
 static bool is_awcc_thermal_profile_id(u8 code)
 {
@@ -464,72 +464,115 @@ static bool is_awcc_thermal_profile_id(u8 code)
        return false;
 }
 
-static int awcc_thermal_information(struct wmi_device *wdev, u8 operation,
-                                   u8 arg, u32 *out_data)
+static int awcc_wmi_command(struct wmi_device *wdev, u32 method_id,
+                           struct wmax_u32_args *args, u32 *out)
+{
+       int ret;
+
+       ret = alienware_wmi_command(wdev, method_id, args, sizeof(*args), out);
+       if (ret)
+               return ret;
+
+       if (*out == AWCC_FAILURE_CODE || *out == AWCC_FAILURE_CODE_2)
+               return -EBADRQC;
+
+       return 0;
+}
+
+static int awcc_thermal_information(struct wmi_device *wdev, u8 operation, u8 arg,
+                                   u32 *out)
 {
-       struct wmax_u32_args in_args = {
+       struct wmax_u32_args args = {
                .operation = operation,
                .arg1 = arg,
                .arg2 = 0,
                .arg3 = 0,
        };
-       int ret;
 
-       ret = alienware_wmi_command(wdev, AWCC_METHOD_THERMAL_INFORMATION,
-                                   &in_args, sizeof(in_args), out_data);
-       if (ret < 0)
-               return ret;
+       return awcc_wmi_command(wdev, AWCC_METHOD_THERMAL_INFORMATION, &args, out);
+}
 
-       if (*out_data == AWCC_FAILURE_CODE)
-               return -EBADRQC;
+static int awcc_game_shift_status(struct wmi_device *wdev, u8 operation,
+                                 u32 *out)
+{
+       struct wmax_u32_args args = {
+               .operation = operation,
+               .arg1 = 0,
+               .arg2 = 0,
+               .arg3 = 0,
+       };
 
-       return 0;
+       return awcc_wmi_command(wdev, AWCC_METHOD_GAME_SHIFT_STATUS, &args, out);
 }
 
-static int awcc_thermal_control(struct wmi_device *wdev, u8 profile)
+/**
+ * awcc_op_get_resource_id - Get the resource ID at a given index
+ * @wdev: AWCC WMI device
+ * @index: Index
+ * @out: Value returned by the WMI call
+ *
+ * Get the resource ID at a given @index. Resource IDs are listed in the
+ * following order:
+ *
+ *     - Fan IDs
+ *     - Sensor IDs
+ *     - Unknown IDs
+ *     - Thermal Profile IDs
+ *
+ * The total number of IDs of a given type can be obtained with
+ * AWCC_OP_GET_SYSTEM_DESCRIPTION.
+ *
+ * Return: 0 on success, -errno on failure
+ */
+static int awcc_op_get_resource_id(struct wmi_device *wdev, u8 index, u8 *out)
 {
-       struct wmax_u32_args in_args = {
-               .operation = AWCC_OP_ACTIVATE_PROFILE,
-               .arg1 = profile,
+       struct wmax_u32_args args = {
+               .operation = AWCC_OP_GET_RESOURCE_ID,
+               .arg1 = index,
                .arg2 = 0,
                .arg3 = 0,
        };
        u32 out_data;
        int ret;
 
-       ret = alienware_wmi_command(wdev, AWCC_METHOD_THERMAL_CONTROL,
-                                   &in_args, sizeof(in_args), &out_data);
+       ret = awcc_wmi_command(wdev, AWCC_METHOD_THERMAL_INFORMATION, &args, &out_data);
        if (ret)
                return ret;
 
-       if (out_data == AWCC_FAILURE_CODE)
-               return -EBADRQC;
+       *out = FIELD_GET(AWCC_RESOURCE_ID_MASK, out_data);
 
        return 0;
 }
 
-static int awcc_game_shift_status(struct wmi_device *wdev, u8 operation,
-                                 u32 *out_data)
+static int awcc_op_get_current_profile(struct wmi_device *wdev, u32 *out)
 {
-       struct wmax_u32_args in_args = {
-               .operation = operation,
+       struct wmax_u32_args args = {
+               .operation = AWCC_OP_GET_CURRENT_PROFILE,
                .arg1 = 0,
                .arg2 = 0,
                .arg3 = 0,
        };
-       int ret;
 
-       ret = alienware_wmi_command(wdev, AWCC_METHOD_GAME_SHIFT_STATUS,
-                                   &in_args, sizeof(in_args), out_data);
-       if (ret < 0)
-               return ret;
+       return awcc_wmi_command(wdev, AWCC_METHOD_THERMAL_INFORMATION, &args, out);
+}
 
-       if (*out_data == AWCC_FAILURE_CODE)
-               return -EOPNOTSUPP;
+static int awcc_op_activate_profile(struct wmi_device *wdev, u8 profile)
+{
+       struct wmax_u32_args args = {
+               .operation = AWCC_OP_ACTIVATE_PROFILE,
+               .arg1 = profile,
+               .arg2 = 0,
+               .arg3 = 0,
+       };
+       u32 out;
 
-       return 0;
+       return awcc_wmi_command(wdev, AWCC_METHOD_THERMAL_CONTROL, &args, &out);
 }
 
+/*
+ * Thermal Profile control
+ *  - Provides thermal profile control through the Platform Profile API
+ */
 static int awcc_platform_profile_get(struct device *dev,
                                     enum platform_profile_option *profile)
 {
@@ -537,10 +580,8 @@ static int awcc_platform_profile_get(struct device *dev,
        u32 out_data;
        int ret;
 
-       ret = awcc_thermal_information(priv->wdev, AWCC_OP_GET_CURRENT_PROFILE,
-                                      0, &out_data);
-
-       if (ret < 0)
+       ret = awcc_op_get_current_profile(priv->wdev, &out_data);
+       if (ret)
                return ret;
 
        if (out_data == AWCC_THERMAL_MODE_GMODE) {
@@ -584,8 +625,8 @@ static int awcc_platform_profile_set(struct device *dev,
                }
        }
 
-       return awcc_thermal_control(priv->wdev,
-                                   priv->supported_thermal_profiles[profile]);
+       return awcc_op_activate_profile(priv->wdev,
+                                       priv->supported_thermal_profiles[profile]);
 }
 
 static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices)
@@ -595,7 +636,6 @@ static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices)
        enum awcc_thermal_profile mode;
        u8 sys_desc[4];
        u32 first_mode;
-       u32 out_data;
        int ret;
        u8 id;
 
@@ -607,8 +647,7 @@ static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices)
        first_mode = sys_desc[0] + sys_desc[1];
 
        for (u32 i = 0; i < sys_desc[3]; i++) {
-               ret = awcc_thermal_information(priv->wdev, AWCC_OP_GET_RESOURCE_ID,
-                                              i + first_mode, &out_data);
+               ret = awcc_op_get_resource_id(priv->wdev, i + first_mode, &id);
 
                if (ret == -EIO)
                        return ret;
@@ -616,7 +655,6 @@ static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices)
                if (ret == -EBADRQC)
                        break;
 
-               id = FIELD_GET(AWCC_RESOURCE_ID_MASK, out_data);
                if (!is_awcc_thermal_profile_id(id))
                        continue;