platform/x86: hp-wmi: add platform profile support
PATCH 2/2 platform/x86: hp-wmi: add platform profile support
Implement support for cool, balanced and performance thermal profile
---
the "quiet" profile will be implemented with a further patch
drivers/platform/x86/hp-wmi.c | 96 +++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 5 deletions(-)
drivers/platform/x86/hp-wmi.c +91 -5
@@ -21,6 +21,7 @@#include <linux/input.h> #include <linux/input/sparse-keymap.h> #include <linux/platform_device.h> +#include <linux/platform_profile.h> #include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/string.h>
@@ -119,6 +120,12 @@ enum hp_wireless2_bits { HPWMI_POWER_FW_OR_HW = HPWMI_POWER_BIOS | HPWMI_POWER_HARD, }; +enum hp_thermal_profile { +HP_THERMAL_PROFILE_PERFORMANCE =0x00 , +HP_THERMAL_PROFILE_DEFAULT =0x01 , +HP_THERMAL_PROFILE_COOL =0x02 +}; +#define IS_HWBLOCKED (x) ((x & HPWMI_POWER_FW_OR_HW) != HPWMI_POWER_FW_OR_HW)#define IS_SWBLOCKED (x) !(x & HPWMI_POWER_SOFT)
@@ -159,6 +166,7 @@ static const struct key_entry hp_wmi_keymap[] = {static struct input_dev *hp_wmi_input_dev;static struct platform_device *hp_wmi_platform_dev; +static struct platform_profile_handler platform_profile_handler;static struct rfkill *wifi_rfkill;static struct rfkill *bluetooth_rfkill;
@@ -869,23 +877,101 @@ static int __init hp_wmi_rfkill2_setup(struct platform_device *device)return err; } -static int thermal_profile_setup (struct platform_device *device) +static int thermal_profile_get (void ) { -int err, tp; +int tp; tp =hp_wmi_read_int (HPWMI_THERMAL_PROFILE_QUERY );if (tp <0 )return tp; +return tp; +} + +static int thermal_profile_set (int thermal_profile) +{ +int err; + + err =hp_wmi_perform_query (HPWMI_THERMAL_PROFILE_QUERY ,HPWMI_WRITE , &thermal_profile, +sizeof (thermal_profile),0 ); +if (err) +return err; + +return 0 ; +} + +static int platform_profile_get (struct platform_profile_handler *pprof, +enum platform_profile_option *profile) +{ +int tp =thermal_profile_get (); + +switch (tp) { +case HP_THERMAL_PROFILE_PERFORMANCE : + *profile =PLATFORM_PROFILE_PERFORMANCE ; +break ; +case HP_THERMAL_PROFILE_DEFAULT : + *profile =PLATFORM_PROFILE_BALANCED ; +break ; +case HP_THERMAL_PROFILE_COOL : + *profile =PLATFORM_PROFILE_COOL ; +break ; +default : +return -EINVAL ; + } + +return 0 ; +} + +static int platform_profile_set (struct platform_profile_handler *pprof, +enum platform_profile_option profile) +{ +int err, tp; + +switch (profile) { +case PLATFORM_PROFILE_PERFORMANCE : + tp =HP_THERMAL_PROFILE_PERFORMANCE ; +break ; +case PLATFORM_PROFILE_BALANCED : + tp =HP_THERMAL_PROFILE_DEFAULT ; +break ; +case PLATFORM_PROFILE_COOL : + tp =HP_THERMAL_PROFILE_COOL ; +break ; +default : +return -EOPNOTSUPP ; + } + + err =thermal_profile_set (tp); +if (err) +return err; + +return 0 ; +} + +static int thermal_profile_setup (void ) +{ +int err, tp; + + tp =thermal_profile_get (); +if (tp <0 ) +return tp; +/* * call thermal profile write command to ensure that the firmware correctly * sets the OEM variables for the DPTF */ - err =hp_wmi_perform_query (HPWMI_THERMAL_PROFILE_QUERY ,HPWMI_WRITE , &tp, -sizeof (tp),0 ); + err =thermal_profile_set (tp);if (err)return err; + platform_profile_handler.profile_get = platform_profile_get, + platform_profile_handler.profile_set = platform_profile_set, + +set_bit (PLATFORM_PROFILE_COOL , platform_profile_handler.choices); +set_bit (PLATFORM_PROFILE_BALANCED , platform_profile_handler.choices); +set_bit (PLATFORM_PROFILE_PERFORMANCE , platform_profile_handler.choices); + +platform_profile_register (&platform_profile_handler);return 0 ; }
@@ -900,7 +986,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)if (hp_wmi_rfkill_setup (device))hp_wmi_rfkill2_setup (device); -thermal_profile_setup (device); +thermal_profile_setup ();return 0 ; }
Signature · 1 line
2.29.2
PATCH v2 2/2 platform/x86: hp-wmi: add platform profile support
Implement support for cool, balanced and performance thermal profile
---
the "quiet" profile will be implemented with a further patch
v2: added platform_profile_remove() missing call
drivers/platform/x86/hp-wmi.c | 103 ++++++++++++++++++++++++++++++++-- 1 file changed, 98 insertions(+), 5 deletions(-)
drivers/platform/x86/hp-wmi.c +98 -5
@@ -21,6 +21,7 @@#include <linux/input.h> #include <linux/input/sparse-keymap.h> #include <linux/platform_device.h> +#include <linux/platform_profile.h> #include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/string.h>
@@ -119,6 +120,12 @@ enum hp_wireless2_bits { HPWMI_POWER_FW_OR_HW = HPWMI_POWER_BIOS | HPWMI_POWER_HARD, }; +enum hp_thermal_profile { +HP_THERMAL_PROFILE_PERFORMANCE =0x00 , +HP_THERMAL_PROFILE_DEFAULT =0x01 , +HP_THERMAL_PROFILE_COOL =0x02 +}; +#define IS_HWBLOCKED (x) ((x & HPWMI_POWER_FW_OR_HW) != HPWMI_POWER_FW_OR_HW)#define IS_SWBLOCKED (x) !(x & HPWMI_POWER_SOFT)
@@ -159,6 +166,8 @@ static const struct key_entry hp_wmi_keymap[] = {static struct input_dev *hp_wmi_input_dev;static struct platform_device *hp_wmi_platform_dev; +static struct platform_profile_handler platform_profile_handler; +static int platform_profile_support =0 ;static struct rfkill *wifi_rfkill;static struct rfkill *bluetooth_rfkill;
@@ -869,11 +878,80 @@ static int __init hp_wmi_rfkill2_setup(struct platform_device *device)return err; } -static int thermal_profile_setup (struct platform_device *device) +static int thermal_profile_get (void ) { -int err, tp; +int tp; tp =hp_wmi_read_int (HPWMI_THERMAL_PROFILE_QUERY ); + +return tp; +} + +static int thermal_profile_set (int thermal_profile) +{ +int err; + + err =hp_wmi_perform_query (HPWMI_THERMAL_PROFILE_QUERY ,HPWMI_WRITE , &thermal_profile, +sizeof (thermal_profile),0 ); +if (err) +return err; + +return 0 ; +} + +static int platform_profile_get (struct platform_profile_handler *pprof, +enum platform_profile_option *profile) +{ +int tp =thermal_profile_get (); + +switch (tp) { +case HP_THERMAL_PROFILE_PERFORMANCE : + *profile =PLATFORM_PROFILE_PERFORMANCE ; +break ; +case HP_THERMAL_PROFILE_DEFAULT : + *profile =PLATFORM_PROFILE_BALANCED ; +break ; +case HP_THERMAL_PROFILE_COOL : + *profile =PLATFORM_PROFILE_COOL ; +break ; +default : +return -EINVAL ; + } + +return 0 ; +} + +static int platform_profile_set (struct platform_profile_handler *pprof, +enum platform_profile_option profile) +{ +int err, tp; + +switch (profile) { +case PLATFORM_PROFILE_PERFORMANCE : + tp =HP_THERMAL_PROFILE_PERFORMANCE ; +break ; +case PLATFORM_PROFILE_BALANCED : + tp =HP_THERMAL_PROFILE_DEFAULT ; +break ; +case PLATFORM_PROFILE_COOL : + tp =HP_THERMAL_PROFILE_COOL ; +break ; +default : +return -EOPNOTSUPP ; + } + + err =thermal_profile_set (tp); +if (err) +return err; + +return 0 ; +} + +static int thermal_profile_setup (void ) +{ +int err, tp; + + tp =thermal_profile_get ();if (tp <0 )return tp;
@@ -881,11 +959,23 @@ static int thermal_profile_setup(struct platform_device *device)* call thermal profile write command to ensure that the firmware correctly * sets the OEM variables for the DPTF */ - err =hp_wmi_perform_query (HPWMI_THERMAL_PROFILE_QUERY ,HPWMI_WRITE , &tp, -sizeof (tp),0 ); + err =thermal_profile_set (tp);if (err)return err; + platform_profile_handler.profile_get = platform_profile_get, + platform_profile_handler.profile_set = platform_profile_set, + +set_bit (PLATFORM_PROFILE_COOL , platform_profile_handler.choices); +set_bit (PLATFORM_PROFILE_BALANCED , platform_profile_handler.choices); +set_bit (PLATFORM_PROFILE_PERFORMANCE , platform_profile_handler.choices); + + err =platform_profile_register (&platform_profile_handler); +if (err) +return err; + + platform_profile_support =1 ; +return 0 ; }
@@ -900,7 +990,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)if (hp_wmi_rfkill_setup (device))hp_wmi_rfkill2_setup (device); -thermal_profile_setup (device); +thermal_profile_setup ();return 0 ; }
@@ -1030,5 +1120,8 @@ static void __exit hp_wmi_exit(void)platform_device_unregister (hp_wmi_platform_dev);platform_driver_unregister (&hp_wmi_driver); } + +if (platform_profile_support) +platform_profile_remove (); }module_exit (hp_wmi_exit);
Signature · 1 line
2.29.2
Hi
2021. február 21., vasárnap 22:30 keltezéssel, Elia Devito írta:
Quoted 37 lines
Implement support for cool, balanced and performance thermal profile
Signed-off-by Elia Devito <[email protected]>---
the "quiet" profile will be implemented with a further patchv2: added
platform_profile_remove()missing calldrivers/platform/x86/hp-wmi.c | 103 ++++++++++++++++++++++++++++++++-- 1 file changed, 98 insertions(+), 5 deletions(-)drivers/platform/x86/hp-wmi.c +7
-0@@ -21,6 +21,7 @@#include <linux/input.h> #include <linux/input/sparse-keymap.h> #include <linux/platform_device.h> +#include <linux/platform_profile.h> #include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/string.h> @@ -119,6 +120,12 @@ enum hp_wireless2_bits { HPWMI_POWER_FW_OR_HW = HPWMI_POWER_BIOS | HPWMI_POWER_HARD, }; +enum hp_thermal_profile { +HP_THERMAL_PROFILE_PERFORMANCE =0x00 , +HP_THERMAL_PROFILE_DEFAULT =0x01 , +HP_THERMAL_PROFILE_COOL =0x02 +}; +#define IS_HWBLOCKED (x) ((x & HPWMI_POWER_FW_OR_HW) != HPWMI_POWER_FW_OR_HW)#define IS_SWBLOCKED (x) !(x & HPWMI_POWER_SOFT)
drivers/platform/x86/hp-wmi.c static const struct key_entry hp_wmi_keymap[] = { · line 170
Quoted 5 lines
drivers/platform/x86/hp-wmi.c +2
-0@@ -159,6 +166,8 @@ static const struct key_entry hp_wmi_keymap[] = {static struct input_dev *hp_wmi_input_dev;static struct platform_device *hp_wmi_platform_dev; +static struct platform_profile_handler platform_profile_handler; +static int platform_profile_support =0 ;
I suggest you use bool and omit the initialization (checkpatch will warn you about that).
Quoted 7 lines
drivers/platform/x86/hp-wmi.c +0
-0static struct rfkill *wifi_rfkill;static struct rfkill *bluetooth_rfkill;@@ -869,11 +878,80 @@ static int __init hp_wmi_rfkill2_setup(struct platform_device *device)return err; }
drivers/platform/x86/hp-wmi.c static int __init hp_wmi_rfkill2_setup(struct platform_device *device) · line 888
Quoted 10 lines
drivers/platform/x86/hp-wmi.c +5
-2-static int thermal_profile_setup (struct platform_device *device) +static int thermal_profile_get (void ) { -int err, tp; +int tp; tp =hp_wmi_read_int (HPWMI_THERMAL_PROFILE_QUERY ); + +return tp; +}
Is there any reason why you didn't write
return hp_wmi_read_int(...);
?
drivers/platform/x86/hp-wmi.c static int __init hp_wmi_rfkill2_setup(struct platform_device *device) · line 900
Quoted 12 lines
drivers/platform/x86/hp-wmi.c +12
-0+ +static int thermal_profile_set (int thermal_profile) +{ +int err; + + err =hp_wmi_perform_query (HPWMI_THERMAL_PROFILE_QUERY ,HPWMI_WRITE , &thermal_profile, +sizeof (thermal_profile),0 ); +if (err) +return err; + +return 0 ; +}
Here as well?
Quoted 8 lines
drivers/platform/x86/hp-wmi.c +8
-0+ +static int platform_profile_get (struct platform_profile_handler *pprof, +enum platform_profile_option *profile) +{ +int tp =thermal_profile_get (); + +switch (tp) { +case HP_THERMAL_PROFILE_PERFORMANCE :
drivers/platform/x86/hp-wmi.c static int __init hp_wmi_rfkill2_setup(struct platform_device *device) · line 918
Quoted 10 lines
drivers/platform/x86/hp-wmi.c +10
-0+ *profile =PLATFORM_PROFILE_PERFORMANCE ; +break ; +case HP_THERMAL_PROFILE_DEFAULT : + *profile =PLATFORM_PROFILE_BALANCED ; +break ; +case HP_THERMAL_PROFILE_COOL : + *profile =PLATFORM_PROFILE_COOL ; +break ; +default : +return -EINVAL ;
I think error values (tp < 0) could possibly be propagated.
Quoted 75 lines
drivers/platform/x86/hp-wmi.c +51
-3+ } + +return 0 ; +} + +static int platform_profile_set (struct platform_profile_handler *pprof, +enum platform_profile_option profile) +{ +int err, tp; + +switch (profile) { +case PLATFORM_PROFILE_PERFORMANCE : + tp =HP_THERMAL_PROFILE_PERFORMANCE ; +break ; +case PLATFORM_PROFILE_BALANCED : + tp =HP_THERMAL_PROFILE_DEFAULT ; +break ; +case PLATFORM_PROFILE_COOL : + tp =HP_THERMAL_PROFILE_COOL ; +break ; +default : +return -EOPNOTSUPP ; + } + + err =thermal_profile_set (tp); +if (err) +return err; + +return 0 ; +} + +static int thermal_profile_setup (void ) +{ +int err, tp; + + tp =thermal_profile_get ();if (tp <0 )return tp;@@ -881,11 +959,23 @@ static int thermal_profile_setup(struct platform_device *device)* call thermal profile write command to ensure that the firmware correctly * sets the OEM variables for the DPTF */ - err =hp_wmi_perform_query (HPWMI_THERMAL_PROFILE_QUERY ,HPWMI_WRITE , &tp, -sizeof (tp),0 ); + err =thermal_profile_set (tp);if (err)return err; + platform_profile_handler.profile_get = platform_profile_get, + platform_profile_handler.profile_set = platform_profile_set, + +set_bit (PLATFORM_PROFILE_COOL , platform_profile_handler.choices); +set_bit (PLATFORM_PROFILE_BALANCED , platform_profile_handler.choices); +set_bit (PLATFORM_PROFILE_PERFORMANCE , platform_profile_handler.choices); + + err =platform_profile_register (&platform_profile_handler); +if (err) +return err; + + platform_profile_support =1 ; +return 0 ; }@@ -900,7 +990,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)if (hp_wmi_rfkill_setup (device))hp_wmi_rfkill2_setup (device); -thermal_profile_setup (device); +thermal_profile_setup ();return 0 ; }
drivers/platform/x86/hp-wmi.c static void __exit hp_wmi_exit(void) · line 1125
Quoted 6 lines
drivers/platform/x86/hp-wmi.c +3
-0@@ -1030,5 +1120,8 @@ static void __exit hp_wmi_exit(void)platform_device_unregister (hp_wmi_platform_dev);platform_driver_unregister (&hp_wmi_driver); } + +if (platform_profile_support) +platform_profile_remove ();
I personally don't like the asymmetry that hp_wmi_bios_setup() registers (even if only indirectly), but hp_wmi_exit() removes. I'd put this in hp_wmi_bios_remove().
Quoted 4 lines
drivers/platform/x86/hp-wmi.c +0
-1}module_exit (hp_wmi_exit); --2.29.2
Regards,
Barnabás Pőcze
PATCH v3 2/2 platform/x86: hp-wmi: add platform profile support
Implement support for cool, balanced and performance thermal profile
---
the "quiet" profile will be implemented with a further patch
v2: added platform_profile_remove() missing call
v3: apply Barnabás suggestions
drivers/platform/x86/hp-wmi.c | 97 +++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 5 deletions(-)
drivers/platform/x86/hp-wmi.c +92 -5
@@ -21,6 +21,7 @@#include <linux/input.h> #include <linux/input/sparse-keymap.h> #include <linux/platform_device.h> +#include <linux/platform_profile.h> #include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/string.h>
@@ -119,6 +120,12 @@ enum hp_wireless2_bits { HPWMI_POWER_FW_OR_HW = HPWMI_POWER_BIOS | HPWMI_POWER_HARD, }; +enum hp_thermal_profile { +HP_THERMAL_PROFILE_PERFORMANCE =0x00 , +HP_THERMAL_PROFILE_DEFAULT =0x01 , +HP_THERMAL_PROFILE_COOL =0x02 +}; +#define IS_HWBLOCKED (x) ((x & HPWMI_POWER_FW_OR_HW) != HPWMI_POWER_FW_OR_HW)#define IS_SWBLOCKED (x) !(x & HPWMI_POWER_SOFT)
@@ -159,6 +166,8 @@ static const struct key_entry hp_wmi_keymap[] = {static struct input_dev *hp_wmi_input_dev;static struct platform_device *hp_wmi_platform_dev; +static struct platform_profile_handler platform_profile_handler; +static bool platform_profile_support;static struct rfkill *wifi_rfkill;static struct rfkill *bluetooth_rfkill;
@@ -869,11 +878,74 @@ static int __init hp_wmi_rfkill2_setup(struct platform_device *device)return err; } -static int thermal_profile_setup (struct platform_device *device) +static int thermal_profile_get (void ) +{ +return hp_wmi_read_int (HPWMI_THERMAL_PROFILE_QUERY ); +} + +static int thermal_profile_set (int thermal_profile) +{ +return hp_wmi_perform_query (HPWMI_THERMAL_PROFILE_QUERY ,HPWMI_WRITE , &thermal_profile, +sizeof (thermal_profile),0 ); +} + +static int platform_profile_get (struct platform_profile_handler *pprof, +enum platform_profile_option *profile) +{ +int tp; + + tp =thermal_profile_get (); +if (tp <0 ) +return tp; + +switch (tp) { +case HP_THERMAL_PROFILE_PERFORMANCE : + *profile =PLATFORM_PROFILE_PERFORMANCE ; +break ; +case HP_THERMAL_PROFILE_DEFAULT : + *profile =PLATFORM_PROFILE_BALANCED ; +break ; +case HP_THERMAL_PROFILE_COOL : + *profile =PLATFORM_PROFILE_COOL ; +break ; +default : +return -EINVAL ; + } + +return 0 ; +} + +static int platform_profile_set (struct platform_profile_handler *pprof, +enum platform_profile_option profile) {int err, tp; - tp =hp_wmi_read_int (HPWMI_THERMAL_PROFILE_QUERY ); +switch (profile) { +case PLATFORM_PROFILE_PERFORMANCE : + tp =HP_THERMAL_PROFILE_PERFORMANCE ; +break ; +case PLATFORM_PROFILE_BALANCED : + tp =HP_THERMAL_PROFILE_DEFAULT ; +break ; +case PLATFORM_PROFILE_COOL : + tp =HP_THERMAL_PROFILE_COOL ; +break ; +default : +return -EOPNOTSUPP ; + } + + err =thermal_profile_set (tp); +if (err) +return err; + +return 0 ; +} + +static int thermal_profile_setup (void ) +{ +int err, tp; + + tp =thermal_profile_get ();if (tp <0 )return tp;
@@ -881,11 +953,23 @@ static int thermal_profile_setup(struct platform_device *device)* call thermal profile write command to ensure that the firmware correctly * sets the OEM variables for the DPTF */ - err =hp_wmi_perform_query (HPWMI_THERMAL_PROFILE_QUERY ,HPWMI_WRITE , &tp, -sizeof (tp),0 ); + err =thermal_profile_set (tp);if (err)return err; + platform_profile_handler.profile_get = platform_profile_get, + platform_profile_handler.profile_set = platform_profile_set, + +set_bit (PLATFORM_PROFILE_COOL , platform_profile_handler.choices); +set_bit (PLATFORM_PROFILE_BALANCED , platform_profile_handler.choices); +set_bit (PLATFORM_PROFILE_PERFORMANCE , platform_profile_handler.choices); + + err =platform_profile_register (&platform_profile_handler); +if (err) +return err; + + platform_profile_support = true; +return 0 ; }
@@ -900,7 +984,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)if (hp_wmi_rfkill_setup (device))hp_wmi_rfkill2_setup (device); -thermal_profile_setup (device); +thermal_profile_setup ();return 0 ; }
@@ -927,6 +1011,9 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device)rfkill_destroy (wwan_rfkill); } +if (platform_profile_support) +platform_profile_remove (); +return 0 ; }
Signature · 1 line
2.29.2
Hi,
Quoted 3 lines · Elia Devito
Implement support for cool, balanced and performance thermal profile
Signed-off-by Elia Devito <[email protected]>
Thanks, patch looks good to me:
I will merge this once we are out of the merge-window / once 5.12-rc1 is out.
Regards,
Hans
Quoted 166 lines
---
the "quiet" profile will be implemented with a further patchv2: added
platform_profile_remove()missing call
v3: apply Barnabás suggestionsdrivers/platform/x86/hp-wmi.c | 97 +++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 5 deletions(-)drivers/platform/x86/hp-wmi.c +92
-5@@ -21,6 +21,7 @@#include <linux/input.h> #include <linux/input/sparse-keymap.h> #include <linux/platform_device.h> +#include <linux/platform_profile.h> #include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/string.h> @@ -119,6 +120,12 @@ enum hp_wireless2_bits { HPWMI_POWER_FW_OR_HW = HPWMI_POWER_BIOS | HPWMI_POWER_HARD, }; +enum hp_thermal_profile { +HP_THERMAL_PROFILE_PERFORMANCE =0x00 , +HP_THERMAL_PROFILE_DEFAULT =0x01 , +HP_THERMAL_PROFILE_COOL =0x02 +}; +#define IS_HWBLOCKED (x) ((x & HPWMI_POWER_FW_OR_HW) != HPWMI_POWER_FW_OR_HW)#define IS_SWBLOCKED (x) !(x & HPWMI_POWER_SOFT)@@ -159,6 +166,8 @@ static const struct key_entry hp_wmi_keymap[] = {static struct input_dev *hp_wmi_input_dev;static struct platform_device *hp_wmi_platform_dev; +static struct platform_profile_handler platform_profile_handler; +static bool platform_profile_support;static struct rfkill *wifi_rfkill;static struct rfkill *bluetooth_rfkill;@@ -869,11 +878,74 @@ static int __init hp_wmi_rfkill2_setup(struct platform_device *device)return err; } -static int thermal_profile_setup (struct platform_device *device) +static int thermal_profile_get (void ) +{ +return hp_wmi_read_int (HPWMI_THERMAL_PROFILE_QUERY ); +} + +static int thermal_profile_set (int thermal_profile) +{ +return hp_wmi_perform_query (HPWMI_THERMAL_PROFILE_QUERY ,HPWMI_WRITE , &thermal_profile, +sizeof (thermal_profile),0 ); +} + +static int platform_profile_get (struct platform_profile_handler *pprof, +enum platform_profile_option *profile) +{ +int tp; + + tp =thermal_profile_get (); +if (tp <0 ) +return tp; + +switch (tp) { +case HP_THERMAL_PROFILE_PERFORMANCE : + *profile =PLATFORM_PROFILE_PERFORMANCE ; +break ; +case HP_THERMAL_PROFILE_DEFAULT : + *profile =PLATFORM_PROFILE_BALANCED ; +break ; +case HP_THERMAL_PROFILE_COOL : + *profile =PLATFORM_PROFILE_COOL ; +break ; +default : +return -EINVAL ; + } + +return 0 ; +} + +static int platform_profile_set (struct platform_profile_handler *pprof, +enum platform_profile_option profile) {int err, tp; - tp =hp_wmi_read_int (HPWMI_THERMAL_PROFILE_QUERY ); +switch (profile) { +case PLATFORM_PROFILE_PERFORMANCE : + tp =HP_THERMAL_PROFILE_PERFORMANCE ; +break ; +case PLATFORM_PROFILE_BALANCED : + tp =HP_THERMAL_PROFILE_DEFAULT ; +break ; +case PLATFORM_PROFILE_COOL : + tp =HP_THERMAL_PROFILE_COOL ; +break ; +default : +return -EOPNOTSUPP ; + } + + err =thermal_profile_set (tp); +if (err) +return err; + +return 0 ; +} + +static int thermal_profile_setup (void ) +{ +int err, tp; + + tp =thermal_profile_get ();if (tp <0 )return tp;@@ -881,11 +953,23 @@ static int thermal_profile_setup(struct platform_device *device)* call thermal profile write command to ensure that the firmware correctly * sets the OEM variables for the DPTF */ - err =hp_wmi_perform_query (HPWMI_THERMAL_PROFILE_QUERY ,HPWMI_WRITE , &tp, -sizeof (tp),0 ); + err =thermal_profile_set (tp);if (err)return err; + platform_profile_handler.profile_get = platform_profile_get, + platform_profile_handler.profile_set = platform_profile_set, + +set_bit (PLATFORM_PROFILE_COOL , platform_profile_handler.choices); +set_bit (PLATFORM_PROFILE_BALANCED , platform_profile_handler.choices); +set_bit (PLATFORM_PROFILE_PERFORMANCE , platform_profile_handler.choices); + + err =platform_profile_register (&platform_profile_handler); +if (err) +return err; + + platform_profile_support = true; +return 0 ; }@@ -900,7 +984,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)if (hp_wmi_rfkill_setup (device))hp_wmi_rfkill2_setup (device); -thermal_profile_setup (device); +thermal_profile_setup ();return 0 ; }@@ -927,6 +1011,9 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device)rfkill_destroy (wwan_rfkill); } +if (platform_profile_support) +platform_profile_remove (); +return 0 ; }
Hi,
Quoted 8 lines · Elia Devito
Implement support for cool, balanced and performance thermal profile
Signed-off-by Elia Devito <[email protected]>---
the "quiet" profile will be implemented with a further patchv2: added
platform_profile_remove()missing call
v3: apply Barnabás suggestions
Thank you for your patch, I've applied this patch to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while.
Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.
Regards,
Hans
Quoted 161 lines
drivers/platform/x86/hp-wmi.c | 97 +++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 5 deletions(-)drivers/platform/x86/hp-wmi.c +92
-5@@ -21,6 +21,7 @@#include <linux/input.h> #include <linux/input/sparse-keymap.h> #include <linux/platform_device.h> +#include <linux/platform_profile.h> #include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/string.h> @@ -119,6 +120,12 @@ enum hp_wireless2_bits { HPWMI_POWER_FW_OR_HW = HPWMI_POWER_BIOS | HPWMI_POWER_HARD, }; +enum hp_thermal_profile { +HP_THERMAL_PROFILE_PERFORMANCE =0x00 , +HP_THERMAL_PROFILE_DEFAULT =0x01 , +HP_THERMAL_PROFILE_COOL =0x02 +}; +#define IS_HWBLOCKED (x) ((x & HPWMI_POWER_FW_OR_HW) != HPWMI_POWER_FW_OR_HW)#define IS_SWBLOCKED (x) !(x & HPWMI_POWER_SOFT)@@ -159,6 +166,8 @@ static const struct key_entry hp_wmi_keymap[] = {static struct input_dev *hp_wmi_input_dev;static struct platform_device *hp_wmi_platform_dev; +static struct platform_profile_handler platform_profile_handler; +static bool platform_profile_support;static struct rfkill *wifi_rfkill;static struct rfkill *bluetooth_rfkill;@@ -869,11 +878,74 @@ static int __init hp_wmi_rfkill2_setup(struct platform_device *device)return err; } -static int thermal_profile_setup (struct platform_device *device) +static int thermal_profile_get (void ) +{ +return hp_wmi_read_int (HPWMI_THERMAL_PROFILE_QUERY ); +} + +static int thermal_profile_set (int thermal_profile) +{ +return hp_wmi_perform_query (HPWMI_THERMAL_PROFILE_QUERY ,HPWMI_WRITE , &thermal_profile, +sizeof (thermal_profile),0 ); +} + +static int platform_profile_get (struct platform_profile_handler *pprof, +enum platform_profile_option *profile) +{ +int tp; + + tp =thermal_profile_get (); +if (tp <0 ) +return tp; + +switch (tp) { +case HP_THERMAL_PROFILE_PERFORMANCE : + *profile =PLATFORM_PROFILE_PERFORMANCE ; +break ; +case HP_THERMAL_PROFILE_DEFAULT : + *profile =PLATFORM_PROFILE_BALANCED ; +break ; +case HP_THERMAL_PROFILE_COOL : + *profile =PLATFORM_PROFILE_COOL ; +break ; +default : +return -EINVAL ; + } + +return 0 ; +} + +static int platform_profile_set (struct platform_profile_handler *pprof, +enum platform_profile_option profile) {int err, tp; - tp =hp_wmi_read_int (HPWMI_THERMAL_PROFILE_QUERY ); +switch (profile) { +case PLATFORM_PROFILE_PERFORMANCE : + tp =HP_THERMAL_PROFILE_PERFORMANCE ; +break ; +case PLATFORM_PROFILE_BALANCED : + tp =HP_THERMAL_PROFILE_DEFAULT ; +break ; +case PLATFORM_PROFILE_COOL : + tp =HP_THERMAL_PROFILE_COOL ; +break ; +default : +return -EOPNOTSUPP ; + } + + err =thermal_profile_set (tp); +if (err) +return err; + +return 0 ; +} + +static int thermal_profile_setup (void ) +{ +int err, tp; + + tp =thermal_profile_get ();if (tp <0 )return tp;@@ -881,11 +953,23 @@ static int thermal_profile_setup(struct platform_device *device)* call thermal profile write command to ensure that the firmware correctly * sets the OEM variables for the DPTF */ - err =hp_wmi_perform_query (HPWMI_THERMAL_PROFILE_QUERY ,HPWMI_WRITE , &tp, -sizeof (tp),0 ); + err =thermal_profile_set (tp);if (err)return err; + platform_profile_handler.profile_get = platform_profile_get, + platform_profile_handler.profile_set = platform_profile_set, + +set_bit (PLATFORM_PROFILE_COOL , platform_profile_handler.choices); +set_bit (PLATFORM_PROFILE_BALANCED , platform_profile_handler.choices); +set_bit (PLATFORM_PROFILE_PERFORMANCE , platform_profile_handler.choices); + + err =platform_profile_register (&platform_profile_handler); +if (err) +return err; + + platform_profile_support = true; +return 0 ; }@@ -900,7 +984,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)if (hp_wmi_rfkill_setup (device))hp_wmi_rfkill2_setup (device); -thermal_profile_setup (device); +thermal_profile_setup ();return 0 ; }@@ -927,6 +1011,9 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device)rfkill_destroy (wwan_rfkill); } +if (platform_profile_support) +platform_profile_remove (); +return 0 ; }