Fix Omen 16-wf1xxx thermal profile and add EC readback
v3 cover Fix Omen 16-wf1xxx thermal profile and add EC readback
This series fixes incorrect thermal profile parameters sent for HP Omen 16-wf1xxx and implements hardware readback support for Victus S thermal profiles.
The first patch refactors the DMI handling for Victus S boards. By moving from simple string list to DMI system id table with driver_data, we can now map each board to its correct thermal parameters.
The second patch implements "get" callback for the platform profile API. It reads the hardware state from EC register 0x59. This ensures that the driver stays in sync with the hardware during driver init and power source change events.
Changes in V3:
- Moved DMI lookup to hp_wmi_init()
- Marked DMI table as __initconst
- Renamed eco to low_power
- Added second patch to implement "get" support for Victus S devices
Changes in V2:
- Refactored victus_s_thermal_profile_boards to use DMI table
- Implemented driver_data to handle thermal profile parameters
- Moved enum definitions earlier in the file for thermal profile parameters
- Changes in V1:
Initial fix for Omen 16-wf1xxx thermal profile values
Krishna Chomal (2):
platform/x86: hp-wmi: fix platform profile values for Omen 16-wf1xxx platform/x86: hp-wmi: Add EC offsets to read Victus S thermal profile
drivers/platform/x86/hp/hp-wmi.c | 259 +++++++++++++++++++++++-------- 1 file changed, 197 insertions(+), 62 deletions(-)
Signature · 1 line
2.52.0
PATCH v3 1/2 platform/x86: hp-wmi: fix platform profile values for Omen 16-wf1xxx
HP Omen 16-wf1xxx (board ID 8C78) currently sends the incorrect Victus-specific thermal profile values via WMI, leading to a logical inconsistency when switching between platform profiles.
The driver currently uses Victus S values:0x00 => Balanced / Low-Power0x01 => Performance
However, Omen Gaming Hub logs / EC register inspection on Windows shows that this board is intended to use:0x30 => Balanced / Low-Power0x31 => Performance
This patch corrects the thermal profile command values to match the values observed from Omen Gaming Hub logs. The performance benchmarks and peak power draw (from both CPU and GPU) show no observable change with this correction (suggesting that the firmware is currently tolerant of the incorrect values). However sending the correct values prevents potential regressions after future firmware updates.
Refactor victus_s_thermal_profile_boards from a list of strings to a dmi_system_id table and move the lookup to module init. The new struct thermal_profile_params is used to store board-specific WMI parameters, allowing the driver to cache these values in a static pointer. This avoids repeated DMI string comparisons and allows marking of DMI table as __initconst.
Testing on HP Omen 16-wf1xxx (board 8C78) confirmed WMI codes 0x30/0x31 are now sent, resolving the logical inconsistency and ensuring the value visible in EC registers match the Windows state for this profile.
---
Changes in v3:
- Fixed minor formatting issues.
- Renamed struct field eco to low_power for consistency.
- Marked the DMI table as __initconst.
- Moved DMI lookup to hp_wmi_init() and save the active thermal profile params.
- Added a static boolean flag to optimize is_victus_s_thermal_profile().
Changes in v2:
- Refactored victus_s_thermal_profile_boards to use struct dmi_system_id
- Implemented driver_data to handle thermal profile parameters, replacing the conditional checks in platform_profile_victus_s_set_ec
- Moved enum definitions for thermal profile values earlier in the file to support the new struct thermal_profile_params.
--- drivers/platform/x86/hp/hp-wmi.c | 179 ++++++++++++++++++++++--------- 1 file changed, 127 insertions(+), 52 deletions(-)
drivers/platform/x86/hp/hp-wmi.c +127 -52
@@ -53,6 +53,66 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45E9-BE91-3D44E2C707E4");#define zero_if_sup (tmp) (zero_insize_support?0:sizeof(tmp)) // use when zero insize is required +enum hp_thermal_profile_omen_v0 { +HP_OMEN_V0_THERMAL_PROFILE_DEFAULT =0x00 , +HP_OMEN_V0_THERMAL_PROFILE_PERFORMANCE =0x01 , +HP_OMEN_V0_THERMAL_PROFILE_COOL =0x02 , +}; + +enum hp_thermal_profile_omen_v1 { +HP_OMEN_V1_THERMAL_PROFILE_DEFAULT =0x30 , +HP_OMEN_V1_THERMAL_PROFILE_PERFORMANCE =0x31 , +HP_OMEN_V1_THERMAL_PROFILE_COOL =0x50 , +}; + +enum hp_thermal_profile_omen_flags { +HP_OMEN_EC_FLAGS_TURBO =0x04 , +HP_OMEN_EC_FLAGS_NOTIMER =0x02 , +HP_OMEN_EC_FLAGS_JUSTSET =0x01 , +}; + +enum hp_thermal_profile_victus { +HP_VICTUS_THERMAL_PROFILE_DEFAULT =0x00 , +HP_VICTUS_THERMAL_PROFILE_PERFORMANCE =0x01 , +HP_VICTUS_THERMAL_PROFILE_QUIET =0x03 , +}; + +enum hp_thermal_profile_victus_s { +HP_VICTUS_S_THERMAL_PROFILE_DEFAULT =0x00 , +HP_VICTUS_S_THERMAL_PROFILE_PERFORMANCE =0x01 , +}; + +enum hp_thermal_profile { +HP_THERMAL_PROFILE_PERFORMANCE =0x00 , +HP_THERMAL_PROFILE_DEFAULT =0x01 , +HP_THERMAL_PROFILE_COOL =0x02 , +HP_THERMAL_PROFILE_QUIET =0x03 , +}; + +struct thermal_profile_params { +u8 performance; +u8 balanced; +u8 low_power; +}; + +static const struct thermal_profile_params victus_s_thermal_params = { + .performance =HP_VICTUS_S_THERMAL_PROFILE_PERFORMANCE , + .balanced =HP_VICTUS_S_THERMAL_PROFILE_DEFAULT , + .low_power =HP_VICTUS_S_THERMAL_PROFILE_DEFAULT , +}; + +static const struct thermal_profile_params omen_v1_thermal_params = { + .performance =HP_OMEN_V1_THERMAL_PROFILE_PERFORMANCE , + .balanced =HP_OMEN_V1_THERMAL_PROFILE_DEFAULT , + .low_power =HP_OMEN_V1_THERMAL_PROFILE_DEFAULT , +}; + +/* +* A generic pointer for the currently-active board's thermal profile +* parameters. +*/ +static struct thermal_profile_params *active_thermal_profile_params; +/* DMI board names of devices that should use the omen specific path for * thermal profiles. * This was obtained by taking a look in the windows omen command center
@@ -99,12 +159,40 @@ static const char * const victus_thermal_profile_boards[] = { };/* DMI Board names of Victus 16-r and Victus 16-s laptops */ -static const char *const victus_s_thermal_profile_boards[] = { -"8BBE" ,"8BD4" ,"8BD5" , -"8C78" ,"8C99" ,"8C9C" , -"8D41" , +static const struct dmi_system_id victus_s_thermal_profile_boards[]__initconst = { + { + .matches = {DMI_MATCH (DMI_BOARD_NAME ,"8BBE" ) }, + .driver_data = (void *)&victus_s_thermal_params, + }, + { + .matches = {DMI_MATCH (DMI_BOARD_NAME ,"8BD4" ) }, + .driver_data = (void *)&victus_s_thermal_params, + }, + { + .matches = {DMI_MATCH (DMI_BOARD_NAME ,"8BD5" ) }, + .driver_data = (void *)&victus_s_thermal_params, + }, + { + .matches = {DMI_MATCH (DMI_BOARD_NAME ,"8C78" ) }, + .driver_data = (void *)&omen_v1_thermal_params, + }, + { + .matches = {DMI_MATCH (DMI_BOARD_NAME ,"8C99" ) }, + .driver_data = (void *)&victus_s_thermal_params, + }, + { + .matches = {DMI_MATCH (DMI_BOARD_NAME ,"8C9C" ) }, + .driver_data = (void *)&victus_s_thermal_params, + }, + { + .matches = {DMI_MATCH (DMI_BOARD_NAME ,"8D41" ) }, + .driver_data = (void *)&victus_s_thermal_params, + }, + {}, }; +static bool is_victus_s_board; +enum hp_wmi_radio {HPWMI_WIFI =0x0 ,HPWMI_BLUETOOTH =0x1 ,
@@ -225,42 +313,6 @@ enum hp_wireless2_bits { HPWMI_POWER_FW_OR_HW = HPWMI_POWER_BIOS | HPWMI_POWER_HARD, }; -enum hp_thermal_profile_omen_v0 { -HP_OMEN_V0_THERMAL_PROFILE_DEFAULT =0x00 , -HP_OMEN_V0_THERMAL_PROFILE_PERFORMANCE =0x01 , -HP_OMEN_V0_THERMAL_PROFILE_COOL =0x02 , -}; - -enum hp_thermal_profile_omen_v1 { -HP_OMEN_V1_THERMAL_PROFILE_DEFAULT =0x30 , -HP_OMEN_V1_THERMAL_PROFILE_PERFORMANCE =0x31 , -HP_OMEN_V1_THERMAL_PROFILE_COOL =0x50 , -}; - -enum hp_thermal_profile_omen_flags { -HP_OMEN_EC_FLAGS_TURBO =0x04 , -HP_OMEN_EC_FLAGS_NOTIMER =0x02 , -HP_OMEN_EC_FLAGS_JUSTSET =0x01 , -}; - -enum hp_thermal_profile_victus { -HP_VICTUS_THERMAL_PROFILE_DEFAULT =0x00 , -HP_VICTUS_THERMAL_PROFILE_PERFORMANCE =0x01 , -HP_VICTUS_THERMAL_PROFILE_QUIET =0x03 , -}; - -enum hp_thermal_profile_victus_s { -HP_VICTUS_S_THERMAL_PROFILE_DEFAULT =0x00 , -HP_VICTUS_S_THERMAL_PROFILE_PERFORMANCE =0x01 , -}; - -enum hp_thermal_profile { -HP_THERMAL_PROFILE_PERFORMANCE =0x00 , -HP_THERMAL_PROFILE_DEFAULT =0x01 , -HP_THERMAL_PROFILE_COOL =0x02 , -HP_THERMAL_PROFILE_QUIET =0x03 , -}; -#define IS_HWBLOCKED (x) ((x & HPWMI_POWER_FW_OR_HW) != HPWMI_POWER_FW_OR_HW)#define IS_SWBLOCKED (x) !(x & HPWMI_POWER_SOFT)
@@ -1581,15 +1633,8 @@ static int platform_profile_victus_set_ec(enum platform_profile_option profile)static bool is_victus_s_thermal_profile (void ) { -const char *board_name; - - board_name =dmi_get_system_info (DMI_BOARD_NAME ); -if (!board_name) -return false; - -return match_string (victus_s_thermal_profile_boards, -ARRAY_SIZE (victus_s_thermal_profile_boards), - board_name) >=0 ; +/* Initialised in driver init, hence safe to use here */ +return is_victus_s_board; } static int victus_s_gpu_thermal_profile_get(bool *ctgp_enable,
@@ -1672,25 +1717,30 @@ static int victus_s_set_cpu_pl1_pl2(u8 pl1, u8 pl2)static int platform_profile_victus_s_set_ec (enum platform_profile_option profile) { +struct thermal_profile_params *params;bool gpu_ctgp_enable, gpu_ppab_enable;u8 gpu_dstate;/* Test shows 1 = 100%, 2 = 50%, 3 = 25%, 4 = 12.5% */ int err, tp; + params = active_thermal_profile_params; +if (!params) +return -ENODEV ; +switch (profile) {case PLATFORM_PROFILE_PERFORMANCE : - tp =HP_VICTUS_S_THERMAL_PROFILE_PERFORMANCE ; + tp = params->performance; gpu_ctgp_enable = true; gpu_ppab_enable = true; gpu_dstate =1 ;break ;case PLATFORM_PROFILE_BALANCED : - tp =HP_VICTUS_S_THERMAL_PROFILE_DEFAULT ; + tp = params->balanced; gpu_ctgp_enable = false; gpu_ppab_enable = true; gpu_dstate =1 ;break ;case PLATFORM_PROFILE_LOW_POWER : - tp =HP_VICTUS_S_THERMAL_PROFILE_DEFAULT ; + tp = params->low_power; gpu_ctgp_enable = false; gpu_ppab_enable = false; gpu_dstate =1 ;
@@ -2227,6 +2277,26 @@ static int hp_wmi_hwmon_init(void)return 0 ; } +static void __init setup_active_thermal_profile_params (void ) +{ +const struct dmi_system_id *id; + +/* +* Currently only victus_s devices use the +* active_thermal_profile_params +*/ + id =dmi_first_match (victus_s_thermal_profile_boards); +if (id) { +/* +* Marking this boolean is required to ensure that +* is_victus_s_thermal_profile() behaves like a valid +* wrapper. +*/ + is_victus_s_board = true; + active_thermal_profile_params = id->driver_data; + } +} +static int __init hp_wmi_init (void ) {int event_capable =wmi_has_guid (HPWMI_EVENT_GUID );
@@ -2254,6 +2324,11 @@ static int __init hp_wmi_init(void) goto err_destroy_input; } +/* +* Setup active board's thermal profile parameters before +* starting platform driver probe. +*/ +setup_active_thermal_profile_params (); err =platform_driver_probe (&hp_wmi_driver, hp_wmi_bios_setup);if (err) goto err_unregister_device;
Signature · 1 line
2.52.0
PATCH v3 2/2 platform/x86: hp-wmi: Add EC offsets to read Victus S thermal profile
In reply to Krishna ChomalThe current implementation for Victus S thermal profiles only supports setting the profile. The driver was missing the logic to read the hardware state, meaning it would default to "Balanced" on driver load, overriding the currently active profile. Furthermore, the driver could not detect if the firmware reset the profile on a power source change.
Add platform_profile_victus_s_get_ec() to read the current thermal profile state directly from EC offset 0x59. Since both Balanced and Low-Power profiles share the same thermal profile value, differentiate them by querying the GPU CTGP and PPAB states via existing functions. Additionally, update the power source event notifier to use the actual hardware state when re-trigger CPU power limits actualization.
Testing on HP Omen 16-wf1xxx (board ID 8C78) confirmed that the thermal profile is now persistent across driver loads.
---
Changes in V3:
- New patch in this series
--- drivers/platform/x86/hp/hp-wmi.c | 84 +++++++++++++++++++++++++++----- 1 file changed, 72 insertions(+), 12 deletions(-)
drivers/platform/x86/hp/hp-wmi.c +72 -12
@@ -44,6 +44,7 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45E9-BE91-3D44E2C707E4");#define HP_OMEN_EC_THERMAL_PROFILE_FLAGS_OFFSET 0x62#define HP_OMEN_EC_THERMAL_PROFILE_TIMER_OFFSET 0x63#define HP_OMEN_EC_THERMAL_PROFILE_OFFSET 0x95 +#define HP_VICTUS_S_EC_THERMAL_PROFILE_OFFSET 0x59#define HP_FAN_SPEED_AUTOMATIC 0x00#define HP_POWER_LIMIT_DEFAULT 0x00
@@ -640,6 +641,12 @@ static bool is_omen_thermal_profile(void) board_name) >= 0; } +static bool is_victus_s_thermal_profile (void ) +{ +/* Initialised in driver init, hence safe to use here */ +return is_victus_s_board; +} +static int omen_get_thermal_policy_version (void ) {unsigned char buffer[8 ] = {0 };
@@ -666,9 +673,16 @@ static int omen_get_thermal_policy_version(void)static int omen_thermal_profile_get (void ) { +u8 addr;u8 data; +int ret; -int ret =ec_read (HP_OMEN_EC_THERMAL_PROFILE_OFFSET , &data); +if (is_victus_s_thermal_profile ()) + addr =HP_VICTUS_S_EC_THERMAL_PROFILE_OFFSET ; +else + addr =HP_OMEN_EC_THERMAL_PROFILE_OFFSET ; + + ret =ec_read (addr, &data);if (ret)return ret;
@@ -1631,12 +1645,6 @@ static int platform_profile_victus_set_ec(enum platform_profile_option profile)return 0 ; } -static bool is_victus_s_thermal_profile (void ) -{ -/* Initialised in driver init, hence safe to use here */ -return is_victus_s_board; -} - static int victus_s_gpu_thermal_profile_get(bool *ctgp_enable, bool *ppab_enable, u8 *dstate,
@@ -1715,6 +1723,44 @@ static int victus_s_set_cpu_pl1_pl2(u8 pl1, u8 pl2)return ret; } +static int platform_profile_victus_s_get_ec (enum platform_profile_option *profile) +{ +int ret; +int tp; +bool current_ctgp_state, current_ppab_state; +u8 current_dstate, current_gpu_slowdown_temp; + + tp =omen_thermal_profile_get (); +if (tp <0 ) +return tp; + +if (tp == active_thermal_profile_params->performance) { + *profile =PLATFORM_PROFILE_PERFORMANCE ; + }else if (tp == active_thermal_profile_params->balanced) { +/* +* Since both PLATFORM_PROFILE_LOW_POWER and +* PLATFORM_PROFILE_BALANCED share the same thermal profile +* parameter value, hence to differentiate between them, we +* query the GPU CTGP and PPAB states and compare based off of +* that. +*/ + ret =victus_s_gpu_thermal_profile_get (¤t_ctgp_state, + ¤t_ppab_state, + ¤t_dstate, + ¤t_gpu_slowdown_temp); +if (current_ctgp_state ==0 && current_ppab_state ==0 ) + *profile =PLATFORM_PROFILE_LOW_POWER ; +else if (current_ctgp_state ==0 && current_ppab_state ==1 ) + *profile =PLATFORM_PROFILE_BALANCED ; +else +return -EINVAL ; + }else { +return -EINVAL ; + } + +return 0 ; +} +static int platform_profile_victus_s_set_ec (enum platform_profile_option profile) {struct thermal_profile_params *params;
@@ -1882,6 +1928,7 @@ static int victus_s_powersource_event(struct notifier_block *nb, void *data) {struct acpi_bus_event *event_entry = data; +enum platform_profile_option actual_profile;int err;if (strcmp (event_entry->device_class,ACPI_AC_CLASS ) !=0 )
@@ -1889,6 +1936,17 @@ static int victus_s_powersource_event(struct notifier_block *nb,pr_debug ("Received power source device event\n" ); +guard (mutex)(&active_platform_profile_lock); + err =platform_profile_victus_get_ec (&actual_profile); +if (err <0 ) { +/* +* Although we failed to get the current platform profile, we +* still want the other event consumers to process it. +*/ +pr_warn ("Failed to read current platform profile (%d)\n" , err); +return NOTIFY_DONE ; + } +/* * Switching to battery power source while Performance mode is active * needs manual triggering of CPU power limits. Same goes when switching
@@ -1897,7 +1955,7 @@ static int victus_s_powersource_event(struct notifier_block *nb,* Seen on HP 16-s1034nf (board 8C9C) with F.11 and F.13 BIOS versions. */ -if (active_platform_profile ==PLATFORM_PROFILE_PERFORMANCE ) { +if (actual_profile ==PLATFORM_PROFILE_PERFORMANCE ) {pr_debug ("Triggering CPU PL1/PL2 actualization\n" ); err =victus_s_set_cpu_pl1_pl2 (HP_POWER_LIMIT_DEFAULT ,HP_POWER_LIMIT_DEFAULT );
@@ -2007,12 +2065,14 @@ static int thermal_profile_setup(struct platform_device *device) ops = &platform_profile_victus_ops; }else if (is_victus_s_thermal_profile ()) { + err =platform_profile_victus_s_get_ec (&active_platform_profile); +if (err <0 ) +return err; +/* -* Being unable to retrieve laptop's current thermal profile, -* during this setup, we set it to Balanced by default. +* call thermal profile write command to ensure that the +* firmware correctly sets the OEM variables */ - active_platform_profile =PLATFORM_PROFILE_BALANCED ; - err =platform_profile_victus_s_set_ec (active_platform_profile);if (err <0 )return err;
Signature · 1 line
2.52.0
Hi,
Please ignore this v3 series. I have identified a logic issue which causes hp_wmi to fail to load, the first time after boot. I will send the fix for v4 soon.
Thanks and apologies for the noise.