[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250329-hwm-v7-2-a14ea39d8a94@gmail.com>
Date: Sat, 29 Mar 2025 04:32:19 -0300
From: Kurt Borja <kuurtb@...il.com>
To: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
Armin Wolf <W_Armin@....de>
Cc: Kurt Borja <kuurtb@...il.com>, Hans de Goede <hdegoede@...hat.com>,
platform-driver-x86@...r.kernel.org, Dell.Client.Kernel@...l.com,
linux-kernel@...r.kernel.org
Subject: [PATCH v7 02/12] platform/x86: alienware-wmi-wmax: Improve ID
processing
Rename AWCC_SENSOR_ID_MASK to AWCC_SENSOR_ID_FLAG and reorder the ID
processing defines in a more logical manner. Then replace their use in
bitwise operations with FIELD_GET().
The latter also involves dropping the AWCC_SENSOR_ID_FLAG check inside
is_awcc_thermal_mode() in favor of extracting the first byte out of IDs
obtained with AWCC_OP_GET_RESOURCE_ID. This is also a requirement to add
support for Alienware Aurora desktops.
While at it, also rename is_awcc_thermal_mode() to
is_awcc_thermal_profile_id().
Reviewed-by: Armin Wolf <W_Armin@....de>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
Signed-off-by: Kurt Borja <kuurtb@...il.com>
---
drivers/platform/x86/dell/alienware-wmi-wmax.c | 38 ++++++++++++++------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/drivers/platform/x86/dell/alienware-wmi-wmax.c b/drivers/platform/x86/dell/alienware-wmi-wmax.c
index ed70e12d73d7fe5d89f3364c5367820bf47e3c1e..66755ff21933297568a5262726c05bc60fef56db 100644
--- a/drivers/platform/x86/dell/alienware-wmi-wmax.c
+++ b/drivers/platform/x86/dell/alienware-wmi-wmax.c
@@ -32,9 +32,11 @@
#define AWCC_THERMAL_MODE_GMODE 0xAB
#define AWCC_FAILURE_CODE 0xFFFFFFFF
-#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4)
+
+#define AWCC_SENSOR_ID_FLAG BIT(8)
#define AWCC_THERMAL_MODE_MASK GENMASK(3, 0)
-#define AWCC_SENSOR_ID_MASK BIT(8)
+#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4)
+#define AWCC_RESOURCE_ID_MASK GENMASK(7, 0)
static bool force_platform_profile;
module_param_unsafe(force_platform_profile, bool, 0);
@@ -168,8 +170,8 @@ enum AWCC_GAME_SHIFT_STATUS_OPERATIONS {
};
enum AWCC_THERMAL_TABLES {
- AWCC_THERMAL_TABLE_LEGACY = 0x90,
- AWCC_THERMAL_TABLE_USTT = 0xA0,
+ AWCC_THERMAL_TABLE_LEGACY = 0x9,
+ AWCC_THERMAL_TABLE_USTT = 0xA,
};
enum awcc_thermal_profile {
@@ -445,20 +447,18 @@ const struct attribute_group wmax_deepsleep_attribute_group = {
* Thermal Profile control
* - Provides thermal profile control through the Platform Profile API
*/
-static bool is_awcc_thermal_mode(u32 code)
+static bool is_awcc_thermal_profile_id(u8 code)
{
- if (code & AWCC_SENSOR_ID_MASK)
+ u8 table = FIELD_GET(AWCC_THERMAL_TABLE_MASK, code);
+ u8 mode = FIELD_GET(AWCC_THERMAL_MODE_MASK, code);
+
+ if (mode >= AWCC_PROFILE_LAST)
return false;
- if ((code & AWCC_THERMAL_MODE_MASK) >= AWCC_PROFILE_LAST)
- return false;
-
- if ((code & AWCC_THERMAL_TABLE_MASK) == AWCC_THERMAL_TABLE_LEGACY &&
- (code & AWCC_THERMAL_MODE_MASK) >= AWCC_PROFILE_LEGACY_QUIET)
+ if (table == AWCC_THERMAL_TABLE_LEGACY && mode >= AWCC_PROFILE_LEGACY_QUIET)
return true;
- if ((code & AWCC_THERMAL_TABLE_MASK) == AWCC_THERMAL_TABLE_USTT &&
- (code & AWCC_THERMAL_MODE_MASK) <= AWCC_PROFILE_USTT_LOW_POWER)
+ if (table == AWCC_THERMAL_TABLE_USTT && mode <= AWCC_PROFILE_USTT_LOW_POWER)
return true;
return false;
@@ -548,10 +548,10 @@ static int awcc_platform_profile_get(struct device *dev,
return 0;
}
- if (!is_awcc_thermal_mode(out_data))
+ if (!is_awcc_thermal_profile_id(out_data))
return -ENODATA;
- out_data &= AWCC_THERMAL_MODE_MASK;
+ out_data = FIELD_GET(AWCC_THERMAL_MODE_MASK, out_data);
*profile = awcc_mode_to_platform_profile[out_data];
return 0;
@@ -597,6 +597,7 @@ static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices)
u32 first_mode;
u32 out_data;
int ret;
+ u8 id;
ret = awcc_thermal_information(priv->wdev, AWCC_OP_GET_SYSTEM_DESCRIPTION,
0, (u32 *) &sys_desc);
@@ -615,12 +616,13 @@ static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices)
if (ret == -EBADRQC)
break;
- if (!is_awcc_thermal_mode(out_data))
+ id = FIELD_GET(AWCC_RESOURCE_ID_MASK, out_data);
+ if (!is_awcc_thermal_profile_id(id))
continue;
- mode = out_data & AWCC_THERMAL_MODE_MASK;
+ mode = FIELD_GET(AWCC_THERMAL_MODE_MASK, id);
profile = awcc_mode_to_platform_profile[mode];
- priv->supported_thermal_profiles[profile] = out_data;
+ priv->supported_thermal_profiles[profile] = id;
set_bit(profile, choices);
}
--
2.49.0
Powered by blists - more mailing lists