github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 08:02:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

platform/x86: alienware-wmi-wmax: Improve platform profile probe

Browse Source 
Get and store the AWCC system description in alienware_awcc_setup()
instead of awcc_platform_profile_probe() and get the correct offset by
iterating through each member of the system_description.

Then add a debug message for unmatched profiles and replace set_bit()
with it's non-atomic version __set_bit() because the choices bitmap only
belongs to this thread.

In the process also check for a malformed system description by defining
an arbitrary limit of resource count.

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-5-a14ea39d8a94@gmail.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
This commit is contained in:
Kurt Borja 2025-03-29 04:32:22 -03:00 committed by Ilpo Järvinen
parent 77bb2ec557
commit 32b6372ddd
No known key found for this signature in database
GPG Key ID: 59AC4F6153E5CE31
1 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/platform/x86/dell/alienware-wmi-wmax.c
View File

@ -8,6 +8,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/array_size.h>
#include <linux/bitfield.h>
#include <linux/bits.h>
#include <linux/dmi.h>
@ -39,6 +40,9 @@
#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4)
#define AWCC_RESOURCE_ID_MASK GENMASK(7, 0)
/* Arbitrary limit based on supported models */
#define AWCC_MAX_RES_COUNT 16
static bool force_platform_profile;
module_param_unsafe(force_platform_profile, bool, 0);
MODULE_PARM_DESC(force_platform_profile, "Forces auto-detecting thermal profiles without checking if WMI thermal backend is available");
@ -213,6 +217,17 @@ struct wmax_u32_args {
struct awcc_priv {
struct wmi_device *wdev;
union {
u32 system_description;
struct {
u8 fan_count;
u8 temp_count;
u8 unknown_count;
u8 profile_count;
};
u8 res_count[4];
};
struct device *ppdev;
u8 supported_profiles[PLATFORM_PROFILE_LAST];
};
@ -633,35 +648,37 @@ static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices)
enum platform_profile_option profile;
struct awcc_priv *priv = drvdata;
enum awcc_thermal_profile mode;
u8 sys_desc[4];
u32 first_mode;
u8 id, offset = 0;
int ret;
u8 id;
ret = awcc_thermal_information(priv->wdev, AWCC_OP_GET_SYSTEM_DESCRIPTION,
0, (u32 *) &sys_desc);
if (ret < 0)
return ret;
first_mode = sys_desc[0] + sys_desc[1];
for (u32 i = 0; i < sys_desc[3]; i++) {
ret = awcc_op_get_resource_id(priv->wdev, i + first_mode, &id);
/*
* Thermal profile IDs are listed last at offset
* fan_count + temp_count + unknown_count
*/
for (unsigned int i = 0; i < ARRAY_SIZE(priv->res_count) - 1; i++)
offset += priv->res_count[i];
for (unsigned int i = 0; i < priv->profile_count; i++) {
ret = awcc_op_get_resource_id(priv->wdev, i + offset, &id);
if (ret == -EIO)
return ret;
/*
* Some devices report an incorrect number of thermal profiles
* so the resource ID list may end prematurely
*/
if (ret == -EBADRQC)
break;
if (!is_awcc_thermal_profile_id(id))
if (!is_awcc_thermal_profile_id(id)) {
dev_dbg(&priv->wdev->dev, "Unmapped thermal profile ID 0x%02x\n", id);
continue;
}
mode = FIELD_GET(AWCC_THERMAL_MODE_MASK, id);
profile = awcc_mode_to_platform_profile[mode];
priv->supported_profiles[profile] = id;
set_bit(profile, choices);
__set_bit(profile, choices);
}
if (bitmap_empty(choices, PLATFORM_PROFILE_LAST))
@ -671,7 +688,7 @@ static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices)
priv->supported_profiles[PLATFORM_PROFILE_PERFORMANCE] =
AWCC_THERMAL_MODE_GMODE;
set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
__set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
}
return 0;
@ -702,6 +719,20 @@ static int alienware_awcc_setup(struct wmi_device *wdev)
if (!priv)
return -ENOMEM;
ret = awcc_thermal_information(wdev, AWCC_OP_GET_SYSTEM_DESCRIPTION,
0, &priv->system_description);
if (ret < 0)
return ret;
/* Sanity check */
for (unsigned int i = 0; i < ARRAY_SIZE(priv->res_count); i++) {
if (priv->res_count[i] > AWCC_MAX_RES_COUNT) {
dev_err(&wdev->dev, "Malformed system description: 0x%08x\n",
priv->system_description);
return -ENXIO;
}
}
priv->wdev = wdev;
dev_set_drvdata(&wdev->dev, priv);