platform/x86: alienware-wmi-wmax: HWMON support + DebugFS + Improvements
Subsystems (5)
Kurt Borja
maintainerv6 cover platform/x86: alienware-wmi-wmax: HWMON support + DebugFS + Improvements
Hi all,
This set mainly adds hwmon and manual fan control support (patches 7-8) to the alienware-wmi driver, after some improvements.
Thank you for your feedback :)
---
Changes in v6:
[08/12]
- Define dev_pm_ops statically (kernel test robot)
Link to v5: https://lore.kernel.org/r/[email protected]
---
Kurt Borja (12):
platform/x86: alienware-wmi-wmax: Rename thermal related symbols platform/x86: alienware-wmi-wmax: Refactor is_awcc_thermal_mode() platform/x86: alienware-wmi-wmax: Improve internal AWCC API platform/x86: alienware-wmi-wmax: Modify supported_thermal_profiles[] platform/x86: alienware-wmi-wmax: Improve platform profile probe platform/x86: alienware-wmi-wmax: Add support for the "custom" thermal profile platform/x86: alienware-wmi-wmax: Add HWMON support
platform/x86: alienware-wmi-wmax: Add support for manual fan control platform/x86: alienware-wmi-wmax: Add a DebugFS interface
Documentation: wmi: Improve and update alienware-wmi documentation
Documentation: admin-guide: laptops: Add documentation for alienware-wmi
Documentation: ABI: Add sysfs platform and debugfs ABI documentation for alienware-wmi
Documentation/ABI/testing/debugfs-alienware-wmi | 44 + .../ABI/testing/sysfs-platform-alienware-wmi | 14 + .../admin-guide/laptops/alienware-wmi.rst | 128 +++ Documentation/admin-guide/laptops/index.rst | 1 + Documentation/wmi/devices/alienware-wmi.rst | 383 +++----- MAINTAINERS | 3 + drivers/platform/x86/dell/Kconfig | 1 + drivers/platform/x86/dell/alienware-wmi-wmax.c | 1023 +++++++++++++++++--- 8 files changed, 1187 insertions(+), 410 deletions(-)
---
base-commit: f895f2493098b862f1ada0568aba278e49bf05b4
change-id: 20250305-hwm-f7bd91902b57
Best regards,
Signature · 1 line
~ Kurt
Kurt Borja
maintainerPATCH v6 1/12 platform/x86: alienware-wmi-wmax: Rename thermal related symbols
The "thermal" features of the WMAX WMI device are only present on the host device if the ACPI _UID is "AWCC". Replace WMAX prefixes with "AWCC" to reflect this relationship.
Thermal profiles with WMAX_PROFILE_BASIC prefix are also renamed to WMAX_PROFILE_LEGACY because they are only supported in older versions of this WMI device.
--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 173 +++++++++++++------------ 1 file changed, 87 insertions(+), 86 deletions(-)
drivers/platform/x86/dell/alienware-wmi-wmax.c +87 -86
@@ -24,16 +24,17 @@#define WMAX_METHOD_DEEP_SLEEP_STATUS 0x0C#define WMAX_METHOD_BRIGHTNESS 0x3#define WMAX_METHOD_ZONE_CONTROL 0x4 -#define WMAX_METHOD_THERMAL_INFORMATION 0x14 -#define WMAX_METHOD_THERMAL_CONTROL 0x15 -#define WMAX_METHOD_GAME_SHIFT_STATUS 0x25 -#define WMAX_THERMAL_MODE_GMODE 0xAB +#define AWCC_METHOD_THERMAL_INFORMATION 0x14 +#define AWCC_METHOD_THERMAL_CONTROL 0x15 +#define AWCC_METHOD_GAME_SHIFT_STATUS 0x25 -#define WMAX_FAILURE_CODE 0xFFFFFFFF -#define WMAX_THERMAL_TABLE_MASK GENMASK(7, 4) -#define WMAX_THERMAL_MODE_MASK GENMASK(3, 0) -#define WMAX_SENSOR_ID_MASK BIT(8) +#define AWCC_THERMAL_MODE_GMODE 0xAB + +#define AWCC_FAILURE_CODE 0xFFFFFFFF +#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4) +#define AWCC_THERMAL_MODE_MASK GENMASK(3, 0) +#define AWCC_SENSOR_ID_MASK BIT(8)static bool force_platform_profile;module_param_unsafe (force_platform_profile, bool,0 );
@@ -151,38 +152,38 @@ static const struct dmi_system_id awcc_dmi_table[] __initconst = { }, }; -enum WMAX_THERMAL_INFORMATION_OPERATIONS { -WMAX_OPERATION_SYS_DESCRIPTION =0x02 , -WMAX_OPERATION_LIST_IDS =0x03 , -WMAX_OPERATION_CURRENT_PROFILE =0x0B , +enum AWCC_THERMAL_INFORMATION_OPERATIONS { +AWCC_OP_GET_SYSTEM_DESCRIPTION =0x02 , +AWCC_OP_GET_RESOURCE_ID =0x03 , +AWCC_OP_GET_CURRENT_PROFILE =0x0B , }; -enum WMAX_THERMAL_CONTROL_OPERATIONS { -WMAX_OPERATION_ACTIVATE_PROFILE =0x01 , +enum AWCC_THERMAL_CONTROL_OPERATIONS { +AWCC_OP_ACTIVATE_PROFILE =0x01 , }; -enum WMAX_GAME_SHIFT_STATUS_OPERATIONS { -WMAX_OPERATION_TOGGLE_GAME_SHIFT =0x01 , -WMAX_OPERATION_GET_GAME_SHIFT_STATUS =0x02 , +enum AWCC_GAME_SHIFT_STATUS_OPERATIONS { +AWCC_OP_TOGGLE_GAME_SHIFT =0x01 , +AWCC_OP_GET_GAME_SHIFT_STATUS =0x02 , }; -enum WMAX_THERMAL_TABLES { -WMAX_THERMAL_TABLE_BASIC =0x90 , -WMAX_THERMAL_TABLE_USTT =0xA0 , +enum AWCC_THERMAL_TABLES { +AWCC_THERMAL_TABLE_LEGACY =0x90 , +AWCC_THERMAL_TABLE_USTT =0xA0 , }; -enum wmax_thermal_mode { -THERMAL_MODE_USTT_BALANCED , -THERMAL_MODE_USTT_BALANCED_PERFORMANCE , -THERMAL_MODE_USTT_COOL , -THERMAL_MODE_USTT_QUIET , -THERMAL_MODE_USTT_PERFORMANCE , -THERMAL_MODE_USTT_LOW_POWER , -THERMAL_MODE_BASIC_QUIET , -THERMAL_MODE_BASIC_BALANCED , -THERMAL_MODE_BASIC_BALANCED_PERFORMANCE , -THERMAL_MODE_BASIC_PERFORMANCE , -THERMAL_MODE_LAST , +enum awcc_thermal_profile { +AWCC_PROFILE_USTT_BALANCED , +AWCC_PROFILE_USTT_BALANCED_PERFORMANCE , +AWCC_PROFILE_USTT_COOL , +AWCC_PROFILE_USTT_QUIET , +AWCC_PROFILE_USTT_PERFORMANCE , +AWCC_PROFILE_USTT_LOW_POWER , +AWCC_PROFILE_LEGACY_QUIET , +AWCC_PROFILE_LEGACY_BALANCED , +AWCC_PROFILE_LEGACY_BALANCED_PERFORMANCE , +AWCC_PROFILE_LEGACY_PERFORMANCE , +AWCC_PROFILE_LAST , };struct wmax_led_args {
@@ -210,20 +211,20 @@ struct wmax_u32_args {struct awcc_priv {struct wmi_device *wdev;struct device *ppdev; -enum wmax_thermal_mode supported_thermal_profiles[PLATFORM_PROFILE_LAST ]; +enum awcc_thermal_profile supported_thermal_profiles[PLATFORM_PROFILE_LAST ]; }; -static const enum platform_profile_option wmax_mode_to_platform_profile[THERMAL_MODE_LAST ] = { - [THERMAL_MODE_USTT_BALANCED ] =PLATFORM_PROFILE_BALANCED , - [THERMAL_MODE_USTT_BALANCED_PERFORMANCE ] =PLATFORM_PROFILE_BALANCED_PERFORMANCE , - [THERMAL_MODE_USTT_COOL ] =PLATFORM_PROFILE_COOL , - [THERMAL_MODE_USTT_QUIET ] =PLATFORM_PROFILE_QUIET , - [THERMAL_MODE_USTT_PERFORMANCE ] =PLATFORM_PROFILE_PERFORMANCE , - [THERMAL_MODE_USTT_LOW_POWER ] =PLATFORM_PROFILE_LOW_POWER , - [THERMAL_MODE_BASIC_QUIET ] =PLATFORM_PROFILE_QUIET , - [THERMAL_MODE_BASIC_BALANCED ] =PLATFORM_PROFILE_BALANCED , - [THERMAL_MODE_BASIC_BALANCED_PERFORMANCE ] =PLATFORM_PROFILE_BALANCED_PERFORMANCE , - [THERMAL_MODE_BASIC_PERFORMANCE ] =PLATFORM_PROFILE_PERFORMANCE , +static const enum platform_profile_option awcc_mode_to_platform_profile[AWCC_PROFILE_LAST ] = { + [AWCC_PROFILE_USTT_BALANCED ] =PLATFORM_PROFILE_BALANCED , + [AWCC_PROFILE_USTT_BALANCED_PERFORMANCE ] =PLATFORM_PROFILE_BALANCED_PERFORMANCE , + [AWCC_PROFILE_USTT_COOL ] =PLATFORM_PROFILE_COOL , + [AWCC_PROFILE_USTT_QUIET ] =PLATFORM_PROFILE_QUIET , + [AWCC_PROFILE_USTT_PERFORMANCE ] =PLATFORM_PROFILE_PERFORMANCE , + [AWCC_PROFILE_USTT_LOW_POWER ] =PLATFORM_PROFILE_LOW_POWER , + [AWCC_PROFILE_LEGACY_QUIET ] =PLATFORM_PROFILE_QUIET , + [AWCC_PROFILE_LEGACY_BALANCED ] =PLATFORM_PROFILE_BALANCED , + [AWCC_PROFILE_LEGACY_BALANCED_PERFORMANCE ] =PLATFORM_PROFILE_BALANCED_PERFORMANCE , + [AWCC_PROFILE_LEGACY_PERFORMANCE ] =PLATFORM_PROFILE_PERFORMANCE , };static struct awcc_quirks *awcc;
@@ -444,26 +445,26 @@ const struct attribute_group wmax_deepsleep_attribute_group = {* Thermal Profile control * - Provides thermal profile control through the Platform Profile API */ -static bool is_wmax_thermal_code (u32 code) +static bool is_awcc_thermal_mode (u32 code) { -if (code &WMAX_SENSOR_ID_MASK ) +if (code &AWCC_SENSOR_ID_MASK )return false; -if ((code &WMAX_THERMAL_MODE_MASK ) >=THERMAL_MODE_LAST ) +if ((code &AWCC_THERMAL_MODE_MASK ) >=AWCC_PROFILE_LAST )return false; -if ((code &WMAX_THERMAL_TABLE_MASK ) ==WMAX_THERMAL_TABLE_BASIC && - (code &WMAX_THERMAL_MODE_MASK ) >=THERMAL_MODE_BASIC_QUIET ) +if ((code &AWCC_THERMAL_TABLE_MASK ) ==AWCC_THERMAL_TABLE_LEGACY && + (code &AWCC_THERMAL_MODE_MASK ) >=AWCC_PROFILE_LEGACY_QUIET )return true; -if ((code &WMAX_THERMAL_TABLE_MASK ) ==WMAX_THERMAL_TABLE_USTT && - (code &WMAX_THERMAL_MODE_MASK ) <=THERMAL_MODE_USTT_LOW_POWER ) +if ((code &AWCC_THERMAL_TABLE_MASK ) ==AWCC_THERMAL_TABLE_USTT && + (code &AWCC_THERMAL_MODE_MASK ) <=AWCC_PROFILE_USTT_LOW_POWER )return true;return false; } -static int wmax_thermal_information (struct wmi_device *wdev,u8 operation, +static int awcc_thermal_information (struct wmi_device *wdev,u8 operation,u8 arg,u32 *out_data) {struct wmax_u32_args in_args = {
@@ -474,21 +475,21 @@ static int wmax_thermal_information(struct wmi_device *wdev, u8 operation, };int ret; - ret =alienware_wmi_command (wdev,WMAX_METHOD_THERMAL_INFORMATION , + ret =alienware_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &in_args,sizeof (in_args), out_data);if (ret <0 )return ret; -if (*out_data ==WMAX_FAILURE_CODE ) +if (*out_data ==AWCC_FAILURE_CODE )return -EBADRQC ;return 0 ; } -static int wmax_thermal_control (struct wmi_device *wdev,u8 profile) +static int awcc_thermal_control (struct wmi_device *wdev,u8 profile) {struct wmax_u32_args in_args = { - .operation =WMAX_OPERATION_ACTIVATE_PROFILE , + .operation =AWCC_OP_ACTIVATE_PROFILE , .arg1 = profile, .arg2 =0 , .arg3 =0 ,
@@ -496,18 +497,18 @@ static int wmax_thermal_control(struct wmi_device *wdev, u8 profile)u32 out_data;int ret; - ret =alienware_wmi_command (wdev,WMAX_METHOD_THERMAL_CONTROL , + ret =alienware_wmi_command (wdev,AWCC_METHOD_THERMAL_CONTROL , &in_args,sizeof (in_args), &out_data);if (ret)return ret; -if (out_data ==WMAX_FAILURE_CODE ) +if (out_data ==AWCC_FAILURE_CODE )return -EBADRQC ;return 0 ; } -static int wmax_game_shift_status (struct wmi_device *wdev,u8 operation, +static int awcc_game_shift_status (struct wmi_device *wdev,u8 operation,u32 *out_data) {struct wmax_u32_args in_args = {
@@ -518,46 +519,46 @@ static int wmax_game_shift_status(struct wmi_device *wdev, u8 operation, };int ret; - ret =alienware_wmi_command (wdev,WMAX_METHOD_GAME_SHIFT_STATUS , + ret =alienware_wmi_command (wdev,AWCC_METHOD_GAME_SHIFT_STATUS , &in_args,sizeof (in_args), out_data);if (ret <0 )return ret; -if (*out_data ==WMAX_FAILURE_CODE ) +if (*out_data ==AWCC_FAILURE_CODE )return -EOPNOTSUPP ;return 0 ; } -static int thermal_profile_get (struct device *dev, -enum platform_profile_option *profile) +static int awcc_platform_profile_get (struct device *dev, +enum platform_profile_option *profile) {struct awcc_priv *priv =dev_get_drvdata (dev);u32 out_data;int ret; - ret =wmax_thermal_information (priv->wdev,WMAX_OPERATION_CURRENT_PROFILE , + ret =awcc_thermal_information (priv->wdev,AWCC_OP_GET_CURRENT_PROFILE ,0 , &out_data);if (ret <0 )return ret; -if (out_data ==WMAX_THERMAL_MODE_GMODE ) { +if (out_data ==AWCC_THERMAL_MODE_GMODE ) { *profile =PLATFORM_PROFILE_PERFORMANCE ;return 0 ; } -if (!is_wmax_thermal_code (out_data)) +if (!is_awcc_thermal_mode (out_data))return -ENODATA ; - out_data &=WMAX_THERMAL_MODE_MASK ; - *profile = wmax_mode_to_platform_profile[out_data]; + out_data &=AWCC_THERMAL_MODE_MASK ; + *profile = awcc_mode_to_platform_profile[out_data];return 0 ; } -static int thermal_profile_set (struct device *dev, -enum platform_profile_option profile) +static int awcc_platform_profile_set (struct device *dev, +enum platform_profile_option profile) {struct awcc_priv *priv =dev_get_drvdata (dev);
@@ -565,8 +566,8 @@ static int thermal_profile_set(struct device *dev,u32 gmode_status;int ret; - ret =wmax_game_shift_status (priv->wdev, -WMAX_OPERATION_GET_GAME_SHIFT_STATUS , + ret =awcc_game_shift_status (priv->wdev, +AWCC_OP_GET_GAME_SHIFT_STATUS , &gmode_status);if (ret <0 )
@@ -574,8 +575,8 @@ static int thermal_profile_set(struct device *dev,if ((profile ==PLATFORM_PROFILE_PERFORMANCE && !gmode_status) || (profile !=PLATFORM_PROFILE_PERFORMANCE && gmode_status)) { - ret =wmax_game_shift_status (priv->wdev, -WMAX_OPERATION_TOGGLE_GAME_SHIFT , + ret =awcc_game_shift_status (priv->wdev, +AWCC_OP_TOGGLE_GAME_SHIFT , &gmode_status);if (ret <0 )
@@ -583,21 +584,21 @@ static int thermal_profile_set(struct device *dev, } } -return wmax_thermal_control (priv->wdev, +return awcc_thermal_control (priv->wdev, priv->supported_thermal_profiles[profile]); } -static int thermal_profile_probe (void *drvdata,unsigned long *choices) +static int awcc_platform_profile_probe (void *drvdata,unsigned long *choices) {enum platform_profile_option profile;struct awcc_priv *priv = drvdata; -enum wmax_thermal_mode mode; +enum awcc_thermal_profile mode;u8 sys_desc[4 ];u32 first_mode;u32 out_data;int ret; - ret =wmax_thermal_information (priv->wdev,WMAX_OPERATION_SYS_DESCRIPTION , + ret =awcc_thermal_information (priv->wdev,AWCC_OP_GET_SYSTEM_DESCRIPTION ,0 , (u32 *) &sys_desc);if (ret <0 )return ret;
@@ -605,7 +606,7 @@ static int thermal_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 =wmax_thermal_information (priv->wdev,WMAX_OPERATION_LIST_IDS , + ret =awcc_thermal_information (priv->wdev,AWCC_OP_GET_RESOURCE_ID , i + first_mode, &out_data);if (ret == -EIO )
@@ -614,11 +615,11 @@ static int thermal_profile_probe(void *drvdata, unsigned long *choices)if (ret == -EBADRQC )break ; -if (!is_wmax_thermal_code (out_data)) +if (!is_awcc_thermal_mode (out_data))continue ; - mode = out_data &WMAX_THERMAL_MODE_MASK ; - profile = wmax_mode_to_platform_profile[mode]; + mode = out_data &AWCC_THERMAL_MODE_MASK ; + profile = awcc_mode_to_platform_profile[mode]; priv->supported_thermal_profiles[profile] = out_data;set_bit (profile, choices);
@@ -629,7 +630,7 @@ static int thermal_profile_probe(void *drvdata, unsigned long *choices)if (awcc->gmode) { priv->supported_thermal_profiles[PLATFORM_PROFILE_PERFORMANCE ] = -WMAX_THERMAL_MODE_GMODE ; +AWCC_THERMAL_MODE_GMODE ;set_bit (PLATFORM_PROFILE_PERFORMANCE , choices); }
@@ -638,9 +639,9 @@ static int thermal_profile_probe(void *drvdata, unsigned long *choices) }static const struct platform_profile_ops awcc_platform_profile_ops = { - .probe = thermal_profile_probe, - .profile_get = thermal_profile_get, - .profile_set = thermal_profile_set, + .probe = awcc_platform_profile_probe, + .profile_get = awcc_platform_profile_get, + .profile_set = awcc_platform_profile_set, };static int awcc_platform_profile_init (struct wmi_device *wdev)
Signature · 1 line
2.48.1
Re: [PATCH v6 01/12] platform/x86: alienware-wmi-wmax: Rename thermal related symbols
Quoted 10 lines · Kurt Borja
The "thermal" features of the WMAX WMI device are only present on the host device if the ACPI
_UIDis "AWCC". Replace WMAX prefixes with "AWCC" to reflect this relationship.Thermal profiles with
WMAX_PROFILE_BASICprefix are also renamed toWMAX_PROFILE_LEGACYbecause they are only supported in older versions of this WMI device.Reviewed-by Armin Wolf <[email protected]>Signed-off-by Kurt Borja <[email protected]>
I note though that this also renames OPERATION -> OP, which is fine, it just wasn't mentioned.
Signature · 1 line
i.
Quoted 367 lines
--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 173 +++++++++++++------------ 1 file changed, 87 insertions(+), 86 deletions(-)drivers/platform/x86/dell/alienware-wmi-wmax.c +87
-86@@ -24,16 +24,17 @@#define WMAX_METHOD_DEEP_SLEEP_STATUS 0x0C#define WMAX_METHOD_BRIGHTNESS 0x3#define WMAX_METHOD_ZONE_CONTROL 0x4 -#define WMAX_METHOD_THERMAL_INFORMATION 0x14 -#define WMAX_METHOD_THERMAL_CONTROL 0x15 -#define WMAX_METHOD_GAME_SHIFT_STATUS 0x25 -#define WMAX_THERMAL_MODE_GMODE 0xAB +#define AWCC_METHOD_THERMAL_INFORMATION 0x14 +#define AWCC_METHOD_THERMAL_CONTROL 0x15 +#define AWCC_METHOD_GAME_SHIFT_STATUS 0x25 -#define WMAX_FAILURE_CODE 0xFFFFFFFF -#define WMAX_THERMAL_TABLE_MASK GENMASK(7, 4) -#define WMAX_THERMAL_MODE_MASK GENMASK(3, 0) -#define WMAX_SENSOR_ID_MASK BIT(8) +#define AWCC_THERMAL_MODE_GMODE 0xAB + +#define AWCC_FAILURE_CODE 0xFFFFFFFF +#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4) +#define AWCC_THERMAL_MODE_MASK GENMASK(3, 0) +#define AWCC_SENSOR_ID_MASK BIT(8)static bool force_platform_profile;module_param_unsafe (force_platform_profile, bool,0 );@@ -151,38 +152,38 @@ static const struct dmi_system_id awcc_dmi_table[] __initconst = { }, }; -enum WMAX_THERMAL_INFORMATION_OPERATIONS { -WMAX_OPERATION_SYS_DESCRIPTION =0x02 , -WMAX_OPERATION_LIST_IDS =0x03 , -WMAX_OPERATION_CURRENT_PROFILE =0x0B , +enum AWCC_THERMAL_INFORMATION_OPERATIONS { +AWCC_OP_GET_SYSTEM_DESCRIPTION =0x02 , +AWCC_OP_GET_RESOURCE_ID =0x03 , +AWCC_OP_GET_CURRENT_PROFILE =0x0B , }; -enum WMAX_THERMAL_CONTROL_OPERATIONS { -WMAX_OPERATION_ACTIVATE_PROFILE =0x01 , +enum AWCC_THERMAL_CONTROL_OPERATIONS { +AWCC_OP_ACTIVATE_PROFILE =0x01 , }; -enum WMAX_GAME_SHIFT_STATUS_OPERATIONS { -WMAX_OPERATION_TOGGLE_GAME_SHIFT =0x01 , -WMAX_OPERATION_GET_GAME_SHIFT_STATUS =0x02 , +enum AWCC_GAME_SHIFT_STATUS_OPERATIONS { +AWCC_OP_TOGGLE_GAME_SHIFT =0x01 , +AWCC_OP_GET_GAME_SHIFT_STATUS =0x02 , }; -enum WMAX_THERMAL_TABLES { -WMAX_THERMAL_TABLE_BASIC =0x90 , -WMAX_THERMAL_TABLE_USTT =0xA0 , +enum AWCC_THERMAL_TABLES { +AWCC_THERMAL_TABLE_LEGACY =0x90 , +AWCC_THERMAL_TABLE_USTT =0xA0 , }; -enum wmax_thermal_mode { -THERMAL_MODE_USTT_BALANCED , -THERMAL_MODE_USTT_BALANCED_PERFORMANCE , -THERMAL_MODE_USTT_COOL , -THERMAL_MODE_USTT_QUIET , -THERMAL_MODE_USTT_PERFORMANCE , -THERMAL_MODE_USTT_LOW_POWER , -THERMAL_MODE_BASIC_QUIET , -THERMAL_MODE_BASIC_BALANCED , -THERMAL_MODE_BASIC_BALANCED_PERFORMANCE , -THERMAL_MODE_BASIC_PERFORMANCE , -THERMAL_MODE_LAST , +enum awcc_thermal_profile { +AWCC_PROFILE_USTT_BALANCED , +AWCC_PROFILE_USTT_BALANCED_PERFORMANCE , +AWCC_PROFILE_USTT_COOL , +AWCC_PROFILE_USTT_QUIET , +AWCC_PROFILE_USTT_PERFORMANCE , +AWCC_PROFILE_USTT_LOW_POWER , +AWCC_PROFILE_LEGACY_QUIET , +AWCC_PROFILE_LEGACY_BALANCED , +AWCC_PROFILE_LEGACY_BALANCED_PERFORMANCE , +AWCC_PROFILE_LEGACY_PERFORMANCE , +AWCC_PROFILE_LAST , };struct wmax_led_args {@@ -210,20 +211,20 @@ struct wmax_u32_args {struct awcc_priv {struct wmi_device *wdev;struct device *ppdev; -enum wmax_thermal_mode supported_thermal_profiles[PLATFORM_PROFILE_LAST ]; +enum awcc_thermal_profile supported_thermal_profiles[PLATFORM_PROFILE_LAST ]; }; -static const enum platform_profile_option wmax_mode_to_platform_profile[THERMAL_MODE_LAST ] = { - [THERMAL_MODE_USTT_BALANCED ] =PLATFORM_PROFILE_BALANCED , - [THERMAL_MODE_USTT_BALANCED_PERFORMANCE ] =PLATFORM_PROFILE_BALANCED_PERFORMANCE , - [THERMAL_MODE_USTT_COOL ] =PLATFORM_PROFILE_COOL , - [THERMAL_MODE_USTT_QUIET ] =PLATFORM_PROFILE_QUIET , - [THERMAL_MODE_USTT_PERFORMANCE ] =PLATFORM_PROFILE_PERFORMANCE , - [THERMAL_MODE_USTT_LOW_POWER ] =PLATFORM_PROFILE_LOW_POWER , - [THERMAL_MODE_BASIC_QUIET ] =PLATFORM_PROFILE_QUIET , - [THERMAL_MODE_BASIC_BALANCED ] =PLATFORM_PROFILE_BALANCED , - [THERMAL_MODE_BASIC_BALANCED_PERFORMANCE ] =PLATFORM_PROFILE_BALANCED_PERFORMANCE , - [THERMAL_MODE_BASIC_PERFORMANCE ] =PLATFORM_PROFILE_PERFORMANCE , +static const enum platform_profile_option awcc_mode_to_platform_profile[AWCC_PROFILE_LAST ] = { + [AWCC_PROFILE_USTT_BALANCED ] =PLATFORM_PROFILE_BALANCED , + [AWCC_PROFILE_USTT_BALANCED_PERFORMANCE ] =PLATFORM_PROFILE_BALANCED_PERFORMANCE , + [AWCC_PROFILE_USTT_COOL ] =PLATFORM_PROFILE_COOL , + [AWCC_PROFILE_USTT_QUIET ] =PLATFORM_PROFILE_QUIET , + [AWCC_PROFILE_USTT_PERFORMANCE ] =PLATFORM_PROFILE_PERFORMANCE , + [AWCC_PROFILE_USTT_LOW_POWER ] =PLATFORM_PROFILE_LOW_POWER , + [AWCC_PROFILE_LEGACY_QUIET ] =PLATFORM_PROFILE_QUIET , + [AWCC_PROFILE_LEGACY_BALANCED ] =PLATFORM_PROFILE_BALANCED , + [AWCC_PROFILE_LEGACY_BALANCED_PERFORMANCE ] =PLATFORM_PROFILE_BALANCED_PERFORMANCE , + [AWCC_PROFILE_LEGACY_PERFORMANCE ] =PLATFORM_PROFILE_PERFORMANCE , };static struct awcc_quirks *awcc;@@ -444,26 +445,26 @@ const struct attribute_group wmax_deepsleep_attribute_group = {* Thermal Profile control * - Provides thermal profile control through the Platform Profile API */ -static bool is_wmax_thermal_code (u32 code) +static bool is_awcc_thermal_mode (u32 code) { -if (code &WMAX_SENSOR_ID_MASK ) +if (code &AWCC_SENSOR_ID_MASK )return false; -if ((code &WMAX_THERMAL_MODE_MASK ) >=THERMAL_MODE_LAST ) +if ((code &AWCC_THERMAL_MODE_MASK ) >=AWCC_PROFILE_LAST )return false; -if ((code &WMAX_THERMAL_TABLE_MASK ) ==WMAX_THERMAL_TABLE_BASIC && - (code &WMAX_THERMAL_MODE_MASK ) >=THERMAL_MODE_BASIC_QUIET ) +if ((code &AWCC_THERMAL_TABLE_MASK ) ==AWCC_THERMAL_TABLE_LEGACY && + (code &AWCC_THERMAL_MODE_MASK ) >=AWCC_PROFILE_LEGACY_QUIET )return true; -if ((code &WMAX_THERMAL_TABLE_MASK ) ==WMAX_THERMAL_TABLE_USTT && - (code &WMAX_THERMAL_MODE_MASK ) <=THERMAL_MODE_USTT_LOW_POWER ) +if ((code &AWCC_THERMAL_TABLE_MASK ) ==AWCC_THERMAL_TABLE_USTT && + (code &AWCC_THERMAL_MODE_MASK ) <=AWCC_PROFILE_USTT_LOW_POWER )return true;return false; } -static int wmax_thermal_information (struct wmi_device *wdev,u8 operation, +static int awcc_thermal_information (struct wmi_device *wdev,u8 operation,u8 arg,u32 *out_data) {struct wmax_u32_args in_args = {@@ -474,21 +475,21 @@ static int wmax_thermal_information(struct wmi_device *wdev, u8 operation, };int ret; - ret =alienware_wmi_command (wdev,WMAX_METHOD_THERMAL_INFORMATION , + ret =alienware_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &in_args,sizeof (in_args), out_data);if (ret <0 )return ret; -if (*out_data ==WMAX_FAILURE_CODE ) +if (*out_data ==AWCC_FAILURE_CODE )return -EBADRQC ;return 0 ; } -static int wmax_thermal_control (struct wmi_device *wdev,u8 profile) +static int awcc_thermal_control (struct wmi_device *wdev,u8 profile) {struct wmax_u32_args in_args = { - .operation =WMAX_OPERATION_ACTIVATE_PROFILE , + .operation =AWCC_OP_ACTIVATE_PROFILE , .arg1 = profile, .arg2 =0 , .arg3 =0 ,@@ -496,18 +497,18 @@ static int wmax_thermal_control(struct wmi_device *wdev, u8 profile)u32 out_data;int ret; - ret =alienware_wmi_command (wdev,WMAX_METHOD_THERMAL_CONTROL , + ret =alienware_wmi_command (wdev,AWCC_METHOD_THERMAL_CONTROL , &in_args,sizeof (in_args), &out_data);if (ret)return ret; -if (out_data ==WMAX_FAILURE_CODE ) +if (out_data ==AWCC_FAILURE_CODE )return -EBADRQC ;return 0 ; } -static int wmax_game_shift_status (struct wmi_device *wdev,u8 operation, +static int awcc_game_shift_status (struct wmi_device *wdev,u8 operation,u32 *out_data) {struct wmax_u32_args in_args = {@@ -518,46 +519,46 @@ static int wmax_game_shift_status(struct wmi_device *wdev, u8 operation, };int ret; - ret =alienware_wmi_command (wdev,WMAX_METHOD_GAME_SHIFT_STATUS , + ret =alienware_wmi_command (wdev,AWCC_METHOD_GAME_SHIFT_STATUS , &in_args,sizeof (in_args), out_data);if (ret <0 )return ret; -if (*out_data ==WMAX_FAILURE_CODE ) +if (*out_data ==AWCC_FAILURE_CODE )return -EOPNOTSUPP ;return 0 ; } -static int thermal_profile_get (struct device *dev, -enum platform_profile_option *profile) +static int awcc_platform_profile_get (struct device *dev, +enum platform_profile_option *profile) {struct awcc_priv *priv =dev_get_drvdata (dev);u32 out_data;int ret; - ret =wmax_thermal_information (priv->wdev,WMAX_OPERATION_CURRENT_PROFILE , + ret =awcc_thermal_information (priv->wdev,AWCC_OP_GET_CURRENT_PROFILE ,0 , &out_data);if (ret <0 )return ret; -if (out_data ==WMAX_THERMAL_MODE_GMODE ) { +if (out_data ==AWCC_THERMAL_MODE_GMODE ) { *profile =PLATFORM_PROFILE_PERFORMANCE ;return 0 ; } -if (!is_wmax_thermal_code (out_data)) +if (!is_awcc_thermal_mode (out_data))return -ENODATA ; - out_data &=WMAX_THERMAL_MODE_MASK ; - *profile = wmax_mode_to_platform_profile[out_data]; + out_data &=AWCC_THERMAL_MODE_MASK ; + *profile = awcc_mode_to_platform_profile[out_data];return 0 ; } -static int thermal_profile_set (struct device *dev, -enum platform_profile_option profile) +static int awcc_platform_profile_set (struct device *dev, +enum platform_profile_option profile) {struct awcc_priv *priv =dev_get_drvdata (dev);@@ -565,8 +566,8 @@ static int thermal_profile_set(struct device *dev,u32 gmode_status;int ret; - ret =wmax_game_shift_status (priv->wdev, -WMAX_OPERATION_GET_GAME_SHIFT_STATUS , + ret =awcc_game_shift_status (priv->wdev, +AWCC_OP_GET_GAME_SHIFT_STATUS , &gmode_status);if (ret <0 )@@ -574,8 +575,8 @@ static int thermal_profile_set(struct device *dev,if ((profile ==PLATFORM_PROFILE_PERFORMANCE && !gmode_status) || (profile !=PLATFORM_PROFILE_PERFORMANCE && gmode_status)) { - ret =wmax_game_shift_status (priv->wdev, -WMAX_OPERATION_TOGGLE_GAME_SHIFT , + ret =awcc_game_shift_status (priv->wdev, +AWCC_OP_TOGGLE_GAME_SHIFT , &gmode_status);if (ret <0 )@@ -583,21 +584,21 @@ static int thermal_profile_set(struct device *dev, } } -return wmax_thermal_control (priv->wdev, +return awcc_thermal_control (priv->wdev, priv->supported_thermal_profiles[profile]); } -static int thermal_profile_probe (void *drvdata,unsigned long *choices) +static int awcc_platform_profile_probe (void *drvdata,unsigned long *choices) {enum platform_profile_option profile;struct awcc_priv *priv = drvdata; -enum wmax_thermal_mode mode; +enum awcc_thermal_profile mode;u8 sys_desc[4 ];u32 first_mode;u32 out_data;int ret; - ret =wmax_thermal_information (priv->wdev,WMAX_OPERATION_SYS_DESCRIPTION , + ret =awcc_thermal_information (priv->wdev,AWCC_OP_GET_SYSTEM_DESCRIPTION ,0 , (u32 *) &sys_desc);if (ret <0 )return ret;@@ -605,7 +606,7 @@ static int thermal_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 =wmax_thermal_information (priv->wdev,WMAX_OPERATION_LIST_IDS , + ret =awcc_thermal_information (priv->wdev,AWCC_OP_GET_RESOURCE_ID , i + first_mode, &out_data);if (ret == -EIO )@@ -614,11 +615,11 @@ static int thermal_profile_probe(void *drvdata, unsigned long *choices)if (ret == -EBADRQC )break ; -if (!is_wmax_thermal_code (out_data)) +if (!is_awcc_thermal_mode (out_data))continue ; - mode = out_data &WMAX_THERMAL_MODE_MASK ; - profile = wmax_mode_to_platform_profile[mode]; + mode = out_data &AWCC_THERMAL_MODE_MASK ; + profile = awcc_mode_to_platform_profile[mode]; priv->supported_thermal_profiles[profile] = out_data;set_bit (profile, choices);@@ -629,7 +630,7 @@ static int thermal_profile_probe(void *drvdata, unsigned long *choices)if (awcc->gmode) { priv->supported_thermal_profiles[PLATFORM_PROFILE_PERFORMANCE ] = -WMAX_THERMAL_MODE_GMODE ; +AWCC_THERMAL_MODE_GMODE ;set_bit (PLATFORM_PROFILE_PERFORMANCE , choices); }@@ -638,9 +639,9 @@ static int thermal_profile_probe(void *drvdata, unsigned long *choices) }static const struct platform_profile_ops awcc_platform_profile_ops = { - .probe = thermal_profile_probe, - .profile_get = thermal_profile_get, - .profile_set = thermal_profile_set, + .probe = awcc_platform_profile_probe, + .profile_get = awcc_platform_profile_get, + .profile_set = awcc_platform_profile_set, };static int awcc_platform_profile_init (struct wmi_device *wdev)
Kurt Borja
maintainerPATCH v6 2/12 platform/x86: alienware-wmi-wmax: Refactor is_awcc_thermal_mode()
In reply to Kurt BorjaRefactor is_awcc_thermal_mode() to use FIELD_GET() instead of bitwise operations. Drop the check for BIT(8) sensor flag and rename it to is_awcc_thermal_profile_id().
--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 33 +++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/platform/x86/dell/alienware-wmi-wmax.c +17 -16
@@ -34,7 +34,8 @@#define AWCC_FAILURE_CODE 0xFFFFFFFF#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4)#define AWCC_THERMAL_MODE_MASK GENMASK(3, 0) -#define AWCC_SENSOR_ID_MASK BIT(8) +/* Some IDs have a BIT(8) flag that we ignore */ +#define AWCC_RESOURCE_ID_MASK GENMASK(7, 0)static bool force_platform_profile;module_param_unsafe (force_platform_profile, bool,0 );
@@ -168,8 +169,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 +446,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,7 +547,7 @@ 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 ;
@@ -597,6 +596,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 +615,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); }
Signature · 1 line
2.48.1
Re: [PATCH v6 02/12] platform/x86: alienware-wmi-wmax: Refactor is_awcc_thermal_mode()
Quoted 15 lines · Kurt Borja
Refactor
is_awcc_thermal_mode()to useFIELD_GET()instead of bitwise operations. Drop the check for BIT(8) sensor flag and rename it tois_awcc_thermal_profile_id().Reviewed-by Armin Wolf <[email protected]>Signed-off-by Kurt Borja <[email protected]>--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 33 +++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-)drivers/platform/x86/dell/alienware-wmi-wmax.c +0
-0
drivers/platform/x86/dell/alienware-wmi-wmax.c line 37
Quoted 4 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +0
-1@@ -34,7 +34,8 @@#define AWCC_FAILURE_CODE 0xFFFFFFFF#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4)#define AWCC_THERMAL_MODE_MASK GENMASK(3, 0) -#define AWCC_SENSOR_ID_MASK BIT(8)
I'd prefer leaving this in place even if it now becomes unused, or actually I suggest you move it before the GENMASKs to keep the values in order, and leave an empty row between failure code and these id related masks.
drivers/platform/x86/dell/alienware-wmi-wmax.c line 38
Quoted 2 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +2
-0+/* Some IDs have a BIT(8) flag that we ignore */ +#define AWCC_RESOURCE_ID_MASK GENMASK(7, 0)
(AWCC_THERMAL_TABLE_MASK | AWCC_THERMAL_MODE_MASK) ?
Quoted 65 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +13
-13static bool force_platform_profile;module_param_unsafe (force_platform_profile, bool,0 );@@ -168,8 +169,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 +446,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,7 +547,7 @@ 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 ;@@ -597,6 +596,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 +615,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))
drivers/platform/x86/dell/alienware-wmi-wmax.c static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices) · line 627
Quoted 10 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +2
-2continue ; - 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); }
Signature · 1 line
i.
Kurt Borja
maintainerRe: [PATCH v6 02/12] platform/x86: alienware-wmi-wmax: Refactor is_awcc_thermal_mode()
Quoted 12 lines · Ilpo Järvinen
Quoted 10 lines · Kurt Borja
Refactor
is_awcc_thermal_mode()to useFIELD_GET()instead of bitwise operations. Drop the check for BIT(8) sensor flag and rename it tois_awcc_thermal_profile_id().Reviewed-by Armin Wolf <[email protected]>Signed-off-by Kurt Borja <[email protected]>--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 33 +++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-)
Quoted 14 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c line 37
Quoted 9 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +0
-1@@ -34,7 +34,8 @@#define AWCC_FAILURE_CODE 0xFFFFFFFF#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4)#define AWCC_THERMAL_MODE_MASK GENMASK(3, 0) -#define AWCC_SENSOR_ID_MASK BIT(8)I'd prefer leaving this in place even if it now becomes unused, or actually I suggest you move it before the GENMASKs to keep the values in order, and leave an empty row between failure code and these id related masks.
Sure, I'll move it to the top.
Quoted 5 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c line 38
Quoted 3 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +2
-0+/* Some IDs have a BIT(8) flag that we ignore */ +#define AWCC_RESOURCE_ID_MASK GENMASK(7, 0)(
AWCC_THERMAL_TABLE_MASK|AWCC_THERMAL_MODE_MASK) ?
I prefer not to go for this because AWCC_RESOURCE_ID_MASK will be used for all IDs in the following patches, not just thermal ones.
I'm doing this because I found that Alienware Aurora desktops also used the BIT(8) flag for thermal profile IDs, not just sensors.
Quoted 74 lines
Quoted 74 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +15
-15static bool force_platform_profile;module_param_unsafe (force_platform_profile, bool,0 );@@ -168,8 +169,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 +446,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,7 +547,7 @@ 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 ;@@ -597,6 +596,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 +615,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;
Quoted 4 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices) · line 627
Quoted 2 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +0
-0set_bit (profile, choices); }Reviewed-by Ilpo Järvinen <[email protected]>
Thanks!
Signature · 1 line
~ Kurt
Kurt Borja
maintainerPATCH v6 3/12 platform/x86: alienware-wmi-wmax: Improve internal AWCC API
In reply to Kurt BorjaInline 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.
--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 150 +++++++++++++++---------- 1 file changed, 91 insertions(+), 59 deletions(-)
drivers/platform/x86/dell/alienware-wmi-wmax.c +91 -59
@@ -32,6 +32,7 @@#define AWCC_THERMAL_MODE_GMODE 0xAB#define AWCC_FAILURE_CODE 0xFFFFFFFF +#define AWCC_FAILURE_CODE_2 0xFFFFFFFE#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4)#define AWCC_THERMAL_MODE_MASK GENMASK(3, 0)/* Some IDs have a BIT(8) flag that we ignore */
@@ -443,8 +444,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) {
@@ -463,72 +463,107 @@ 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) { -struct wmax_u32_args in_args = { +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 inline int awcc_thermal_information (struct wmi_device *wdev,u8 operation, +u8 arg,u32 *out) +{ +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; - -if (*out_data ==AWCC_FAILURE_CODE ) -return -EBADRQC ; - -return 0 ; +return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &args, out); } -static int awcc_thermal_control (struct wmi_device *wdev,u8 profile) +static inline int awcc_game_shift_status (struct wmi_device *wdev,u8 operation, +u32 *out) { -struct wmax_u32_args in_args = { - .operation =AWCC_OP_ACTIVATE_PROFILE , - .arg1 = profile, - .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); -if (ret) -return ret; - -if (out_data ==AWCC_FAILURE_CODE ) -return -EBADRQC ; - -return 0 ; -} - -static int awcc_game_shift_status (struct wmi_device *wdev,u8 operation, -u32 *out_data) -{ -struct wmax_u32_args in_args = { +struct wmax_u32_args args = { .operation = operation, .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; - -if (*out_data ==AWCC_FAILURE_CODE ) -return -EOPNOTSUPP ; - -return 0 ; +return __awcc_wmi_command (wdev,AWCC_METHOD_GAME_SHIFT_STATUS , &args, out); } +/** +* 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 inline int awcc_op_get_resource_id (struct wmi_device *wdev,u8 index,u32 *out) +{ +struct wmax_u32_args args = { + .operation =AWCC_OP_GET_RESOURCE_ID , + .arg1 = index, + .arg2 =0 , + .arg3 =0 , + }; + +return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &args, out); +} + +static inline int awcc_op_get_current_profile (struct wmi_device *wdev,u32 *out) +{ +struct wmax_u32_args args = { + .operation =AWCC_OP_GET_CURRENT_PROFILE , + .arg1 =0 , + .arg2 =0 , + .arg3 =0 , + }; + +return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &args, out); +} + +static inline 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 __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) {
@@ -536,10 +571,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 ) {
@@ -550,7 +583,7 @@ static int awcc_platform_profile_get(struct device *dev,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 ;
@@ -583,8 +616,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)
@@ -606,8 +639,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, &out_data);if (ret == -EIO )return ret;
Signature · 1 line
2.48.1
Ilpo Järvinen
maintainerRe: [PATCH v6 03/12] platform/x86: alienware-wmi-wmax: Improve internal AWCC API
Quoted 37 lines · Kurt Borja
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 ofawcc_op_activate_profile().Add
awcc_op_get_resource_id(),awcc_op_get_current_profile()and a new failure code.Reviewed-by Armin Wolf <[email protected]>Signed-off-by Kurt Borja <[email protected]>--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 150 +++++++++++++++---------- 1 file changed, 91 insertions(+), 59 deletions(-)drivers/platform/x86/dell/alienware-wmi-wmax.c +2
-2@@ -32,6 +32,7 @@#define AWCC_THERMAL_MODE_GMODE 0xAB#define AWCC_FAILURE_CODE 0xFFFFFFFF +#define AWCC_FAILURE_CODE_2 0xFFFFFFFE#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4)#define AWCC_THERMAL_MODE_MASK GENMASK(3, 0)/* Some IDs have a BIT(8) flag that we ignore */ @@ -443,8 +444,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) {
drivers/platform/x86/dell/alienware-wmi-wmax.c static bool is_awcc_thermal_profile_id(u8 code) · line 467
Quoted 7 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +2
-2@@ -463,72 +463,107 @@ 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)
Why did you put __ into the name?
Some people oppose __ prefix altogether, I don't entirely agree with their stance but I don't really understand what the underscores here signify.
Normally I see __ being used in three main cases:
- non-__ variant does some locking around the call too the __ func (though many funcs use _locked postfix these days).
- func is "dangerous" and caller has to really know what he/she is doing / be careful for some reason.
- non-__ variant exists and somebody cannot come up better name for the internally called function (not very good use case, IMHO)
I don't see any of those apply here, this looks just an ordinary wrapper function, thus the question.
Quoted 29 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +16
-6{ -struct wmax_u32_args in_args = { +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 inline int awcc_thermal_information (struct wmi_device *wdev,u8 operation, +u8 arg,u32 *out) +{ +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;
drivers/platform/x86/dell/alienware-wmi-wmax.c static bool is_awcc_thermal_profile_id(u8 code) · line 494
Quoted 10 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +2
-6- -if (*out_data ==AWCC_FAILURE_CODE ) -return -EBADRQC ; - -return 0 ; +return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &args, out); } -static int awcc_thermal_control (struct wmi_device *wdev,u8 profile) +static inline int awcc_game_shift_status(struct wmi_device *wdev, u8 operation,
As a general rule, don't add inline to .c files, we leave figuring inlining out to the compiler.
Quoted 43 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +2
-34+ u32 *out) { -struct wmax_u32_args in_args = { - .operation =AWCC_OP_ACTIVATE_PROFILE , - .arg1 = profile, - .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); -if (ret) -return ret; - -if (out_data ==AWCC_FAILURE_CODE ) -return -EBADRQC ; - -return 0 ; -} - -static int awcc_game_shift_status (struct wmi_device *wdev,u8 operation, -u32 *out_data) -{ -struct wmax_u32_args in_args = { +struct wmax_u32_args args = { .operation = operation, .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; - -if (*out_data ==AWCC_FAILURE_CODE ) -return -EOPNOTSUPP ; - -return 0 ;
drivers/platform/x86/dell/alienware-wmi-wmax.c static bool is_awcc_thermal_profile_id(u8 code) · line 513
Quoted 10 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +8
-0+return __awcc_wmi_command (wdev,AWCC_METHOD_GAME_SHIFT_STATUS , &args, out); } +/** +* 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
Use @index to refer to the argument.
Quoted 70 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +55
-4+* 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 inline int awcc_op_get_resource_id (struct wmi_device *wdev,u8 index,u32 *out) +{ +struct wmax_u32_args args = { + .operation =AWCC_OP_GET_RESOURCE_ID , + .arg1 = index, + .arg2 =0 , + .arg3 =0 , + }; + +return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &args, out); +} + +static inline int awcc_op_get_current_profile (struct wmi_device *wdev,u32 *out) +{ +struct wmax_u32_args args = { + .operation =AWCC_OP_GET_CURRENT_PROFILE , + .arg1 =0 , + .arg2 =0 , + .arg3 =0 , + }; + +return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &args, out); +} + +static inline 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 __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) {@@ -536,10 +571,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 ) {
drivers/platform/x86/dell/alienware-wmi-wmax.c static int awcc_platform_profile_get(struct device *dev, · line 586
Quoted 5 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +1
-1@@ -550,7 +583,7 @@ static int awcc_platform_profile_get(struct device *dev,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);
Should this be part of the earlier patch??
Quoted 26 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +3
-4*profile = awcc_mode_to_platform_profile[out_data];return 0 ;@@ -583,8 +616,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)@@ -606,8 +639,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, &out_data);if (ret == -EIO )return ret;
Signature · 1 line
i.
Kurt Borja
maintainerRe: [PATCH v6 03/12] platform/x86: alienware-wmi-wmax: Improve internal AWCC API
Quoted 52 lines · Ilpo Järvinen
Quoted 37 lines · Kurt Borja
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 ofawcc_op_activate_profile().Add
awcc_op_get_resource_id(),awcc_op_get_current_profile()and a new failure code.Reviewed-by Armin Wolf <[email protected]>Signed-off-by Kurt Borja <[email protected]>--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 150 +++++++++++++++---------- 1 file changed, 91 insertions(+), 59 deletions(-)drivers/platform/x86/dell/alienware-wmi-wmax.c +2
-2@@ -32,6 +32,7 @@#define AWCC_THERMAL_MODE_GMODE 0xAB#define AWCC_FAILURE_CODE 0xFFFFFFFF +#define AWCC_FAILURE_CODE_2 0xFFFFFFFE#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4)#define AWCC_THERMAL_MODE_MASK GENMASK(3, 0)/* Some IDs have a BIT(8) flag that we ignore */ @@ -443,8 +444,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) {drivers/platform/x86/dell/alienware-wmi-wmax.c static bool is_awcc_thermal_profile_id(u8 code) · line 467
Quoted 7 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +2
-2@@ -463,72 +463,107 @@ 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)Why did you put __ into the name?
Some people oppose __ prefix altogether, I don't entirely agree with their stance but I don't really understand what the underscores here signify.
Quoted 7 lines
Normally I see __ being used in three main cases:
- non-__ variant does some locking around the call too the __ func (though many funcs use_lockedpostfix these days).
- func is "dangerous" and caller has to really know what he/she is doing / be careful for some reason.
- non-__ variant exists and somebody cannot come up better name for the internally called function (not very good use case, IMHO)
Oh - I didn't know. Andy also mentioned this prefix is used for non-atomic versions of some functions like __set_bit().
Quoted 3 lines
I don't see any of those apply here, this looks just an ordinary wrapper function, thus the question.
I did it to indicate it's a "private" method, so it's not used directly. But ofc that's not the convention here, so I'll drop it.
Quoted 38 lines
Quoted 38 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +17
-11{ -struct wmax_u32_args in_args = { +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 inline int awcc_thermal_information (struct wmi_device *wdev,u8 operation, +u8 arg,u32 *out) +{ +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; - -if (*out_data ==AWCC_FAILURE_CODE ) -return -EBADRQC ; - -return 0 ; +return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &args, out); }
Quoted 5 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c static bool is_awcc_thermal_profile_id(u8 code) · line 494
Quoted 2 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +1
-1-static int awcc_thermal_control (struct wmi_device *wdev,u8 profile) +static inline int awcc_game_shift_status(struct wmi_device *wdev, u8 operation,As a general rule, don't add inline to .c files, we leave figuring inlining out to the compiler.
Good to know, thanks!
Quoted 47 lines
Quoted 47 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +3
-34+ u32 *out) { -struct wmax_u32_args in_args = { - .operation =AWCC_OP_ACTIVATE_PROFILE , - .arg1 = profile, - .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); -if (ret) -return ret; - -if (out_data ==AWCC_FAILURE_CODE ) -return -EBADRQC ; - -return 0 ; -} - -static int awcc_game_shift_status (struct wmi_device *wdev,u8 operation, -u32 *out_data) -{ -struct wmax_u32_args in_args = { +struct wmax_u32_args args = { .operation = operation, .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; - -if (*out_data ==AWCC_FAILURE_CODE ) -return -EOPNOTSUPP ; - -return 0 ; +return __awcc_wmi_command (wdev,AWCC_METHOD_GAME_SHIFT_STATUS , &args, out); }
Quoted 9 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c static bool is_awcc_thermal_profile_id(u8 code) · line 513
Quoted 7 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +7
-0+/** +* 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 Use @index to refer to the argument.
Ack
Quoted 74 lines
Quoted 74 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +55
-4+* 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 inline int awcc_op_get_resource_id (struct wmi_device *wdev,u8 index,u32 *out) +{ +struct wmax_u32_args args = { + .operation =AWCC_OP_GET_RESOURCE_ID , + .arg1 = index, + .arg2 =0 , + .arg3 =0 , + }; + +return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &args, out); +} + +static inline int awcc_op_get_current_profile (struct wmi_device *wdev,u32 *out) +{ +struct wmax_u32_args args = { + .operation =AWCC_OP_GET_CURRENT_PROFILE , + .arg1 =0 , + .arg2 =0 , + .arg3 =0 , + }; + +return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &args, out); +} + +static inline 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 __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) {@@ -536,10 +571,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 ) {@@ -550,7 +583,7 @@ static int awcc_platform_profile_get(struct device *dev,if (!is_awcc_thermal_profile_id (out_data))return -ENODATA ;
Quoted 4 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c static int awcc_platform_profile_get(struct device *dev, · line 586
Quoted 2 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +1
-1- out_data &=AWCC_THERMAL_MODE_MASK ; + out_data =FIELD_GET (AWCC_THERMAL_MODE_MASK , out_data);Should this be part of the earlier patch??
I think I'll leave it in this patch, but I'll move it to awcc_op_get_resource_id().
Signature · 1 line
~ Kurt
Quoted 27 lines
Quoted 27 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +3
-4*profile = awcc_mode_to_platform_profile[out_data];return 0 ;@@ -583,8 +616,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)@@ -606,8 +639,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, &out_data);if (ret == -EIO )return ret;
Ilpo Järvinen
maintainerRe: [PATCH v6 03/12] platform/x86: alienware-wmi-wmax: Improve internal AWCC API
Quoted 61 lines · Kurt Borja
Quoted 52 lines · Ilpo Järvinen
Quoted 37 lines · Kurt Borja
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 ofawcc_op_activate_profile().Add
awcc_op_get_resource_id(),awcc_op_get_current_profile()and a new failure code.Reviewed-by Armin Wolf <[email protected]>Signed-off-by Kurt Borja <[email protected]>--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 150 +++++++++++++++---------- 1 file changed, 91 insertions(+), 59 deletions(-)drivers/platform/x86/dell/alienware-wmi-wmax.c +2
-2@@ -32,6 +32,7 @@#define AWCC_THERMAL_MODE_GMODE 0xAB#define AWCC_FAILURE_CODE 0xFFFFFFFF +#define AWCC_FAILURE_CODE_2 0xFFFFFFFE#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4)#define AWCC_THERMAL_MODE_MASK GENMASK(3, 0)/* Some IDs have a BIT(8) flag that we ignore */ @@ -443,8 +444,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) {drivers/platform/x86/dell/alienware-wmi-wmax.c static bool is_awcc_thermal_profile_id(u8 code) · line 467
Quoted 7 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +2
-2@@ -463,72 +463,107 @@ 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)Why did you put __ into the name?
Some people oppose __ prefix altogether, I don't entirely agree with their stance but I don't really understand what the underscores here signify.
Quoted 7 lines
Normally I see __ being used in three main cases:
- non-__ variant does some locking around the call too the __ func (though many funcs use_lockedpostfix these days).
- func is "dangerous" and caller has to really know what he/she is doing / be careful for some reason.
- non-__ variant exists and somebody cannot come up better name for the internally called function (not very good use case, IMHO)
Quoted 2 lines
Oh - I didn't know. Andy also mentioned this prefix is used for non-atomic versions of some functions like
__set_bit().
I mentioned locking which relates to atomicity, however, here you don't have two variants, one without locking and the other with it so it becomes very non-obvious what __ means. (I know you posted v7 without it, so this is just a clarifying comment.)
Quoted 5 lines
Quoted 2 lines
I don't see any of those apply here, this looks just an ordinary wrapper function, thus the question.
I did it to indicate it's a "private" method, so it's not used directly. But ofc that's not the convention here, so I'll drop it.
We have "static" for that. And it's called by something anyway or it would be dead code :-).
Signature · 1 line
i.
Kurt Borja
maintainerPATCH v6 4/12 platform/x86: alienware-wmi-wmax: Modify supported_thermal_profiles[]
In reply to Kurt BorjaRename supported_thermal_profiles[] -> supported_profiles[] and change it's type to u8 because it stores AWCC thermal IDs.
--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/platform/x86/dell/alienware-wmi-wmax.c +4 -5
@@ -213,7 +213,7 @@ struct wmax_u32_args {struct awcc_priv {struct wmi_device *wdev;struct device *ppdev; -enum awcc_thermal_profile supported_thermal_profiles[PLATFORM_PROFILE_LAST ]; +u8 supported_profiles[PLATFORM_PROFILE_LAST ]; };static const enum platform_profile_option awcc_mode_to_platform_profile[AWCC_PROFILE_LAST ] = {
@@ -616,8 +616,7 @@ static int awcc_platform_profile_set(struct device *dev, } } -return awcc_op_activate_profile (priv->wdev, - priv->supported_thermal_profiles[profile]); +return awcc_op_activate_profile (priv->wdev, priv->supported_profiles[profile]); }static int awcc_platform_profile_probe (void *drvdata,unsigned long *choices)
@@ -653,7 +652,7 @@ static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices) mode =FIELD_GET (AWCC_THERMAL_MODE_MASK , id); profile = awcc_mode_to_platform_profile[mode]; - priv->supported_thermal_profiles[profile] = id; + priv->supported_profiles[profile] = id;set_bit (profile, choices); }
@@ -662,7 +661,7 @@ static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices)return -ENODEV ;if (awcc->gmode) { - priv->supported_thermal_profiles[PLATFORM_PROFILE_PERFORMANCE ] = + priv->supported_profiles[PLATFORM_PROFILE_PERFORMANCE ] =AWCC_THERMAL_MODE_GMODE ;set_bit (PLATFORM_PROFILE_PERFORMANCE , choices);
Signature · 1 line
2.48.1
Kurt Borja
maintainerPATCH v6 5/12 platform/x86: alienware-wmi-wmax: Improve platform profile probe
In reply to Kurt BorjaGet and store the AWCC system description in alienware_awcc_setup() instead of awcc_platform_profile_probe() and add a check for integer overflows to avoid misbehaviors.
While at it, replace set_bit() with it's non-atomic version __set_bit() because choices belong to this thread only.
--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 61 +++++++++++++++++++------- 1 file changed, 46 insertions(+), 15 deletions(-)
drivers/platform/x86/dell/alienware-wmi-wmax.c +46 -15
@@ -38,6 +38,9 @@/* Some IDs have a BIT(8) flag that we ignore */ #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" );
@@ -212,6 +215,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 ]; };
@@ -624,37 +638,40 @@ 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 ;u32 out_data;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, &out_data); +/* +* 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, &out_data);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 ; id =FIELD_GET (AWCC_RESOURCE_ID_MASK , out_data); -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 ))
@@ -664,7 +681,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 ;
@@ -695,6 +712,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);
Signature · 1 line
2.48.1
Ilpo Järvinen
maintainerRe: [PATCH v6 05/12] platform/x86: alienware-wmi-wmax: Improve platform profile probe
Quoted 61 lines · Kurt Borja
Get and store the AWCC system description in
alienware_awcc_setup()instead ofawcc_platform_profile_probe()and add a check for integer overflows to avoid misbehaviors.While at it, replace
set_bit()with it's non-atomic version__set_bit()becausechoicesbelong to this thread only.Reviewed-by Armin Wolf <[email protected]>Signed-off-by Kurt Borja <[email protected]>--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 61 +++++++++++++++++++------- 1 file changed, 46 insertions(+), 15 deletions(-)drivers/platform/x86/dell/alienware-wmi-wmax.c +15
-8@@ -38,6 +38,9 @@/* Some IDs have a BIT(8) flag that we ignore */ #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" );@@ -212,6 +215,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 ]; };@@ -624,37 +638,40 @@ 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 ;u32 out_data;int ret; -u8 id; - ret =awcc_thermal_information (priv->wdev,AWCC_OP_GET_SYSTEM_DESCRIPTION , -0 , (u32 *) &sys_desc); -if (ret <0 ) -return ret; -
drivers/platform/x86/dell/alienware-wmi-wmax.c static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices) · line 650
Quoted 10 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +6
-4- 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, &out_data); +/* +* 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];
Doesn't this change go slightly beyond what its changelog describes, could you please amend the changelog to explain it.
Quoted 61 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +25
-3+for (unsigned int i =0 ; i < priv->profile_count; i++) { + ret =awcc_op_get_resource_id (priv->wdev, i + offset, &out_data);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 ; id =FIELD_GET (AWCC_RESOURCE_ID_MASK , out_data); -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 ))@@ -664,7 +681,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 ;@@ -695,6 +712,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);
Signature · 1 line
i.
Kurt Borja
maintainerRe: [PATCH v6 05/12] platform/x86: alienware-wmi-wmax: Improve platform profile probe
Quoted 68 lines · Ilpo Järvinen
Quoted 66 lines · Kurt Borja
Get and store the AWCC system description in
alienware_awcc_setup()instead ofawcc_platform_profile_probe()and add a check for integer overflows to avoid misbehaviors.While at it, replace
set_bit()with it's non-atomic version__set_bit()becausechoicesbelong to this thread only.Reviewed-by Armin Wolf <[email protected]>Signed-off-by Kurt Borja <[email protected]>--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 61 +++++++++++++++++++------- 1 file changed, 46 insertions(+), 15 deletions(-)drivers/platform/x86/dell/alienware-wmi-wmax.c +16
-12@@ -38,6 +38,9 @@/* Some IDs have a BIT(8) flag that we ignore */ #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" );@@ -212,6 +215,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 ]; };@@ -624,37 +638,40 @@ 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 ;u32 out_data;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, &out_data); +/*
Quoted 8 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices) · line 650
Quoted 5 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +5
-0+* 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];Doesn't this change go slightly beyond what its changelog describes, could you please amend the changelog to explain it.
Sure! Only difference would be that now we also sum the unknown_ids. I'll mention it.
Quoted 61 lines
Quoted 61 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +25
-3+for (unsigned int i =0 ; i < priv->profile_count; i++) { + ret =awcc_op_get_resource_id (priv->wdev, i + offset, &out_data);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 ; id =FIELD_GET (AWCC_RESOURCE_ID_MASK , out_data); -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 ))@@ -664,7 +681,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 ;@@ -695,6 +712,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);
Kurt Borja
maintainerPATCH v6 6/12 platform/x86: alienware-wmi-wmax: Add support for the "custom" thermal profile
In reply to Kurt BorjaAll models with the "AWCC" WMAX device support a "custom" thermal profile. In some models this profile signals user-space that the user wants to manually control the fans, which are always unlocked. In other models it actually unlocks manual fan control.
--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
drivers/platform/x86/dell/alienware-wmi-wmax.c +19 -4
@@ -29,8 +29,6 @@#define AWCC_METHOD_THERMAL_CONTROL 0x15#define AWCC_METHOD_GAME_SHIFT_STATUS 0x25 -#define AWCC_THERMAL_MODE_GMODE 0xAB -#define AWCC_FAILURE_CODE 0xFFFFFFFF#define AWCC_FAILURE_CODE_2 0xFFFFFFFE#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4)
@@ -177,6 +175,11 @@ enum AWCC_THERMAL_TABLES { AWCC_THERMAL_TABLE_USTT = 0xA, }; +enum AWCC_SPECIAL_THERMAL_CODES { +AWCC_SPECIAL_PROFILE_CUSTOM =0x00 , +AWCC_SPECIAL_PROFILE_GMODE =0xAB , +}; +enum awcc_thermal_profile {AWCC_PROFILE_USTT_BALANCED ,AWCC_PROFILE_USTT_BALANCED_PERFORMANCE ,
@@ -589,9 +592,15 @@ static int awcc_platform_profile_get(struct device *dev,if (ret)return ret; -if (out_data ==AWCC_THERMAL_MODE_GMODE ) { +switch (out_data) { +case AWCC_SPECIAL_PROFILE_CUSTOM : + *profile =PLATFORM_PROFILE_CUSTOM ; +return 0 ; +case AWCC_SPECIAL_PROFILE_GMODE : *profile =PLATFORM_PROFILE_PERFORMANCE ;return 0 ; +default : +break ; }if (!is_awcc_thermal_profile_id (out_data))
@@ -679,11 +688,17 @@ static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices)if (awcc->gmode) { priv->supported_profiles[PLATFORM_PROFILE_PERFORMANCE ] = -AWCC_THERMAL_MODE_GMODE ; +AWCC_SPECIAL_PROFILE_GMODE ;__set_bit (PLATFORM_PROFILE_PERFORMANCE , choices); } +/* Every model supports the "custom" profile */ + priv->supported_profiles[PLATFORM_PROFILE_CUSTOM ] = +AWCC_SPECIAL_PROFILE_CUSTOM ; + +__set_bit (PLATFORM_PROFILE_CUSTOM , choices); +return 0 ; }
Signature · 1 line
2.48.1
Re: [PATCH v6 06/12] platform/x86: alienware-wmi-wmax: Add support for the "custom" thermal profile
Quoted 7 lines · Kurt Borja
All models with the "AWCC" WMAX device support a "custom" thermal profile. In some models this profile signals user-space that the user wants to manually control the fans, which are always unlocked. In other models it actually unlocks manual fan control.
Reviewed-by Armin Wolf <[email protected]>Signed-off-by Kurt Borja <[email protected]>
Signature · 1 line
i.
Quoted 67 lines
--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)drivers/platform/x86/dell/alienware-wmi-wmax.c +19
-4@@ -29,8 +29,6 @@#define AWCC_METHOD_THERMAL_CONTROL 0x15#define AWCC_METHOD_GAME_SHIFT_STATUS 0x25 -#define AWCC_THERMAL_MODE_GMODE 0xAB -#define AWCC_FAILURE_CODE 0xFFFFFFFF#define AWCC_FAILURE_CODE_2 0xFFFFFFFE#define AWCC_THERMAL_TABLE_MASK GENMASK(7, 4)@@ -177,6 +175,11 @@ enum AWCC_THERMAL_TABLES { AWCC_THERMAL_TABLE_USTT = 0xA, }; +enum AWCC_SPECIAL_THERMAL_CODES { +AWCC_SPECIAL_PROFILE_CUSTOM =0x00 , +AWCC_SPECIAL_PROFILE_GMODE =0xAB , +}; +enum awcc_thermal_profile {AWCC_PROFILE_USTT_BALANCED ,AWCC_PROFILE_USTT_BALANCED_PERFORMANCE ,@@ -589,9 +592,15 @@ static int awcc_platform_profile_get(struct device *dev,if (ret)return ret; -if (out_data ==AWCC_THERMAL_MODE_GMODE ) { +switch (out_data) { +case AWCC_SPECIAL_PROFILE_CUSTOM : + *profile =PLATFORM_PROFILE_CUSTOM ; +return 0 ; +case AWCC_SPECIAL_PROFILE_GMODE : *profile =PLATFORM_PROFILE_PERFORMANCE ;return 0 ; +default : +break ; }if (!is_awcc_thermal_profile_id (out_data))@@ -679,11 +688,17 @@ static int awcc_platform_profile_probe(void *drvdata, unsigned long *choices)if (awcc->gmode) { priv->supported_profiles[PLATFORM_PROFILE_PERFORMANCE ] = -AWCC_THERMAL_MODE_GMODE ; +AWCC_SPECIAL_PROFILE_GMODE ;__set_bit (PLATFORM_PROFILE_PERFORMANCE , choices); } +/* Every model supports the "custom" profile */ + priv->supported_profiles[PLATFORM_PROFILE_CUSTOM ] = +AWCC_SPECIAL_PROFILE_CUSTOM ; + +__set_bit (PLATFORM_PROFILE_CUSTOM , choices); +return 0 ; }
Kurt Borja
maintainerPATCH v6 7/12 platform/x86: alienware-wmi-wmax: Add HWMON support
In reply to Kurt BorjaAll models with the "AWCC" WMAX device support monitoring fan speed and temperature sensors. Expose this feature through the HWMON interface.
--- drivers/platform/x86/dell/Kconfig | 1 + drivers/platform/x86/dell/alienware-wmi-wmax.c | 396 +++++++++++++++++++++++++ 2 files changed, 397 insertions(+)
drivers/platform/x86/dell/Kconfig +1 -0
@@ -22,6 +22,7 @@ config ALIENWARE_WMI depends on DMI depends on LEDS_CLASS depends on NEW_LEDS + depends on HWMON help This is a driver for controlling Alienware WMI driven features.
drivers/platform/x86/dell/alienware-wmi-wmax.c +396 -0
491 lines not on this page · raw message
Signature · 1 line
2.48.1
Kurt Borja
maintainerPATCH v6 8/12 platform/x86: alienware-wmi-wmax: Add support for manual fan control
In reply to Kurt BorjaAll models with the "AWCC" WMAX device support a way of manually controlling fans.
The PWM duty cycle of a fan can't be controlled directly. Instead the AWCC interface let's us tune a fan boost value, which has the following empirically discovered, aproximate behavior over the PWM value:
pwm = pwm_base + (fan_boost / 255) * (pwm_max - pwm_base)
Where the pwm_base is the locked PWM value controlled by the FW and fan_boost is a value between 0 and 255.
Expose this fan_boost knob as a custom HWMON attribute.
--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 174 ++++++++++++++++++++++++- 1 file changed, 172 insertions(+), 2 deletions(-)
drivers/platform/x86/dell/alienware-wmi-wmax.c +172 -2
@@ -13,8 +13,12 @@#include <linux/bits.h> #include <linux/dmi.h> #include <linux/hwmon.h> +#include <linux/hwmon-sysfs.h> +#include <linux/kstrtox.h> +#include <linux/minmax.h> #include <linux/moduleparam.h> #include <linux/platform_profile.h> +#include <linux/pm.h> #include <linux/units.h> #include <linux/wmi.h> #include "alienware-wmi.h"
@@ -181,10 +185,12 @@ enum AWCC_THERMAL_INFORMATION_OPERATIONS {AWCC_OP_GET_FAN_MIN_RPM =0x08 ,AWCC_OP_GET_FAN_MAX_RPM =0x09 ,AWCC_OP_GET_CURRENT_PROFILE =0x0B , + AWCC_OP_GET_FAN_BOOST = 0x0C, };enum AWCC_THERMAL_CONTROL_OPERATIONS {AWCC_OP_ACTIVATE_PROFILE =0x01 , +AWCC_OP_SET_FAN_BOOST =0x02 , }; enum AWCC_GAME_SHIFT_STATUS_OPERATIONS {
@@ -248,6 +254,7 @@ struct awcc_fan_data {const char *label;u32 min_rpm;u32 max_rpm; +u8 suspend_cache;u8 id; };
@@ -628,6 +635,18 @@ static inline int awcc_op_get_temperature(struct wmi_device *wdev, u8 temp_id, ureturn __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &args, out); } +static inline int awcc_op_get_fan_boost (struct wmi_device *wdev,u8 fan_id,u32 *out) +{ +struct wmax_u32_args args = { + .operation =AWCC_OP_GET_FAN_BOOST , + .arg1 = fan_id, + .arg2 =0 , + .arg3 =0 , + }; + +return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &args, out); +} +static inline int awcc_op_get_current_profile (struct wmi_device *wdev,u32 *out) {struct wmax_u32_args args = {
@@ -653,6 +672,19 @@ static inline int awcc_op_activate_profile(struct wmi_device *wdev, u8 profile)return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_CONTROL , &args, &out); } +static inline int awcc_op_set_fan_boost (struct wmi_device *wdev,u8 fan_id,u8 boost) +{ +struct wmax_u32_args args = { + .operation =AWCC_OP_SET_FAN_BOOST , + .arg1 = fan_id, + .arg2 = boost, + .arg3 =0 , + }; +u32 out; + +return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_CONTROL , &args, &out); +} +/* * HWMON * - Provides temperature and fan speed monitoring as well as manual fan
@@ -817,6 +849,81 @@ static const struct hwmon_chip_info awcc_hwmon_chip_info = { .info = awcc_hwmon_info, }; +static ssize_t fan_boost_show (struct device *dev,struct device_attribute *attr, +char *buf) +{ +struct awcc_priv *priv =dev_get_drvdata (dev); +int index =to_sensor_dev_attr (attr)->index; +struct awcc_fan_data *fan = priv->fan_data[index]; +u32 boost; +int ret; + + ret =awcc_op_get_fan_boost (priv->wdev, fan->id, &boost); +if (ret) +return ret; + +return sysfs_emit (buf,"%u\n" , boost); +} + +static ssize_t fan_boost_store (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) +{ +struct awcc_priv *priv =dev_get_drvdata (dev); +int index =to_sensor_dev_attr (attr)->index; +struct awcc_fan_data *fan = priv->fan_data[index]; +unsigned long val; +int ret; + + ret =kstrtoul (buf,0 , &val); +if (ret) +return ret; + + ret =awcc_op_set_fan_boost (priv->wdev, fan->id,clamp_val (val,0 ,255 )); + +return ret ? ret : count; +} + +static SENSOR_DEVICE_ATTR_RW(fan1_boost, fan_boost, 0); +static SENSOR_DEVICE_ATTR_RW(fan2_boost, fan_boost, 1); +static SENSOR_DEVICE_ATTR_RW(fan3_boost, fan_boost, 2); +static SENSOR_DEVICE_ATTR_RW(fan4_boost, fan_boost, 3); +static SENSOR_DEVICE_ATTR_RW(fan5_boost, fan_boost, 4); +static SENSOR_DEVICE_ATTR_RW(fan6_boost, fan_boost, 5); + +static umode_t fan_boost_attr_visible (struct kobject *kobj,struct attribute *attr,int n) +{ +struct awcc_priv *priv =dev_get_drvdata (kobj_to_dev (kobj)); + +return n < priv->fan_count ? attr->mode :0 ; +} + +static bool fan_boost_group_visible (struct kobject *kobj) +{ +return true; +} + +DEFINE_SYSFS_GROUP_VISIBLE (fan_boost); + +static struct attribute *fan_boost_attrs[] = { + &sensor_dev_attr_fan1_boost.dev_attr.attr, + &sensor_dev_attr_fan2_boost.dev_attr.attr, + &sensor_dev_attr_fan3_boost.dev_attr.attr, + &sensor_dev_attr_fan4_boost.dev_attr.attr, + &sensor_dev_attr_fan5_boost.dev_attr.attr, + &sensor_dev_attr_fan6_boost.dev_attr.attr, +NULL +}; + +static const struct attribute_group fan_boost_group = { + .attrs = fan_boost_attrs, + .is_visible =SYSFS_GROUP_VISIBLE (fan_boost), +}; + +static const struct attribute_group *awcc_hwmon_groups[] = { + &fan_boost_group, +NULL +}; +static int awcc_hwmon_temps_init (struct wmi_device *wdev) {struct awcc_priv *priv =dev_get_drvdata (&wdev->dev);
@@ -954,12 +1061,56 @@ static int awcc_hwmon_init(struct wmi_device *wdev)if (ret)return ret; - priv->hwdev =devm_hwmon_device_register_with_info (&wdev->dev,"alienware_wmi" , priv, - &awcc_hwmon_chip_info,NULL ); + priv->hwdev =devm_hwmon_device_register_with_info (&wdev->dev,"alienware_wmi" , + priv, &awcc_hwmon_chip_info, + awcc_hwmon_groups);return PTR_ERR_OR_ZERO (priv->hwdev); } +static void awcc_hwmon_suspend (struct device *dev) +{ +struct awcc_priv *priv =dev_get_drvdata (dev); +struct awcc_fan_data *fan; +unsigned int i; +u32 boost; +int ret; + +for (i =0 ; i < priv->fan_count; i++) { + fan = priv->fan_data[i]; + + ret =awcc_thermal_information (priv->wdev,AWCC_OP_GET_FAN_BOOST , + fan->id, &boost); +if (ret) +dev_err (dev,"Failed to store Fan %u boost while suspending\n" , i); + + fan->suspend_cache = ret ?0 :clamp_val (boost,0 ,255 ); + +awcc_op_set_fan_boost (priv->wdev, fan->id,0 ); +if (ret) +dev_err (dev,"Failed to set Fan %u boost to 0 while suspending\n" , i); + } +} + +static void awcc_hwmon_resume (struct device *dev) +{ +struct awcc_priv *priv =dev_get_drvdata (dev); +struct awcc_fan_data *fan; +unsigned int i; +int ret; + +for (i =0 ; i < priv->fan_count; i++) { + fan = priv->fan_data[i]; + +if (!fan->suspend_cache) +continue ; + + ret =awcc_op_set_fan_boost (priv->wdev, fan->id, fan->suspend_cache); +if (ret) +dev_err (dev,"Failed to restore Fan %u boost while resuming\n" , i); + } +} +/* * Thermal Profile control * - Provides thermal profile control through the Platform Profile API
@@ -1189,6 +1340,24 @@ static int wmax_wmi_probe(struct wmi_device *wdev, const void *context)return ret; } +static int wmax_wmi_suspend (struct device *dev) +{ +if (awcc->hwmon) +awcc_hwmon_suspend (dev); + +return 0 ; +} + +static int wmax_wmi_resume (struct device *dev) +{ +if (awcc->hwmon) +awcc_hwmon_resume (dev); + +return 0 ; +} + +static DEFINE_SIMPLE_DEV_PM_OPS(wmax_wmi_pm_ops, wmax_wmi_suspend, wmax_wmi_resume); +static const struct wmi_device_id alienware_wmax_device_id_table[] = { {WMAX_CONTROL_GUID ,NULL }, { },
@@ -1199,6 +1368,7 @@ static struct wmi_driver alienware_wmax_wmi_driver = { .driver = { .name = "alienware-wmi-wmax", .probe_type = PROBE_PREFER_ASYNCHRONOUS, + .pm = pm_sleep_ptr(&wmax_wmi_pm_ops), }, .id_table = alienware_wmax_device_id_table, .probe = wmax_wmi_probe,
Signature · 1 line
2.48.1
Ilpo Järvinen
maintainerRe: [PATCH v6 08/12] platform/x86: alienware-wmi-wmax: Add support for manual fan control
Quoted 6 lines · Kurt Borja
All models with the "AWCC" WMAX device support a way of manually controlling fans.
The PWM duty cycle of a fan can't be controlled directly. Instead the AWCC interface let's us tune a fan
boostvalue, which has the following empirically discovered, aproximate behavior over the PWM
approximate
Quoted 271 lines
value:
pwm = pwm_base + (fan_boost / 255) * (pwm_max - pwm_base)Where the
pwm_baseis the locked PWM value controlled by the FW andfan_boostis a value between 0 and 255.Expose this
fan_boostknob as a custom HWMON attribute.Cc Guenter Roeck <[email protected]>Cc Jean Delvare <[email protected]>Reviewed-by Armin Wolf <[email protected]>Signed-off-by Kurt Borja <[email protected]>--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 174 ++++++++++++++++++++++++- 1 file changed, 172 insertions(+), 2 deletions(-)drivers/platform/x86/dell/alienware-wmi-wmax.c +172
-2@@ -13,8 +13,12 @@#include <linux/bits.h> #include <linux/dmi.h> #include <linux/hwmon.h> +#include <linux/hwmon-sysfs.h> +#include <linux/kstrtox.h> +#include <linux/minmax.h> #include <linux/moduleparam.h> #include <linux/platform_profile.h> +#include <linux/pm.h> #include <linux/units.h> #include <linux/wmi.h> #include "alienware-wmi.h" @@ -181,10 +185,12 @@ enum AWCC_THERMAL_INFORMATION_OPERATIONS {AWCC_OP_GET_FAN_MIN_RPM =0x08 ,AWCC_OP_GET_FAN_MAX_RPM =0x09 ,AWCC_OP_GET_CURRENT_PROFILE =0x0B , + AWCC_OP_GET_FAN_BOOST = 0x0C, };enum AWCC_THERMAL_CONTROL_OPERATIONS {AWCC_OP_ACTIVATE_PROFILE =0x01 , +AWCC_OP_SET_FAN_BOOST =0x02 , }; enum AWCC_GAME_SHIFT_STATUS_OPERATIONS {@@ -248,6 +254,7 @@ struct awcc_fan_data {const char *label;u32 min_rpm;u32 max_rpm; +u8 suspend_cache;u8 id; };@@ -628,6 +635,18 @@ static inline int awcc_op_get_temperature(struct wmi_device *wdev, u8 temp_id, ureturn __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &args, out); } +static inline int awcc_op_get_fan_boost (struct wmi_device *wdev,u8 fan_id,u32 *out) +{ +struct wmax_u32_args args = { + .operation =AWCC_OP_GET_FAN_BOOST , + .arg1 = fan_id, + .arg2 =0 , + .arg3 =0 , + }; + +return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_INFORMATION , &args, out); +} +static inline int awcc_op_get_current_profile (struct wmi_device *wdev,u32 *out) {struct wmax_u32_args args = {@@ -653,6 +672,19 @@ static inline int awcc_op_activate_profile(struct wmi_device *wdev, u8 profile)return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_CONTROL , &args, &out); } +static inline int awcc_op_set_fan_boost (struct wmi_device *wdev,u8 fan_id,u8 boost) +{ +struct wmax_u32_args args = { + .operation =AWCC_OP_SET_FAN_BOOST , + .arg1 = fan_id, + .arg2 = boost, + .arg3 =0 , + }; +u32 out; + +return __awcc_wmi_command (wdev,AWCC_METHOD_THERMAL_CONTROL , &args, &out); +} +/* * HWMON * - Provides temperature and fan speed monitoring as well as manual fan @@ -817,6 +849,81 @@ static const struct hwmon_chip_info awcc_hwmon_chip_info = { .info = awcc_hwmon_info, }; +static ssize_t fan_boost_show (struct device *dev,struct device_attribute *attr, +char *buf) +{ +struct awcc_priv *priv =dev_get_drvdata (dev); +int index =to_sensor_dev_attr (attr)->index; +struct awcc_fan_data *fan = priv->fan_data[index]; +u32 boost; +int ret; + + ret =awcc_op_get_fan_boost (priv->wdev, fan->id, &boost); +if (ret) +return ret; + +return sysfs_emit (buf,"%u\n" , boost); +} + +static ssize_t fan_boost_store (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) +{ +struct awcc_priv *priv =dev_get_drvdata (dev); +int index =to_sensor_dev_attr (attr)->index; +struct awcc_fan_data *fan = priv->fan_data[index]; +unsigned long val; +int ret; + + ret =kstrtoul (buf,0 , &val); +if (ret) +return ret; + + ret =awcc_op_set_fan_boost (priv->wdev, fan->id,clamp_val (val,0 ,255 )); + +return ret ? ret : count; +} + +static SENSOR_DEVICE_ATTR_RW(fan1_boost, fan_boost, 0); +static SENSOR_DEVICE_ATTR_RW(fan2_boost, fan_boost, 1); +static SENSOR_DEVICE_ATTR_RW(fan3_boost, fan_boost, 2); +static SENSOR_DEVICE_ATTR_RW(fan4_boost, fan_boost, 3); +static SENSOR_DEVICE_ATTR_RW(fan5_boost, fan_boost, 4); +static SENSOR_DEVICE_ATTR_RW(fan6_boost, fan_boost, 5); + +static umode_t fan_boost_attr_visible (struct kobject *kobj,struct attribute *attr,int n) +{ +struct awcc_priv *priv =dev_get_drvdata (kobj_to_dev (kobj)); + +return n < priv->fan_count ? attr->mode :0 ; +} + +static bool fan_boost_group_visible (struct kobject *kobj) +{ +return true; +} + +DEFINE_SYSFS_GROUP_VISIBLE (fan_boost); + +static struct attribute *fan_boost_attrs[] = { + &sensor_dev_attr_fan1_boost.dev_attr.attr, + &sensor_dev_attr_fan2_boost.dev_attr.attr, + &sensor_dev_attr_fan3_boost.dev_attr.attr, + &sensor_dev_attr_fan4_boost.dev_attr.attr, + &sensor_dev_attr_fan5_boost.dev_attr.attr, + &sensor_dev_attr_fan6_boost.dev_attr.attr, +NULL +}; + +static const struct attribute_group fan_boost_group = { + .attrs = fan_boost_attrs, + .is_visible =SYSFS_GROUP_VISIBLE (fan_boost), +}; + +static const struct attribute_group *awcc_hwmon_groups[] = { + &fan_boost_group, +NULL +}; +static int awcc_hwmon_temps_init (struct wmi_device *wdev) {struct awcc_priv *priv =dev_get_drvdata (&wdev->dev);@@ -954,12 +1061,56 @@ static int awcc_hwmon_init(struct wmi_device *wdev)if (ret)return ret; - priv->hwdev =devm_hwmon_device_register_with_info (&wdev->dev,"alienware_wmi" , priv, - &awcc_hwmon_chip_info,NULL ); + priv->hwdev =devm_hwmon_device_register_with_info (&wdev->dev,"alienware_wmi" , + priv, &awcc_hwmon_chip_info, + awcc_hwmon_groups);return PTR_ERR_OR_ZERO (priv->hwdev); } +static void awcc_hwmon_suspend (struct device *dev) +{ +struct awcc_priv *priv =dev_get_drvdata (dev); +struct awcc_fan_data *fan; +unsigned int i; +u32 boost; +int ret; + +for (i =0 ; i < priv->fan_count; i++) { + fan = priv->fan_data[i]; + + ret =awcc_thermal_information (priv->wdev,AWCC_OP_GET_FAN_BOOST , + fan->id, &boost); +if (ret) +dev_err (dev,"Failed to store Fan %u boost while suspending\n" , i); + + fan->suspend_cache = ret ?0 :clamp_val (boost,0 ,255 ); + +awcc_op_set_fan_boost (priv->wdev, fan->id,0 ); +if (ret) +dev_err (dev,"Failed to set Fan %u boost to 0 while suspending\n" , i); + } +} + +static void awcc_hwmon_resume (struct device *dev) +{ +struct awcc_priv *priv =dev_get_drvdata (dev); +struct awcc_fan_data *fan; +unsigned int i; +int ret; + +for (i =0 ; i < priv->fan_count; i++) { + fan = priv->fan_data[i]; + +if (!fan->suspend_cache) +continue ; + + ret =awcc_op_set_fan_boost (priv->wdev, fan->id, fan->suspend_cache); +if (ret) +dev_err (dev,"Failed to restore Fan %u boost while resuming\n" , i); + } +} +/* * Thermal Profile control * - Provides thermal profile control through the Platform Profile API @@ -1189,6 +1340,24 @@ static int wmax_wmi_probe(struct wmi_device *wdev, const void *context)return ret; } +static int wmax_wmi_suspend (struct device *dev) +{ +if (awcc->hwmon) +awcc_hwmon_suspend (dev); + +return 0 ; +} + +static int wmax_wmi_resume (struct device *dev) +{ +if (awcc->hwmon) +awcc_hwmon_resume (dev); + +return 0 ; +} + +static DEFINE_SIMPLE_DEV_PM_OPS(wmax_wmi_pm_ops, wmax_wmi_suspend, wmax_wmi_resume); +static const struct wmi_device_id alienware_wmax_device_id_table[] = { {WMAX_CONTROL_GUID ,NULL }, { },@@ -1199,6 +1368,7 @@ static struct wmi_driver alienware_wmax_wmi_driver = { .driver = { .name = "alienware-wmi-wmax", .probe_type = PROBE_PREFER_ASYNCHRONOUS, + .pm = pm_sleep_ptr(&wmax_wmi_pm_ops), }, .id_table = alienware_wmax_device_id_table, .probe = wmax_wmi_probe,
Signature · 1 line
i.
Kurt Borja
maintainerPATCH v6 9/12 platform/x86: alienware-wmi-wmax: Add a DebugFS interface
In reply to Kurt BorjaAdd a debugfs interface which exposes thermal private data.
--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 90 ++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)
drivers/platform/x86/dell/alienware-wmi-wmax.c +90 -0
@@ -11,6 +11,7 @@#include <linux/bitfield.h> #include <linux/bitmap.h> #include <linux/bits.h> +#include <linux/debugfs.h> #include <linux/dmi.h> #include <linux/hwmon.h> #include <linux/hwmon-sysfs.h>
@@ -19,6 +20,7 @@#include <linux/moduleparam.h> #include <linux/platform_profile.h> #include <linux/pm.h> +#include <linux/seq_file.h> #include <linux/units.h> #include <linux/wmi.h> #include "alienware-wmi.h"
@@ -1252,6 +1254,92 @@ static int awcc_platform_profile_init(struct wmi_device *wdev)return PTR_ERR_OR_ZERO (priv->ppdev); } +/* +* DebugFS +*/ +static int awcc_debugfs_system_description_read (struct seq_file *seq,void *data) +{ +struct device *dev = seq->private; +struct awcc_priv *priv =dev_get_drvdata (dev); + +seq_printf (seq,"0x%08x\n" , priv->system_description); + +return 0 ; +} + +static int awcc_debugfs_hwmon_data_read (struct seq_file *seq,void *data) +{ +struct device *dev = seq->private; +struct awcc_priv *priv =dev_get_drvdata (dev); +const struct awcc_fan_data *fan; +unsigned int bit; + +seq_printf (seq,"Number of fans: %u\n" , priv->fan_count); +seq_printf (seq,"Number of temperature sensors: %u\n\n" , priv->temp_count); + +for (u32 i =0 ; i < priv->fan_count; i++) { + fan = priv->fan_data[i]; + +seq_printf (seq,"Fan %u:\n" , i); +seq_printf (seq," ID: 0x%02x\n" , fan->id); +seq_printf (seq," Related temperature sensors bitmap: %lu\n" , + fan->auto_channels_temp); + } + +seq_puts (seq,"\nTemperature sensor IDs:\n" ); +for_each_set_bit (bit, priv->temp_sensors,AWCC_ID_BITMAP_SIZE ) +seq_printf (seq," 0x%02x\n" , bit); + +return 0 ; +} + +static int awcc_debugfs_pprof_data_read (struct seq_file *seq,void *data) +{ +struct device *dev = seq->private; +struct awcc_priv *priv =dev_get_drvdata (dev); + +seq_printf (seq,"Number of thermal profiles: %u\n\n" , priv->profile_count); + +for (u32 i =0 ; i <PLATFORM_PROFILE_LAST ; i++) { +if (!priv->supported_profiles[i]) +continue ; + +seq_printf (seq,"Platform profile %u:\n" , i); +seq_printf (seq," ID: 0x%02x\n" , priv->supported_profiles[i]); + } + +return 0 ; +} + +static void awcc_debugfs_remove (void *data) +{ +struct dentry *root = data; + +debugfs_remove (root); +} + +static void awcc_debugfs_init (struct wmi_device *wdev) +{ +struct dentry *root; +char name[64 ]; + +scnprintf (name,ARRAY_SIZE (name),"%s-%s" ,"alienware-wmi" ,dev_name (&wdev->dev)); + root =debugfs_create_dir (name,NULL ); + +debugfs_create_devm_seqfile (&wdev->dev,"system_description" , root, + awcc_debugfs_system_description_read); + +if (awcc->hwmon) +debugfs_create_devm_seqfile (&wdev->dev,"hwmon_data" , root, + awcc_debugfs_hwmon_data_read); + +if (awcc->pprof) +debugfs_create_devm_seqfile (&wdev->dev,"pprof_data" , root, + awcc_debugfs_pprof_data_read); + +devm_add_action_or_reset (&wdev->dev, awcc_debugfs_remove, root); +} +static int alienware_awcc_setup (struct wmi_device *wdev) {struct awcc_priv *priv;
@@ -1290,6 +1378,8 @@ static int alienware_awcc_setup(struct wmi_device *wdev)return ret; } +awcc_debugfs_init (wdev); +return 0 ; }
Signature · 1 line
2.48.1
Ilpo Järvinen
maintainerRe: [PATCH v6 09/12] platform/x86: alienware-wmi-wmax: Add a DebugFS interface
Quoted 92 lines · Kurt Borja
Add a debugfs interface which exposes thermal private data.
Reviewed-by Armin Wolf <[email protected]>Signed-off-by Kurt Borja <[email protected]>--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 90 ++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)drivers/platform/x86/dell/alienware-wmi-wmax.c +62
-0@@ -11,6 +11,7 @@#include <linux/bitfield.h> #include <linux/bitmap.h> #include <linux/bits.h> +#include <linux/debugfs.h> #include <linux/dmi.h> #include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> @@ -19,6 +20,7 @@#include <linux/moduleparam.h> #include <linux/platform_profile.h> #include <linux/pm.h> +#include <linux/seq_file.h> #include <linux/units.h> #include <linux/wmi.h> #include "alienware-wmi.h" @@ -1252,6 +1254,92 @@ static int awcc_platform_profile_init(struct wmi_device *wdev)return PTR_ERR_OR_ZERO (priv->ppdev); } +/* +* DebugFS +*/ +static int awcc_debugfs_system_description_read (struct seq_file *seq,void *data) +{ +struct device *dev = seq->private; +struct awcc_priv *priv =dev_get_drvdata (dev); + +seq_printf (seq,"0x%08x\n" , priv->system_description); + +return 0 ; +} + +static int awcc_debugfs_hwmon_data_read (struct seq_file *seq,void *data) +{ +struct device *dev = seq->private; +struct awcc_priv *priv =dev_get_drvdata (dev); +const struct awcc_fan_data *fan; +unsigned int bit; + +seq_printf (seq,"Number of fans: %u\n" , priv->fan_count); +seq_printf (seq,"Number of temperature sensors: %u\n\n" , priv->temp_count); + +for (u32 i =0 ; i < priv->fan_count; i++) { + fan = priv->fan_data[i]; + +seq_printf (seq,"Fan %u:\n" , i); +seq_printf (seq," ID: 0x%02x\n" , fan->id); +seq_printf (seq," Related temperature sensors bitmap: %lu\n" , + fan->auto_channels_temp); + } + +seq_puts (seq,"\nTemperature sensor IDs:\n" ); +for_each_set_bit (bit, priv->temp_sensors,AWCC_ID_BITMAP_SIZE ) +seq_printf (seq," 0x%02x\n" , bit); + +return 0 ; +} + +static int awcc_debugfs_pprof_data_read (struct seq_file *seq,void *data) +{ +struct device *dev = seq->private; +struct awcc_priv *priv =dev_get_drvdata (dev); + +seq_printf (seq,"Number of thermal profiles: %u\n\n" , priv->profile_count); + +for (u32 i =0 ; i <PLATFORM_PROFILE_LAST ; i++) { +if (!priv->supported_profiles[i]) +continue ; + +seq_printf (seq,"Platform profile %u:\n" , i); +seq_printf (seq," ID: 0x%02x\n" , priv->supported_profiles[i]); + } + +return 0 ; +} + +static void awcc_debugfs_remove (void *data) +{ +struct dentry *root = data;
drivers/platform/x86/dell/alienware-wmi-wmax.c static int awcc_platform_profile_init(struct wmi_device *wdev) · line 1326
Quoted 10 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +10
-0+ +debugfs_remove (root); +} + +static void awcc_debugfs_init (struct wmi_device *wdev) +{ +struct dentry *root; +char name[64 ]; + +scnprintf (name,ARRAY_SIZE (name),"%s-%s" ,"alienware-wmi" ,dev_name (&wdev->dev));
You'd need to add include for ARRAY_SIZE() but can't you just use sizeof()?
Quoted 30 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +18
-0+ root =debugfs_create_dir (name,NULL ); + +debugfs_create_devm_seqfile (&wdev->dev,"system_description" , root, + awcc_debugfs_system_description_read); + +if (awcc->hwmon) +debugfs_create_devm_seqfile (&wdev->dev,"hwmon_data" , root, + awcc_debugfs_hwmon_data_read); + +if (awcc->pprof) +debugfs_create_devm_seqfile (&wdev->dev,"pprof_data" , root, + awcc_debugfs_pprof_data_read); + +devm_add_action_or_reset (&wdev->dev, awcc_debugfs_remove, root); +} +static int alienware_awcc_setup (struct wmi_device *wdev) {struct awcc_priv *priv;@@ -1290,6 +1378,8 @@ static int alienware_awcc_setup(struct wmi_device *wdev)return ret; } +awcc_debugfs_init (wdev); +return 0 ; }
Signature · 1 line
i.
Kurt Borja
maintainerRe: [PATCH v6 09/12] platform/x86: alienware-wmi-wmax: Add a DebugFS interface
Quoted 99 lines · Ilpo Järvinen
Quoted 97 lines · Kurt Borja
Add a debugfs interface which exposes thermal private data.
Reviewed-by Armin Wolf <[email protected]>Signed-off-by Kurt Borja <[email protected]>--- drivers/platform/x86/dell/alienware-wmi-wmax.c | 90 ++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)drivers/platform/x86/dell/alienware-wmi-wmax.c +67
-0@@ -11,6 +11,7 @@#include <linux/bitfield.h> #include <linux/bitmap.h> #include <linux/bits.h> +#include <linux/debugfs.h> #include <linux/dmi.h> #include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> @@ -19,6 +20,7 @@#include <linux/moduleparam.h> #include <linux/platform_profile.h> #include <linux/pm.h> +#include <linux/seq_file.h> #include <linux/units.h> #include <linux/wmi.h> #include "alienware-wmi.h" @@ -1252,6 +1254,92 @@ static int awcc_platform_profile_init(struct wmi_device *wdev)return PTR_ERR_OR_ZERO (priv->ppdev); } +/* +* DebugFS +*/ +static int awcc_debugfs_system_description_read (struct seq_file *seq,void *data) +{ +struct device *dev = seq->private; +struct awcc_priv *priv =dev_get_drvdata (dev); + +seq_printf (seq,"0x%08x\n" , priv->system_description); + +return 0 ; +} + +static int awcc_debugfs_hwmon_data_read (struct seq_file *seq,void *data) +{ +struct device *dev = seq->private; +struct awcc_priv *priv =dev_get_drvdata (dev); +const struct awcc_fan_data *fan; +unsigned int bit; + +seq_printf (seq,"Number of fans: %u\n" , priv->fan_count); +seq_printf (seq,"Number of temperature sensors: %u\n\n" , priv->temp_count); + +for (u32 i =0 ; i < priv->fan_count; i++) { + fan = priv->fan_data[i]; + +seq_printf (seq,"Fan %u:\n" , i); +seq_printf (seq," ID: 0x%02x\n" , fan->id); +seq_printf (seq," Related temperature sensors bitmap: %lu\n" , + fan->auto_channels_temp); + } + +seq_puts (seq,"\nTemperature sensor IDs:\n" ); +for_each_set_bit (bit, priv->temp_sensors,AWCC_ID_BITMAP_SIZE ) +seq_printf (seq," 0x%02x\n" , bit); + +return 0 ; +} + +static int awcc_debugfs_pprof_data_read (struct seq_file *seq,void *data) +{ +struct device *dev = seq->private; +struct awcc_priv *priv =dev_get_drvdata (dev); + +seq_printf (seq,"Number of thermal profiles: %u\n\n" , priv->profile_count); + +for (u32 i =0 ; i <PLATFORM_PROFILE_LAST ; i++) { +if (!priv->supported_profiles[i]) +continue ; + +seq_printf (seq,"Platform profile %u:\n" , i); +seq_printf (seq," ID: 0x%02x\n" , priv->supported_profiles[i]); + } + +return 0 ; +} + +static void awcc_debugfs_remove (void *data) +{ +struct dentry *root = data; + +debugfs_remove (root); +} + +static void awcc_debugfs_init (struct wmi_device *wdev)
Quoted 8 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c static int awcc_platform_profile_init(struct wmi_device *wdev) · line 1326
Quoted 5 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +5
-0+{ +struct dentry *root; +char name[64 ]; + +scnprintf (name,ARRAY_SIZE (name),"%s-%s" ,"alienware-wmi" ,dev_name (&wdev->dev));You'd need to add include for
ARRAY_SIZE()but can't you just usesizeof()?
Sure, it's 1 byte anyway. Though I think I use ARRAY_SIZE somewhere else so I'll add the include too.
Thank you so much for your feedback! I'll send v7 this weekend.
Signature · 1 line
~ Kurt
Quoted 31 lines
Quoted 31 lines
drivers/platform/x86/dell/alienware-wmi-wmax.c +18
-0+ root =debugfs_create_dir (name,NULL ); + +debugfs_create_devm_seqfile (&wdev->dev,"system_description" , root, + awcc_debugfs_system_description_read); + +if (awcc->hwmon) +debugfs_create_devm_seqfile (&wdev->dev,"hwmon_data" , root, + awcc_debugfs_hwmon_data_read); + +if (awcc->pprof) +debugfs_create_devm_seqfile (&wdev->dev,"pprof_data" , root, + awcc_debugfs_pprof_data_read); + +devm_add_action_or_reset (&wdev->dev, awcc_debugfs_remove, root); +} +static int alienware_awcc_setup (struct wmi_device *wdev) {struct awcc_priv *priv;@@ -1290,6 +1378,8 @@ static int alienware_awcc_setup(struct wmi_device *wdev)return ret; } +awcc_debugfs_init (wdev); +return 0 ; }
Kurt Borja
maintainerPATCH v6 10/12 Documentation: wmi: Improve and update alienware-wmi documentation
In reply to Kurt BorjaUse tables to describe method operations instead of using pseudo-code. Drop unknown method descriptions to avoid redundancy. Drop GPIO section as it is currently irrelevant to this driver. Update Thermal_Information method documentation. Add one more helpful developer to the kudos section.
--- Documentation/wmi/devices/alienware-wmi.rst | 383 +++++++++------------------- 1 file changed, 117 insertions(+), 266 deletions(-)
Documentation/wmi/devices/alienware-wmi.rst +117 -266
@@ -11,7 +11,7 @@ The WMI device WMAX has been implemented for many Alienware and Dell's G-Series models. Throughout these models, two implementations have been identified. The first one, used by older systems, deals with HDMI, brightness, RGB, amplifier and deep sleep control. The second one used by newer systems deals primarily -with thermal, overclocking, and GPIO control. +with thermal control and overclocking. It is suspected that the latter is used by Alienware Command Center (AWCC) to manage manufacturer predefined thermal profiles. The alienware-wmi driver
@@ -69,9 +69,6 @@ data using the `bmfdec <https://github.com/pali/bmfdec>`_ utility: [WmiMethodId(164), Implemented, read, write, Description("Tobii Camera Power Off.")] void TobiiCameraPowerOff([out] uint32 argr); }; -Some of these methods get quite intricate so we will describe them using -pseudo-code that vaguely resembles the original ASL code. - Methods not described in the following document have unknown behavior. Argument Structure
@@ -87,175 +84,133 @@ ID 0xA0, the argument you would pass to the method is 0xA001. Thermal Methods =============== +WMI method GetFanSensors([in] uint32 arg2, [out] uint32 argr) +------------------------------------------------------------- + ++--------------------+------------------------------------+--------------------+ +| Operation (Byte 0) | Description | Arguments | ++====================+====================================+====================+ +| 0x01 | Get the number of temperature | - Byte 1: Fan ID | +| | sensors related with a fan ID | | ++--------------------+------------------------------------+--------------------+ +| 0x02 | Get the temperature sensor IDs | - Byte 1: Fan ID | +| | related to a fan sensor ID | - Byte 2: Index | ++--------------------+------------------------------------+--------------------+ + WMI method Thermal_Information([in] uint32 arg2, [out] uint32 argr) ------------------------------------------------------------------- -:: - - if BYTE_0(arg2) == 0x01: - argr = 1 - - if BYTE_0(arg2) == 0x02: - argr = SYSTEM_DESCRIPTION - - if BYTE_0(arg2) == 0x03: - if BYTE_1(arg2) == 0x00: - argr = FAN_ID_0 - - if BYTE_1(arg2) == 0x01: - argr = FAN_ID_1 - - if BYTE_1(arg2) == 0x02: - argr = FAN_ID_2 - - if BYTE_1(arg2) == 0x03: - argr = FAN_ID_3 - - if BYTE_1(arg2) == 0x04: - argr = SENSOR_ID_CPU | 0x0100 - - if BYTE_1(arg2) == 0x05: - argr = SENSOR_ID_GPU | 0x0100 - - if BYTE_1(arg2) == 0x06: - argr = THERMAL_MODE_QUIET_ID - - if BYTE_1(arg2) == 0x07: - argr = THERMAL_MODE_BALANCED_ID - - if BYTE_1(arg2) == 0x08: - argr = THERMAL_MODE_BALANCED_PERFORMANCE_ID - - if BYTE_1(arg2) == 0x09: - argr = THERMAL_MODE_PERFORMANCE_ID - - if BYTE_1(arg2) == 0x0A: - argr = THERMAL_MODE_LOW_POWER_ID - - if BYTE_1(arg2) == 0x0B: - argr = THERMAL_MODE_GMODE_ID - - else: - argr = 0xFFFFFFFF - - if BYTE_0(arg2) == 0x04: - if is_valid_sensor(BYTE_1(arg2)): - argr = SENSOR_TEMP_C - else: - argr = 0xFFFFFFFF - - if BYTE_0(arg2) == 0x05: - if is_valid_fan(BYTE_1(arg2)): - argr = FAN_RPM() - - if BYTE_0(arg2) == 0x06: - skip - - if BYTE_0(arg2) == 0x07: - argr = 0 - - If BYTE_0(arg2) == 0x08: - if is_valid_fan(BYTE_1(arg2)): - argr = 0 - else: - argr = 0xFFFFFFFF - - if BYTE_0(arg2) == 0x09: - if is_valid_fan(BYTE_1(arg2)): - argr = FAN_UNKNOWN_STAT_0() - - else: - argr = 0xFFFFFFFF - - if BYTE_0(arg2) == 0x0A: - argr = THERMAL_MODE_BALANCED_ID - - if BYTE_0(arg2) == 0x0B: - argr = CURRENT_THERMAL_MODE() - - if BYTE_0(arg2) == 0x0C: - if is_valid_fan(BYTE_1(arg2)): - argr = FAN_UNKNOWN_STAT_1() - else: - argr = 0xFFFFFFFF - -Operation 0x02 returns a *system description* buffer with the following -structure: - -:: - - out[0] -> Number of fans - out[1] -> Number of sensors - out[2] -> 0x00 - out[3] -> Number of thermal modes - -Operation 0x03 list all available fan IDs, sensor IDs and thermal profile -codes in order, but different models may have different number of fans and -thermal profiles. These are the known ranges: - -* Fan IDs: from 2 up to 4 -* Sensor IDs: 2 -* Thermal profile codes: from 1 up to 7 - -In total BYTE_1(ARG2) may range from 0x5 up to 0xD depending on the model. ++--------------------+------------------------------------+--------------------+ +| Operation (Byte 0) | Description | Arguments | ++====================+====================================+====================+ +| 0x01 | Unknown. | - None | ++--------------------+------------------------------------+--------------------+ +| 0x02 | Get system description number with | - None | +| | the following structure: | | +| | | | +| | - Byte 0: Number of fans | | +| | - Byte 1: Number of temperature | | +| | sensors | | +| | - Byte 2: Unknown | | +| | - Byte 3: Number of thermal | | +| | profiles | | ++--------------------+------------------------------------+--------------------+ +| 0x03 | List an ID or resource at a given | - Byte 1: Index | +| | index. Fan IDs, temperature IDs, | | +| | unknown IDs and thermal profile | | +| | IDs are listed in that exact | | +| | order. | | +| | | | +| | Operation 0x02 is used to know | | +| | which indexes map to which | | +| | resources. | | +| | | | +| | **Returns:** ID at a given index | | ++--------------------+------------------------------------+--------------------+ +| 0x04 | Get the current temperature for a | - Byte 1: Sensor | +| | given temperature sensor. | ID | ++--------------------+------------------------------------+--------------------+ +| 0x05 | Get the current RPM for a given | - Byte 1: Fan ID | +| | fan. | | ++--------------------+------------------------------------+--------------------+ +| 0x06 | Get fan speed percentage. (not | - Byte 1: Fan ID | +| | implemented in every model) | | ++--------------------+------------------------------------+--------------------+ +| 0x07 | Unknown. | - Unknown | ++--------------------+------------------------------------+--------------------+ +| 0x08 | Get minimum RPM for a given FAN | - Byte 1: Fan ID | +| | ID. | | ++--------------------+------------------------------------+--------------------+ +| 0x09 | Get maximum RPM for a given FAN | - Byte 1: Fan ID | +| | ID. | | ++--------------------+------------------------------------+--------------------+ +| 0x0A | Get balanced thermal profile ID. | - None | ++--------------------+------------------------------------+--------------------+ +| 0x0B | Get current thermal profile ID. | - None | ++--------------------+------------------------------------+--------------------+ +| 0x0C | Get current `boost` value for a | - Byte 1: Fan ID | +| | given fan ID. | | ++--------------------+------------------------------------+--------------------+ WMI method Thermal_Control([in] uint32 arg2, [out] uint32 argr) --------------------------------------------------------------- -:: - - if BYTE_0(arg2) == 0x01: - if is_valid_thermal_profile(BYTE_1(arg2)): - SET_THERMAL_PROFILE(BYTE_1(arg2)) - argr = 0 - - if BYTE_0(arg2) == 0x02: - if is_valid_fan(BYTE_1(arg2)): - SET_FAN_SPEED_MULTIPLIER(BYTE_2(arg2)) - argr = 0 - else: - argr = 0xFFFFFFFF - -.. note:: - While you can manually change the fan speed multiplier with this method, - Dell's BIOS tends to overwrite this changes anyway. ++--------------------+------------------------------------+--------------------+ +| Operation (Byte 0) | Description | Arguments | ++====================+====================================+====================+ +| 0x01 | Activate a given thermal profile. | - Byte 1: Thermal | +| | | profile ID | ++--------------------+------------------------------------+--------------------+ +| 0x02 | Set a `boost` value for a given | - Byte 1: Fan ID | +| | fan ID. | - Byte 2: Boost | ++--------------------+------------------------------------+--------------------+ These are the known thermal profile codes: -:: ++------------------------------+----------+------+ +| Thermal Profile | Type | ID | ++==============================+==========+======+ +| Custom | Special | 0x00 | ++------------------------------+----------+------+ +| G-Mode | Special | 0xAB | ++------------------------------+----------+------+ +| Quiet | Legacy | 0x96 | ++------------------------------+----------+------+ +| Balanced | Legacy | 0x97 | ++------------------------------+----------+------+ +| Balanced Performance | Legacy | 0x98 | ++------------------------------+----------+------+ +| Performance | Legacy | 0x99 | ++------------------------------+----------+------+ +| Balanced | USTT | 0xA0 | ++------------------------------+----------+------+ +| Balanced Performance | USTT | 0xA1 | ++------------------------------+----------+------+ +| Cool | USTT | 0xA2 | ++------------------------------+----------+------+ +| Quiet | USTT | 0xA3 | ++------------------------------+----------+------+ +| Performance | USTT | 0xA4 | ++------------------------------+----------+------+ +| Low Power | USTT | 0xA5 | ++------------------------------+----------+------+ - CUSTOM 0x00 +If a model supports the User Selectable Thermal Tables (USTT) profiles, it will +not support the Legacy profiles and vice-versa. - BALANCED_USTT 0xA0 - BALANCED_PERFORMANCE_USTT 0xA1 - COOL_USTT 0xA2 - QUIET_USTT 0xA3 - PERFORMANCE_USTT 0xA4 - LOW_POWER_USTT 0xA5 - - QUIET 0x96 - BALANCED 0x97 - BALANCED_PERFORMANCE 0x98 - PERFORMANCE 0x99 - - GMODE 0xAB - -Usually if a model doesn't support the first four profiles they will support -the User Selectable Thermal Tables (USTT) profiles and vice-versa. - -GMODE replaces PERFORMANCE in G-Series laptops. +Every model supports the CUSTOM (0x00) thermal profile. GMODE replaces +PERFORMANCE in G-Series laptops. WMI method GameShiftStatus([in] uint32 arg2, [out] uint32 argr) --------------------------------------------------------------- -:: - - if BYTE_0(arg2) == 0x1: - TOGGLE_GAME_SHIFT() - argr = GET_GAME_SHIFT_STATUS() - - if BYTE_0(arg2) == 0x2: - argr = GET_GAME_SHIFT_STATUS() ++--------------------+------------------------------------+--------------------+ +| Operation (Byte 0) | Description | Arguments | ++====================+====================================+====================+ +| 0x01 | Toggle *Game Shift*. | - None | ++--------------------+------------------------------------+--------------------+ +| 0x02 | Get *Game Shift* status. | - None | ++--------------------+------------------------------------+--------------------+ Game Shift Status does not change the fan speed profile but it could be some sort of CPU/GPU power profile. Benchmarks have not been done.
@@ -267,131 +222,27 @@ Thermal_Information does not list it. G-key on Dell's G-Series laptops also changes Game Shift status, so both are directly related. -WMI method GetFanSensors([in] uint32 arg2, [out] uint32 argr) -------------------------------------------------------------- - -:: - - if BYTE_0(arg2) == 0x1: - if is_valid_fan(BYTE_1(arg2)): - argr = 1 - else: - argr = 0 - - if BYTE_0(arg2) == 0x2: - if is_valid_fan(BYTE_1(arg2)): - if BYTE_2(arg2) == 0: - argr == SENSOR_ID - else - argr == 0xFFFFFFFF - else: - argr = 0 - Overclocking Methods ==================== -.. warning:: - These methods have not been tested and are only partially reverse - engineered. - -WMI method Return_OverclockingReport([out] uint32 argr) -------------------------------------------------------- - -:: - - CSMI (0xE3, 0x99) - argr = 0 - -CSMI is an unknown operation. - -WMI method Set_OCUIBIOSControl([in] uint32 arg2, [out] uint32 argr) -------------------------------------------------------------------- - -:: - - CSMI (0xE3, 0x99) - argr = 0 - -CSMI is an unknown operation. - -WMI method Clear_OCFailSafeFlag([out] uint32 argr) --------------------------------------------------- - -:: - - CSMI (0xE3, 0x99) - argr = 0 - -CSMI is an unknown operation. - - WMI method MemoryOCControl([in] uint32 arg2, [out] uint32 argr) --------------------------------------------------------------- AWCC supports memory overclocking, but this method is very intricate and has not been deciphered yet. -GPIO methods -============ - -These methods are probably related to some kind of firmware update system, -through a GPIO device. - -.. warning:: - These methods have not been tested and are only partially reverse - engineered. - -WMI method FWUpdateGPIOtoggle([in] uint32 arg2, [out] uint32 argr) ------------------------------------------------------------------- - -:: - - if BYTE_0(arg2) == 0: - if BYTE_1(arg2) == 1: - SET_PIN_A_HIGH() - else: - SET_PIN_A_LOW() - - if BYTE_0(arg2) == 1: - if BYTE_1(arg2) == 1: - SET_PIN_B_HIGH() - - else: - SET_PIN_B_LOW() - - else: - argr = 1 - -WMI method ReadTotalofGPIOs([out] uint32 argr) ----------------------------------------------- - -:: - - argr = 0x02 - -WMI method ReadGPIOpPinStatus([in] uint32 arg2, [out] uint32 argr) ------------------------------------------------------------------- - -:: - - if BYTE_0(arg2) == 0: - argr = PIN_A_STATUS - - if BYTE_0(arg2) == 1: - argr = PIN_B_STATUS - Other information Methods ========================= WMI method ReadChassisColor([out] uint32 argr) ---------------------------------------------- -:: - - argr = CHASSIS_COLOR_ID +Returns the chassis color internal ID. Acknowledgements ================ -Kudos to `AlexIII <https://github.com/AlexIII/tcc-g15>`_ for documenting -and testing available thermal profile codes. +Kudos to `AlexIII <https://github.com/AlexIII/tcc-g15>`_ and +`T-Troll <https://github.com/T-Troll/alienfx-tools/>`_ for documenting and +testing some of this device's functionality, making it possible to generalize +this driver.
Signature · 1 line
2.48.1
Kurt Borja
maintainerPATCH v6 11/12 Documentation: admin-guide: laptops: Add documentation for alienware-wmi
In reply to Kurt BorjaAdd driver admin-guide documentation for the alienware-wmi driver.
--- .../admin-guide/laptops/alienware-wmi.rst | 128 +++++++++++++++++++++ Documentation/admin-guide/laptops/index.rst | 1 + MAINTAINERS | 1 + 3 files changed, 130 insertions(+)
Documentation/admin-guide/laptops/alienware-wmi.rst new file +128 -0
@@ -0,0 +1,128 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +==================== +Alienware WMI Driver +==================== + +Kurt Borja <[email protected]> + +This is a driver for the "WMAX" WMI device, which is found in most Dell gaming +laptops and controls various special features. + +Before the launch of M-Series laptops (~2018), the "WMAX" device controlled +basic RGB lighting, deep sleep mode, HDMI mode and amplifier status. + +Later, this device was completely repurpused. Now it mostly deals with thermal +profiles, sensor monitoring and overclocking. This interface is named "AWCC" and +is known to be used by the AWCC OEM application to control these features. + +The alienware-wmi driver controls both interfaces. + +AWCC Interface +============== + +WMI device documentation: Documentation/wmi/devices/alienware-wmi.rst + +Supported devices +----------------- + +- Alienware M-Series laptops +- Alienware X-Series laptops +- Alienware Aurora Desktops +- Dell G-Series laptops + +If you believe your device supports the AWCC interface and you don't have any of +the features described in this document, try the following alienware-wmi module +parameters: + +- ``force_platform_profile=1``: Forces probing for platform profile support +- ``force_hwmon=1``: Forces probing for HWMON support + +If the module loads successfully with these parameters, consider submitting a +patch adding your model to the ``awcc_dmi_table`` located in +``drivers/platform/x86/dell/alienware-wmi-wmax.c`` or contacting the maintainer +for further guidance. + +Status +------ + +The following features are currently supported: + +- :ref:`Platform Profile <platform-profile>`: + + - Thermal profile control + + - G-Mode toggling + +- :ref:`HWMON <hwmon>`: + + - Sensor monitoring + + - Manual fan control + +.. _platform-profile: + +Platform Profile +---------------- + +The AWCC interface exposes various firmware defined thermal profiles. We expose +these profiles to user-space through the Platform Profile class interface. +Refer to +:ref:`sysfs-class-platform-profile <abi_file_testing_sysfs_class_platform_profile>` +for more information. + +The name of the platform-profile class device exported by this driver is +"alienware-wmi" and it's path can be found with: + +:: + + grep -l "alienware-wmi" /sys/class/platform-profile/platform-profile-*/name | sed 's|/[^/]*$||' + +If the device supports G-Mode, it is also toggled when selecting the +``performance`` profile. + +.. note:: + You may set the ``force_gmode`` module parameter to always try to toggle this + feature, without checking if your model supports it. + +.. _hwmon: + +HWMON +----- + +The AWCC interface also supports sensor monitoring and manual fan control. Both +of these features are exposed to user-space through the HWMON interface. + +The name of the hwmon class device exported by this driver is "alienware_wmi" +and it's path can be found with: + +:: + + grep -l "alienware_wmi" /sys/class/hwmon/hwmon*/name | sed 's|/[^/]*$||' + +Sensor monitoring is done through the standard HWMON interface. Refer to +:ref:`sysfs-class-hwmon <abi_file_testing_sysfs_class_hwmon>` for more +information. + +Manual fan control on the other hand, is not exposed directly by the AWCC +interface. Instead it let's us control a fan `boost` value. This `boost` value +has the following aproximate behavior over the fan pwm: + +:: + + pwm = pwm_base + (fan_boost / 255) * (pwm_max - pwm_base) + +Due to the above behavior, we expose the fan `boost` control to user-space +through the following, custom hwmon sysfs attribute: + +=============================== ======= ======================================= +Name Perm Description +=============================== ======= ======================================= +fan[1-4]_boost RW Fan boost value. + + Integer value between 0 and 255 +=============================== ======= ======================================= + +.. note:: + In some devices, manual fan control only works reliably if the ``custom`` + platform profile is selected.
Documentation/admin-guide/laptops/index.rst +1 -0
@@ -7,6 +7,7 @@ Laptop Drivers .. toctree:: :maxdepth: 1 + alienware-wmi asus-laptop disk-shock-protection laptop-mode
MAINTAINERS +1 -0
@@ -796,6 +796,7 @@ M: Kurt Borja <[email protected]> L: [email protected] L: [email protected] S: Maintained +F: Documentation/admin-guide/laptops/alienware-wmi.rst F: Documentation/wmi/devices/alienware-wmi.rst F: drivers/platform/x86/dell/alienware-wmi*
Signature · 1 line
2.48.1
Ilpo Järvinen
maintainerRe: [PATCH v6 11/12] Documentation: admin-guide: laptops: Add documentation for alienware-wmi
Quoted 21 lines · Kurt Borja
Add driver admin-guide documentation for the alienware-wmi driver.
Reviewed-by Armin Wolf <[email protected]>Signed-off-by Kurt Borja <[email protected]>--- .../admin-guide/laptops/alienware-wmi.rst | 128 +++++++++++++++++++++ Documentation/admin-guide/laptops/index.rst | 1 + MAINTAINERS | 1 + 3 files changed, 130 insertions(+)Documentation/admin-guide/laptops/alienware-wmi.rst new file +5
-0@@ -0,0 +1,128 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +==================== +Alienware WMI Driver +====================
Documentation/admin-guide/laptops/alienware-wmi.rst line 15
Quoted 10 lines
Documentation/admin-guide/laptops/alienware-wmi.rst new file +10
-0+ +Kurt Borja <[email protected]> + +This is a driver for the "WMAX" WMI device, which is found in most Dell gaming +laptops and controls various special features. + +Before the launch of M-Series laptops (~2018), the "WMAX" device controlled +basic RGB lighting, deep sleep mode, HDMI mode and amplifier status. + +Later, this device was completely repurpused. Now it mostly deals with thermal
repurposed
Quoted 43 lines
Documentation/admin-guide/laptops/alienware-wmi.rst new file +43
-0+profiles, sensor monitoring and overclocking. This interface is named "AWCC" and +is known to be used by the AWCC OEM application to control these features. + +The alienware-wmi driver controls both interfaces. + +AWCC Interface +============== + +WMI device documentation: Documentation/wmi/devices/alienware-wmi.rst + +Supported devices +----------------- + +- Alienware M-Series laptops +- Alienware X-Series laptops +- Alienware Aurora Desktops +- Dell G-Series laptops + +If you believe your device supports the AWCC interface and you don't have any of +the features described in this document, try the following alienware-wmi module +parameters: + +- ``force_platform_profile=1``: Forces probing for platform profile support +- ``force_hwmon=1``: Forces probing for HWMON support + +If the module loads successfully with these parameters, consider submitting a +patch adding your model to the ``awcc_dmi_table`` located in +``drivers/platform/x86/dell/alienware-wmi-wmax.c`` or contacting the maintainer +for further guidance. + +Status +------ + +The following features are currently supported: + +- :ref:`Platform Profile <platform-profile>`: + + - Thermal profile control + + - G-Mode toggling + +- :ref:`HWMON <hwmon>`: +
Documentation/admin-guide/laptops/alienware-wmi.rst line 68
Quoted 10 lines
Documentation/admin-guide/laptops/alienware-wmi.rst new file +10
-0+ - Sensor monitoring + + - Manual fan control + +.. _platform-profile: + +Platform Profile +---------------- + +The AWCC interface exposes various firmware defined thermal profiles. We expose
Please don't use "We".
Signature · 1 line
i.
Quoted 86 lines
Documentation/admin-guide/laptops/alienware-wmi.rst new file +60
-0+these profiles to user-space through the Platform Profile class interface. +Refer to +:ref:`sysfs-class-platform-profile <abi_file_testing_sysfs_class_platform_profile>` +for more information. + +The name of the platform-profile class device exported by this driver is +"alienware-wmi" and it's path can be found with: + +:: + + grep -l "alienware-wmi" /sys/class/platform-profile/platform-profile-*/name | sed 's|/[^/]*$||' + +If the device supports G-Mode, it is also toggled when selecting the +``performance`` profile. + +.. note:: + You may set the ``force_gmode`` module parameter to always try to toggle this + feature, without checking if your model supports it. + +.. _hwmon: + +HWMON +----- + +The AWCC interface also supports sensor monitoring and manual fan control. Both +of these features are exposed to user-space through the HWMON interface. + +The name of the hwmon class device exported by this driver is "alienware_wmi" +and it's path can be found with: + +:: + + grep -l "alienware_wmi" /sys/class/hwmon/hwmon*/name | sed 's|/[^/]*$||' + +Sensor monitoring is done through the standard HWMON interface. Refer to +:ref:`sysfs-class-hwmon <abi_file_testing_sysfs_class_hwmon>` for more +information. + +Manual fan control on the other hand, is not exposed directly by the AWCC +interface. Instead it let's us control a fan `boost` value. This `boost` value +has the following aproximate behavior over the fan pwm: + +:: + + pwm = pwm_base + (fan_boost / 255) * (pwm_max - pwm_base) + +Due to the above behavior, we expose the fan `boost` control to user-space +through the following, custom hwmon sysfs attribute: + +=============================== ======= ======================================= +Name Perm Description +=============================== ======= ======================================= +fan[1-4]_boost RW Fan boost value. + + Integer value between 0 and 255 +=============================== ======= ======================================= + +.. note:: + In some devices, manual fan control only works reliably if the ``custom`` + platform profile is selected.Documentation/admin-guide/laptops/index.rst +1
-0@@ -7,6 +7,7 @@ Laptop Drivers .. toctree:: :maxdepth: 1 + alienware-wmi asus-laptop disk-shock-protection laptop-modeMAINTAINERS +1
-0@@ -796,6 +796,7 @@ M: Kurt Borja <[email protected]> L: [email protected] L: [email protected] S: Maintained +F: Documentation/admin-guide/laptops/alienware-wmi.rst F: Documentation/wmi/devices/alienware-wmi.rst F: drivers/platform/x86/dell/alienware-wmi*
Kurt Borja
maintainerPATCH v6 12/12 Documentation: ABI: Add sysfs platform and debugfs ABI documentation for alienware-wmi
In reply to Kurt BorjaAdd ABI description for the alienware-wmi driver.
--- Documentation/ABI/testing/debugfs-alienware-wmi | 44 ++++++++++++++++++++++ .../ABI/testing/sysfs-platform-alienware-wmi | 14 +++++++ MAINTAINERS | 2 + 3 files changed, 60 insertions(+)
Documentation/ABI/testing/debugfs-alienware-wmi new file +44 -0
@@ -0,0 +1,44 @@ +What: /sys/kernel/debug/alienware-wmi-<wmi_device_name>/system_description +Date: March 2025 +KernelVersion: 6.15 +Contact: Kurt Borja <[email protected]> +Description: + This file exposes the raw ``system_description`` number reported + by the WMAX device. + + Only present on devices with the AWCC interface. + + See Documentation/admin-guide/laptops/alienware-wmi.rst for + details. + + RO + +What: /sys/kernel/debug/alienware-wmi-<wmi_device_name>/hwmon_data +Date: March 2025 +KernelVersion: 6.15 +Contact: Kurt Borja <[email protected]> +Description: + This file exposes HWMON private data. + + Includes fan sensor count, temperature sensor count, internal + fan IDs and internal temp IDs. + + See Documentation/admin-guide/laptops/alienware-wmi.rst for + details. + + RO + +What: /sys/kernel/debug/alienware-wmi-<wmi_device_name>/pprof_data +Date: March 2025 +KernelVersion: 6.15 +Contact: Kurt Borja <[email protected]> +Description: + This file exposes Platform Profile private data. + + Includes internal mapping to platform profiles and thermal + profile IDs. + + See Documentation/admin-guide/laptops/alienware-wmi.rst for + details. + + RO
Documentation/ABI/testing/sysfs-platform-alienware-wmi new file +14 -0
@@ -0,0 +1,14 @@ +What: /sys/class/hwmon/hwmonX/fanY_boost +Date: March 2025 +KernelVersion: 6.15 +Contact: Kurt Borja <[email protected]> +Description: + This file exposes fan boost control for Dell gaming laptops with + the AWCC WMI interface. + + See Documentation/admin-guide/laptops/alienware-wmi.rst for + details. + + Integer value in the range 0 to 255 + + RW
MAINTAINERS +2 -0
@@ -796,6 +796,8 @@ M: Kurt Borja <[email protected]> L: [email protected] L: [email protected] S: Maintained +F: Documentation/ABI/testing/debugfs-alienware-wmi +F: Documentation/ABI/testing/sysfs-platform-alienware-wmi F: Documentation/admin-guide/laptops/alienware-wmi.rst F: Documentation/wmi/devices/alienware-wmi.rst F: drivers/platform/x86/dell/alienware-wmi*
Signature · 1 line
2.48.1
Armin Wolf
maintainerAm 13.03.25 um 15:29 schrieb Kurt Borja:
Quoted 6 lines
Hi all,
This set mainly adds hwmon and manual fan control support (patches 7-8) to the alienware-wmi driver, after some improvements.
Thank you for your feedback :)
From my perspective the whole series is ready for inclusion into the mainline kernel.
Thanks,
Armin Wolf
Quoted 37 lines
---
Changes in v6:[08/12]
- Definedev_pm_opsstatically (kernel test robot)Link to v5: https://lore.kernel.org/r/[email protected]
---
Kurt Borja (12):
platform/x86: alienware-wmi-wmax: Rename thermal related symbols platform/x86: alienware-wmi-wmax: Refactoris_awcc_thermal_mode()platform/x86: alienware-wmi-wmax: Improve internal AWCC API platform/x86: alienware-wmi-wmax: Modify supported_thermal_profiles[] platform/x86: alienware-wmi-wmax: Improve platform profile probe platform/x86: alienware-wmi-wmax: Add support for the "custom" thermal profile platform/x86: alienware-wmi-wmax: Add HWMON support
platform/x86: alienware-wmi-wmax: Add support for manual fan control platform/x86: alienware-wmi-wmax: Add a DebugFS interface
Documentation: wmi: Improve and update alienware-wmi documentation
Documentation: admin-guide: laptops: Add documentation for alienware-wmi
Documentation: ABI: Add sysfs platform and debugfs ABI documentation for alienware-wmiDocumentation/ABI/testing/debugfs-alienware-wmi | 44 + .../ABI/testing/sysfs-platform-alienware-wmi | 14 + .../admin-guide/laptops/alienware-wmi.rst | 128 +++ Documentation/admin-guide/laptops/index.rst | 1 + Documentation/wmi/devices/alienware-wmi.rst | 383 +++----- MAINTAINERS | 3 + drivers/platform/x86/dell/Kconfig | 1 + drivers/platform/x86/dell/alienware-wmi-wmax.c | 1023 +++++++++++++++++--- 8 files changed, 1187 insertions(+), 410 deletions(-)---
base-commit:f895f2493098b862f1ada0568aba278e49bf05b4
change-id: 20250305-hwm-f7bd91902b57Best regards,
Kurt Borja
maintainerQuoted 39 lines · Kurt Borja
Hi all,
This set mainly adds hwmon and manual fan control support (patches 7-8) to the alienware-wmi driver, after some improvements.
Thank you for your feedback :)
---
Changes in v6:[08/12]
- Definedev_pm_opsstatically (kernel test robot)Link to v5: https://lore.kernel.org/r/[email protected]
---
Kurt Borja (12):
platform/x86: alienware-wmi-wmax: Rename thermal related symbols platform/x86: alienware-wmi-wmax: Refactoris_awcc_thermal_mode()platform/x86: alienware-wmi-wmax: Improve internal AWCC API platform/x86: alienware-wmi-wmax: Modify supported_thermal_profiles[] platform/x86: alienware-wmi-wmax: Improve platform profile probe platform/x86: alienware-wmi-wmax: Add support for the "custom" thermal profile platform/x86: alienware-wmi-wmax: Add HWMON support
platform/x86: alienware-wmi-wmax: Add support for manual fan control platform/x86: alienware-wmi-wmax: Add a DebugFS interface
Documentation: wmi: Improve and update alienware-wmi documentation
Documentation: admin-guide: laptops: Add documentation for alienware-wmi
Documentation: ABI: Add sysfs platform and debugfs ABI documentation for alienware-wmiDocumentation/ABI/testing/debugfs-alienware-wmi | 44 + .../ABI/testing/sysfs-platform-alienware-wmi | 14 + .../admin-guide/laptops/alienware-wmi.rst | 128 +++ Documentation/admin-guide/laptops/index.rst | 1 + Documentation/wmi/devices/alienware-wmi.rst | 383 +++----- MAINTAINERS | 3 + drivers/platform/x86/dell/Kconfig | 1 + drivers/platform/x86/dell/alienware-wmi-wmax.c | 1023 +++++++++++++++++--- 8 files changed, 1187 insertions(+), 410 deletions(-)
Quoted 5 lines
---
base-commit:f895f2493098b862f1ada0568aba278e49bf05b4
change-id: 20250305-hwm-f7bd91902b57Best regards,
Hi Ilpo,
Is there still a chance for this to go into v6.15? or are you planning to review it on the next cycle?
Thank you either way!
Signature · 1 line
~ Kurt
Ilpo Järvinen
maintainerQuoted 44 lines · Kurt Borja
Quoted 43 lines · Kurt Borja
Hi all,
This set mainly adds hwmon and manual fan control support (patches 7-8) to the alienware-wmi driver, after some improvements.
Thank you for your feedback :)
---
Changes in v6:[08/12]
- Definedev_pm_opsstatically (kernel test robot)Link to v5: https://lore.kernel.org/r/[email protected]
---
Kurt Borja (12):
platform/x86: alienware-wmi-wmax: Rename thermal related symbols platform/x86: alienware-wmi-wmax: Refactoris_awcc_thermal_mode()platform/x86: alienware-wmi-wmax: Improve internal AWCC API platform/x86: alienware-wmi-wmax: Modify supported_thermal_profiles[] platform/x86: alienware-wmi-wmax: Improve platform profile probe platform/x86: alienware-wmi-wmax: Add support for the "custom" thermal profile platform/x86: alienware-wmi-wmax: Add HWMON support
platform/x86: alienware-wmi-wmax: Add support for manual fan control platform/x86: alienware-wmi-wmax: Add a DebugFS interface
Documentation: wmi: Improve and update alienware-wmi documentation
Documentation: admin-guide: laptops: Add documentation for alienware-wmi
Documentation: ABI: Add sysfs platform and debugfs ABI documentation for alienware-wmiDocumentation/ABI/testing/debugfs-alienware-wmi | 44 + .../ABI/testing/sysfs-platform-alienware-wmi | 14 + .../admin-guide/laptops/alienware-wmi.rst | 128 +++ Documentation/admin-guide/laptops/index.rst | 1 + Documentation/wmi/devices/alienware-wmi.rst | 383 +++----- MAINTAINERS | 3 + drivers/platform/x86/dell/Kconfig | 1 + drivers/platform/x86/dell/alienware-wmi-wmax.c | 1023 +++++++++++++++++--- 8 files changed, 1187 insertions(+), 410 deletions(-)---
base-commit:f895f2493098b862f1ada0568aba278e49bf05b4
change-id: 20250305-hwm-f7bd91902b57
Quoted 6 lines
Quoted 1 line
Best regards,
Hi Ilpo,
Is there still a chance for this to go into v6.15? or are you planning to review it on the next cycle?
Hi,
I'm almost there to make the main PR for 6.15 from what's in for-next currently, so no, this won't be part of it.
In general, I don't usually take large series after -rc6 timeframe to give time for things to settle and problems to be brought to surface. Especially if the series is interfacing with other subsystems which is prone to lack of select/depends on clauses, etc. so more likely to break the build than changes that seem immune to the .config variations.
Signature · 1 line
i.
Kurt Borja
maintainerQuoted 54 lines · Ilpo Järvinen
Quoted 44 lines · Kurt Borja
Quoted 43 lines · Kurt Borja
Hi all,
This set mainly adds hwmon and manual fan control support (patches 7-8) to the alienware-wmi driver, after some improvements.
Thank you for your feedback :)
---
Changes in v6:[08/12]
- Definedev_pm_opsstatically (kernel test robot)Link to v5: https://lore.kernel.org/r/[email protected]
---
Kurt Borja (12):
platform/x86: alienware-wmi-wmax: Rename thermal related symbols platform/x86: alienware-wmi-wmax: Refactoris_awcc_thermal_mode()platform/x86: alienware-wmi-wmax: Improve internal AWCC API platform/x86: alienware-wmi-wmax: Modify supported_thermal_profiles[] platform/x86: alienware-wmi-wmax: Improve platform profile probe platform/x86: alienware-wmi-wmax: Add support for the "custom" thermal profile platform/x86: alienware-wmi-wmax: Add HWMON support
platform/x86: alienware-wmi-wmax: Add support for manual fan control platform/x86: alienware-wmi-wmax: Add a DebugFS interface
Documentation: wmi: Improve and update alienware-wmi documentation
Documentation: admin-guide: laptops: Add documentation for alienware-wmi
Documentation: ABI: Add sysfs platform and debugfs ABI documentation for alienware-wmiDocumentation/ABI/testing/debugfs-alienware-wmi | 44 + .../ABI/testing/sysfs-platform-alienware-wmi | 14 + .../admin-guide/laptops/alienware-wmi.rst | 128 +++ Documentation/admin-guide/laptops/index.rst | 1 + Documentation/wmi/devices/alienware-wmi.rst | 383 +++----- MAINTAINERS | 3 + drivers/platform/x86/dell/Kconfig | 1 + drivers/platform/x86/dell/alienware-wmi-wmax.c | 1023 +++++++++++++++++--- 8 files changed, 1187 insertions(+), 410 deletions(-)---
base-commit:f895f2493098b862f1ada0568aba278e49bf05b4
change-id: 20250305-hwm-f7bd91902b57Quoted 6 lines
Quoted 1 line
Best regards,
Hi Ilpo,
Is there still a chance for this to go into v6.15? or are you planning to review it on the next cycle?
Hi,
Quoted 8 lines
I'm almost there to make the main PR for 6.15 from what's in for-next currently, so no, this won't be part of it.
In general, I don't usually take large series after -rc6 timeframe to give time for things to settle and problems to be brought to surface. Especially if the series is interfacing with other subsystems which is prone to lack of select/depends on clauses, etc. so more likely to break the build than changes that seem immune to the .config variations.
Oh - I'll keep in mind this in the future. Thank you!
Signature · 1 line
~ Kurt