asus-wmi: Modify fn+f5 and support GPU fan
Luke D. Jones
maintainerv2 cover asus-wmi: Modify fn+f5 and support GPU fan
Some TUF laptops have both fan_boost and thermal_throttle, and some in that group may not actually have an effect on one or the other - this patch series adjusts behaviour to try both. There doesn't appear to be any consistency to check for so far.
Some laptops can also control the GPU fan between auto and boost.
Changelog:
- V2
+ Rebase on review-hans
Luke D. Jones (2):
asus-wmi: Modify behaviour of Fn+F5 fan key
asus-wmi: Support the GPU fan on TUF laptops
drivers/platform/x86/asus-nb-wmi.c | 1 + drivers/platform/x86/asus-wmi.c | 82 ++++++++++++++++++++-- include/linux/platform_data/x86/asus-wmi.h | 1 + 3 files changed, 78 insertions(+), 6 deletions(-)
Signature · 1 line
2.37.2
Luke D. Jones
maintainerPATCH v2 1/2 asus-wmi: Modify behaviour of Fn+F5 fan key
Some more recent TUF laptops have both fan_boost and thermal_throttle. The key code for Fn+F5 is also different and unmapped.
This patch adjusts the asus_wmi_handle_event_code() match to match for both 0x99 and 0xAE, and run both mode switch functions for fan_boost and/or thermal_throttle if either are available.
It is required that both are tried, as in some instances the ACPI set-method for one may not have any code body within it even though it was returned as supported by the get method.
--- drivers/platform/x86/asus-nb-wmi.c | 1 + drivers/platform/x86/asus-wmi.c | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/platform/x86/asus-nb-wmi.c +1 -0
@@ -577,6 +577,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { { KE_KEY, 0xA5, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + TV + HDMI */ { KE_KEY, 0xA6, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + TV + HDMI */ { KE_KEY, 0xA7, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + TV + HDMI */ + { KE_KEY, 0xAE, { KEY_FN_F5 } }, /* Fn+F5 fan mode on 2020+ */ { KE_KEY, 0xB3, { KEY_PROG4 } }, /* AURA */ { KE_KEY, 0xB5, { KEY_CALC } }, { KE_KEY, 0xC4, { KEY_KBDILLUMUP } },
drivers/platform/x86/asus-wmi.c +5 -6
@@ -3190,14 +3190,13 @@ static void asus_wmi_handle_event_code(int code, struct asus_wmi *asus)return ; } -if (asus->fan_boost_mode_available && code ==NOTIFY_KBD_FBM ) { -fan_boost_mode_switch_next (asus); +if (code ==NOTIFY_KBD_FBM || code ==NOTIFY_KBD_TTP ) { +if (asus->fan_boost_mode_available) +fan_boost_mode_switch_next (asus); +if (asus->throttle_thermal_policy_available) +throttle_thermal_policy_switch_next (asus);return ; - } -if (asus->throttle_thermal_policy_available && code ==NOTIFY_KBD_TTP ) { -throttle_thermal_policy_switch_next (asus); -return ; }if (is_display_toggle (code) && asus->driver->quirks->no_display_toggle)
Signature · 1 line
2.37.2
Luke D. Jones
maintainerPATCH v2 2/2 asus-wmi: Support the GPU fan on TUF laptops
In reply to Luke D. JonesAdd support for TUF laptops which have the ability to control the GPU fan. This will show as a second fan in hwmon, and has the ability to run as boost (fullspeed), or auto.
--- drivers/platform/x86/asus-wmi.c | 71 ++++++++++++++++++++++ include/linux/platform_data/x86/asus-wmi.h | 1 + 2 files changed, 72 insertions(+)
drivers/platform/x86/asus-wmi.c +71 -0
@@ -226,7 +226,9 @@ struct asus_wmi {u32 tablet_switch_dev_id;enum fan_type fan_type; +enum fan_type gpu_fan_type;int fan_pwm_mode; +int gpu_fan_pwm_mode;int agfn_pwm;bool fan_boost_mode_available;
@@ -1861,6 +1863,18 @@ static int asus_fan_set_auto(struct asus_wmi *asus)return -ENXIO ; } +/* +* Modern models like the G713 also have GPU fan control (this is not AGFN) +*/ +if (asus->gpu_fan_type ==FAN_TYPE_SPEC83 ) { + status =asus_wmi_set_devstate (ASUS_WMI_DEVID_GPU_FAN_CTRL , +0 , &retval); +if (status) +return status; + +if (retval !=1 ) +return -EIO ; + }return 0 ; }
@@ -2063,9 +2077,57 @@ static ssize_t asus_hwmon_temp1(struct device *dev, deci_kelvin_to_millicelsius(value & 0xFFFF)); } +/* GPU fan on modern ROG laptops */ +static ssize_t pwm2_enable_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct asus_wmi *asus =dev_get_drvdata (dev); + +return sysfs_emit (buf,"%d\n" , asus->gpu_fan_pwm_mode); +} + +static ssize_t pwm2_enable_store (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +struct asus_wmi *asus =dev_get_drvdata (dev); +int state; +int value; +int ret; +u32 retval; + + ret =kstrtouint (buf,10 , &state); +if (ret) +return ret; + +switch (state) {/* standard documented hwmon values */ +case ASUS_FAN_CTRL_FULLSPEED : + value =1 ; +break ; +case ASUS_FAN_CTRL_AUTO : + value =0 ; +break ; +default : +return -EINVAL ; + } + + ret =asus_wmi_set_devstate (ASUS_WMI_DEVID_GPU_FAN_CTRL , + value, &retval); +if (ret) +return ret; + +if (retval !=1 ) +return -EIO ; + + asus->gpu_fan_pwm_mode = state; +return count; +} +/* Fan1 */ static DEVICE_ATTR_RW (pwm1);static DEVICE_ATTR_RW (pwm1_enable); +static DEVICE_ATTR_RW (pwm2_enable);static DEVICE_ATTR_RO (fan1_input);static DEVICE_ATTR_RO (fan1_label);
@@ -2075,6 +2137,7 @@ static DEVICE_ATTR(temp1_input, S_IRUGO, asus_hwmon_temp1, NULL);static struct attribute *hwmon_attributes[] = { &dev_attr_pwm1.attr, &dev_attr_pwm1_enable.attr, + &dev_attr_pwm2_enable.attr, &dev_attr_fan1_input.attr, &dev_attr_fan1_label.attr,
@@ -2097,6 +2160,9 @@ static umode_t asus_hwmon_sysfs_is_visible(struct kobject *kobj, || attr == &dev_attr_pwm1_enable.attr) {if (asus->fan_type ==FAN_TYPE_NONE )return 0 ; + } else if (attr == &dev_attr_pwm2_enable.attr) { +if (asus->gpu_fan_type ==FAN_TYPE_NONE ) +return 0 ; } else if (attr == &dev_attr_temp1_input.attr) { int err = asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_THERMAL_CTRL,
@@ -2139,6 +2205,7 @@ static int asus_wmi_hwmon_init(struct asus_wmi *asus)static int asus_wmi_fan_init (struct asus_wmi *asus) { + asus->gpu_fan_type =FAN_TYPE_NONE ; asus->fan_type =FAN_TYPE_NONE ; asus->agfn_pwm =-1 ;
@@ -2147,6 +2214,10 @@ static int asus_wmi_fan_init(struct asus_wmi *asus)else if (asus_wmi_has_agfn_fan (asus)) asus->fan_type =FAN_TYPE_AGFN ; +/* Modern models like G713 also have GPU fan control */ +if (asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_GPU_FAN_CTRL )) + asus->gpu_fan_type =FAN_TYPE_SPEC83 ; +if (asus->fan_type ==FAN_TYPE_NONE )return -ENODEV ;
include/linux/platform_data/x86/asus-wmi.h +1 -0
@@ -79,6 +79,7 @@#define ASUS_WMI_DEVID_THERMAL_CTRL 0x00110011#define ASUS_WMI_DEVID_FAN_CTRL 0x00110012/* deprecated */ #define ASUS_WMI_DEVID_CPU_FAN_CTRL 0x00110013 +#define ASUS_WMI_DEVID_GPU_FAN_CTRL 0x00110014#define ASUS_WMI_DEVID_CPU_FAN_CURVE 0x00110024#define ASUS_WMI_DEVID_GPU_FAN_CURVE 0x00110025
Signature · 1 line
2.37.2
Hi,
Quoted 7 lines · Luke D. Jones
Some TUF laptops have both
fan_boostandthermal_throttle, and some in that group may not actually have an effect on one or the other - this patch series adjusts behaviour to try both. There doesn't appear to be any consistency to check for so far.Some laptops can also control the GPU fan between auto and boost.
Quoted 7 lines
Changelog:
- V2
+ Rebase on review-hansLuke D. Jones (2):
asus-wmi: Modify behaviour of Fn+F5 fan key
asus-wmi: Support the GPU fan on TUF laptops
Thank you for your patch-series, I've applied the series 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