asus-wmi: add new features, clean up, fixes
Luke D. Jones
maintainercover asus-wmi: add new features, clean up, fixes
This patch series touches quite a few things along with adding support for some new features.
- Add support for mini-LED on 2024 ROG lpatops
- Add support for the gpu MUX WMI call on Vivobook laptops
- Add support for the POST boot sound on ROG laptops
- Add support for MCU power-save (ROG Ally only, saves more power on suspend)
- Store written values for ppt_* features
- Small formatting cleanup
- Small fixes to cleanup struct holes found with pahole
Obsoletes:
- https://lore.kernel.org/all/[email protected]/
- https://lore.kernel.org/all/[email protected]/
- https://lore.kernel.org/all/[email protected]/
- https://lore.kernel.org/all/[email protected]/
- https://lore.kernel.org/all/[email protected]/
Changelog:
- V1
- Mini-LED: use asus_wmi_get_devstate() and not asus_wmi_get_devstate_simple()
- Fix dates in Documentation/ABI/testing/sysfs-platform-asus-wmi
- Remove <name>_available bools and rely on devid for:
- gpu_mux
- mini_led
- kbd_rgb (TUF RGB LED)
Luke D. Jones (9):
platform/x86: asus-wmi: add support for 2024 ROG Mini-LED platform/x86: asus-wmi: add support for Vivobook GPU MUX platform/x86: asus-wmi: add support variant of TUF RGB platform/x86: asus-wmi: support toggling POST sound platform/x86: asus-wmi: store a min default for ppt options platform/x86: asus-wmi: adjust formatting of ppt-<name>() functions platform/x86: asus-wmi: ROG Ally increase wait time, allow MCU
powersave
platform/x86: asus-wmi: Add support for MCU powersave platform/x86: asus-wmi: cleanup main struct to avoid some holes
.../ABI/testing/sysfs-platform-asus-wmi | 26 ++ drivers/platform/x86/asus-wmi.c | 396 ++++++++++++++---- include/linux/platform_data/x86/asus-wmi.h | 6 + 3 files changed, 341 insertions(+), 87 deletions(-)
Signature · 1 line
2.44.0
Luke D. Jones
maintainerPATCH 1/9 platform/x86: asus-wmi: add support for 2024 ROG Mini-LED
Support the 2024 mini-led backlight and adjust the related functions to select the relevant dev-id. Also add available_mini_led_mode to the platform sysfs since the available mini-led levels can be different.
--- .../ABI/testing/sysfs-platform-asus-wmi | 8 ++ drivers/platform/x86/asus-wmi.c | 81 ++++++++++++++++--- include/linux/platform_data/x86/asus-wmi.h | 1 + 3 files changed, 79 insertions(+), 11 deletions(-)
Documentation/ABI/testing/sysfs-platform-asus-wmi +8 -0
@@ -126,6 +126,14 @@ Description: Change the mini-LED mode: * 0 - Single-zone, * 1 - Multi-zone + * 2 - Multi-zone strong (available on newer generation mini-led) + +What: /sys/devices/platform/<platform>/available_mini_led_mode +Date: Apr 2024 +KernelVersion: 6.10 +Contact: "Luke Jones" <[email protected]> +Description: + List the available mini-led modes. What: /sys/devices/platform/<platform>/ppt_pl1_spl Date: Jun 2023
drivers/platform/x86/asus-wmi.c +70 -11
130 lines not on this page · raw message
include/linux/platform_data/x86/asus-wmi.h +1 -0
@@ -71,6 +71,7 @@#define ASUS_WMI_DEVID_LID_FLIP 0x00060062#define ASUS_WMI_DEVID_LID_FLIP_ROG 0x00060077#define ASUS_WMI_DEVID_MINI_LED_MODE 0x0005001E +#define ASUS_WMI_DEVID_MINI_LED_MODE2 0x0005002E/* Storage */ #define ASUS_WMI_DEVID_CARDREADER 0x00080013
Signature · 1 line
2.44.0
Luke D. Jones
maintainerPATCH 2/9 platform/x86: asus-wmi: add support for Vivobook GPU MUX
In reply to Luke D. JonesAdd support for the Vivobook dgpu MUX available on the ASUS Viviobook and some of the other ranges (Zen).
This MUX functions exactly the same as the existing ROG MUX support so the existing functionality now detects which MUX is available and uses that for control.
--- drivers/platform/x86/asus-wmi.c | 23 +++++++++++++--------- include/linux/platform_data/x86/asus-wmi.h | 1 + 2 files changed, 15 insertions(+), 9 deletions(-)
drivers/platform/x86/asus-wmi.c +14 -9
@@ -259,7 +259,7 @@ struct asus_wmi {bool egpu_enable_available;bool egpu_connect_available;bool dgpu_disable_available; -bool gpu_mux_mode_available; +u32 gpu_mux_dev;/* Tunables provided by ASUS for gaming laptops */ bool ppt_pl2_sppt_available;
@@ -682,8 +682,8 @@ static ssize_t dgpu_disable_store(struct device *dev,if (disable >1 )return -EINVAL ; -if (asus->gpu_mux_mode_available) { - result =asus_wmi_get_devstate_simple (asus,ASUS_WMI_DEVID_GPU_MUX ); +if (asus->gpu_mux_dev) { + result =asus_wmi_get_devstate_simple (asus, asus->gpu_mux_dev);if (result <0 )/* An error here may signal greater failure of GPU handling */ return result;
@@ -748,8 +748,8 @@ static ssize_t egpu_enable_store(struct device *dev,return err; } -if (asus->gpu_mux_mode_available) { - result =asus_wmi_get_devstate_simple (asus,ASUS_WMI_DEVID_GPU_MUX ); +if (asus->gpu_mux_dev) { + result =asus_wmi_get_devstate_simple (asus, asus->gpu_mux_dev);if (result <0 ) {/* An error here may signal greater failure of GPU handling */ pr_warn ("Failed to get gpu mux status: %d\n" , result);
@@ -802,7 +802,7 @@ static ssize_t gpu_mux_mode_show(struct device *dev,struct asus_wmi *asus =dev_get_drvdata (dev);int result; - result =asus_wmi_get_devstate_simple (asus,ASUS_WMI_DEVID_GPU_MUX ); + result =asus_wmi_get_devstate_simple (asus, asus->gpu_mux_dev);if (result <0 )return result;
@@ -848,7 +848,7 @@ static ssize_t gpu_mux_mode_store(struct device *dev, } } - err =asus_wmi_set_devstate (ASUS_WMI_DEVID_GPU_MUX , optimus, &result); + err =asus_wmi_set_devstate (asus->gpu_mux_dev, optimus, &result);if (err) {dev_err (dev,"Failed to set GPU MUX mode: %d\n" , err);return err;
@@ -4221,7 +4221,7 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj,else if (attr == &dev_attr_dgpu_disable.attr) ok = asus->dgpu_disable_available;else if (attr == &dev_attr_gpu_mux_mode.attr) - ok = asus->gpu_mux_mode_available; + ok = asus->gpu_mux_dev !=0 ;else if (attr == &dev_attr_fan_boost_mode.attr) ok = asus->fan_boost_mode_available;else if (attr == &dev_attr_throttle_thermal_policy.attr)
@@ -4487,7 +4487,6 @@ static int asus_wmi_add(struct platform_device *pdev) asus->egpu_enable_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_EGPU ); asus->egpu_connect_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_EGPU_CONNECTED ); asus->dgpu_disable_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_DGPU ); - asus->gpu_mux_mode_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_GPU_MUX ); asus->kbd_rgb_mode_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_TUF_RGB_MODE ); asus->kbd_rgb_state_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_TUF_RGB_STATE ); asus->ppt_pl2_sppt_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_PPT_PL2_SPPT );
@@ -4507,6 +4506,12 @@ static int asus_wmi_add(struct platform_device *pdev) asus->mini_led_dev_id =ASUS_WMI_DEVID_MINI_LED_MODE2 ; } +if (asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_GPU_MUX )) { + asus->gpu_mux_dev =ASUS_WMI_DEVID_GPU_MUX ; + }else if (asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_GPU_MUX_VIVO )) { + asus->gpu_mux_dev =ASUS_WMI_DEVID_GPU_MUX_VIVO ; + } + err =fan_boost_mode_check_present (asus);if (err) goto fail_fan_boost_mode;
include/linux/platform_data/x86/asus-wmi.h +1 -0
@@ -128,6 +128,7 @@/* gpu mux switch, 0 = dGPU, 1 = Optimus */ #define ASUS_WMI_DEVID_GPU_MUX 0x00090016 +#define ASUS_WMI_DEVID_GPU_MUX_VIVO 0x00090026/* TUF laptop RGB modes/colours */ #define ASUS_WMI_DEVID_TUF_RGB_MODE 0x00100056
Signature · 1 line
2.44.0
Luke D. Jones
maintainerPATCH 3/9 platform/x86: asus-wmi: add support variant of TUF RGB
In reply to Luke D. JonesAdds support for a second TUF RGB wmi call that some versions of the TUF laptop come with. Also adjusts existing support to select whichever is available.
--- drivers/platform/x86/asus-wmi.c | 14 ++++++++++---- include/linux/platform_data/x86/asus-wmi.h | 1 + 2 files changed, 11 insertions(+), 4 deletions(-)
drivers/platform/x86/asus-wmi.c +10 -4
@@ -270,7 +270,7 @@ struct asus_wmi {bool nv_dyn_boost_available;bool nv_temp_tgt_available; -bool kbd_rgb_mode_available; +u32 kbd_rgb_dev;bool kbd_rgb_state_available;bool throttle_thermal_policy_available;
@@ -870,6 +870,7 @@ static ssize_t kbd_rgb_mode_store(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { + struct asus_wmi *asus = dev_get_drvdata(dev);u32 cmd, mode, r, g, b, speed;int err;
@@ -906,7 +907,7 @@ static ssize_t kbd_rgb_mode_store(struct device *dev, speed =0xeb ; } - err =asus_wmi_evaluate_method3 (ASUS_WMI_METHODID_DEVS ,ASUS_WMI_DEVID_TUF_RGB_MODE , + err =asus_wmi_evaluate_method3 (ASUS_WMI_METHODID_DEVS , asus->kbd_rgb_dev, cmd | (mode <<8 ) | (r <<16 ) | (g <<24 ), b | (speed <<8 ),NULL );if (err)return err;
@@ -1549,7 +1550,7 @@ static int asus_wmi_led_init(struct asus_wmi *asus) {int rv =0 , num_rgb_groups =0 , led_val; -if (asus->kbd_rgb_mode_available) +if (asus->kbd_rgb_dev) kbd_rgb_mode_groups[num_rgb_groups++] = &kbd_rgb_mode_group;if (asus->kbd_rgb_state_available) kbd_rgb_mode_groups[num_rgb_groups++] = &kbd_rgb_state_group;
@@ -4487,7 +4488,6 @@ static int asus_wmi_add(struct platform_device *pdev) asus->egpu_enable_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_EGPU ); asus->egpu_connect_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_EGPU_CONNECTED ); asus->dgpu_disable_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_DGPU ); - asus->kbd_rgb_mode_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_TUF_RGB_MODE ); asus->kbd_rgb_state_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_TUF_RGB_STATE ); asus->ppt_pl2_sppt_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_PPT_PL2_SPPT ); asus->ppt_pl1_spl_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_PPT_PL1_SPL );
@@ -4512,6 +4512,12 @@ static int asus_wmi_add(struct platform_device *pdev) asus->gpu_mux_dev =ASUS_WMI_DEVID_GPU_MUX_VIVO ; } +if (asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_TUF_RGB_MODE )) { + asus->kbd_rgb_dev =ASUS_WMI_DEVID_TUF_RGB_MODE ; + }else if (asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_TUF_RGB_MODE2 )) { + asus->kbd_rgb_dev =ASUS_WMI_DEVID_TUF_RGB_MODE2 ; + } + err =fan_boost_mode_check_present (asus);if (err) goto fail_fan_boost_mode;
include/linux/platform_data/x86/asus-wmi.h +1 -0
@@ -132,6 +132,7 @@/* TUF laptop RGB modes/colours */ #define ASUS_WMI_DEVID_TUF_RGB_MODE 0x00100056 +#define ASUS_WMI_DEVID_TUF_RGB_MODE2 0x0010005A/* TUF laptop RGB power/state */ #define ASUS_WMI_DEVID_TUF_RGB_STATE 0x00100057
Signature · 1 line
2.44.0
Luke D. Jones
maintainerPATCH 4/9 platform/x86: asus-wmi: support toggling POST sound
In reply to Luke D. JonesAdd support for toggling the BIOS POST sound on some ASUS laptops.
--- .../ABI/testing/sysfs-platform-asus-wmi | 9 ++++ drivers/platform/x86/asus-wmi.c | 51 +++++++++++++++++++ include/linux/platform_data/x86/asus-wmi.h | 3 ++ 3 files changed, 63 insertions(+)
Documentation/ABI/testing/sysfs-platform-asus-wmi +9 -0
@@ -194,3 +194,12 @@ Contact: "Luke Jones" <[email protected]> Description: Set the target temperature limit of the Nvidia dGPU: * min=75, max=87 + +What: /sys/devices/platform/<platform>/boot_sound +Date: Apr 2024 +KernelVersion: 6.10 +Contact: "Luke Jones" <[email protected]> +Description: + Set if the BIOS POST sound is played on boot. + * 0 - False, + * 1 - True
drivers/platform/x86/asus-wmi.c +51 -0
69 lines not on this page · raw message
include/linux/platform_data/x86/asus-wmi.h +3 -0
@@ -137,6 +137,9 @@/* TUF laptop RGB power/state */ #define ASUS_WMI_DEVID_TUF_RGB_STATE 0x00100057 +/* Bootup sound control */ +#define ASUS_WMI_DEVID_BOOT_SOUND 0x00130022 +/* DSTS masks */ #define ASUS_WMI_DSTS_STATUS_BIT 0x00000001#define ASUS_WMI_DSTS_UNKNOWN_BIT 0x00000002
Signature · 1 line
2.44.0
Luke D. Jones
maintainerPATCH 5/9 platform/x86: asus-wmi: store a min default for ppt options
In reply to Luke D. JonesLaptops with any of the ppt or nv tunables default to the minimum setting on boot so we can safely assume a stored value is correct.
This patch adds storing of those values in the local struct, and enables reading of those values back. To prevent creating a series of byte holes in the struct the "<name>_available" bool is removed and asus_sysfs_is_visible() uses the ASUS_WMI_DEVID_<name> directly.
--- drivers/platform/x86/asus-wmi.c | 127 +++++++++++++++++++++++++------- 1 file changed, 99 insertions(+), 28 deletions(-)
drivers/platform/x86/asus-wmi.c +99 -28
@@ -262,13 +262,13 @@ struct asus_wmi {u32 gpu_mux_dev;/* Tunables provided by ASUS for gaming laptops */ -bool ppt_pl2_sppt_available; -bool ppt_pl1_spl_available; -bool ppt_apu_sppt_available; -bool ppt_plat_sppt_available; -bool ppt_fppt_available; -bool nv_dyn_boost_available; -bool nv_temp_tgt_available; +u32 ppt_pl2_sppt; +u32 ppt_pl1_spl; +u32 ppt_apu_sppt; +u32 ppt_platform_sppt; +u32 ppt_fppt; +u32 nv_dynamic_boost; +u32 nv_temp_target;u32 kbd_rgb_dev;bool kbd_rgb_state_available;
@@ -1020,11 +1020,21 @@ static ssize_t ppt_pl2_sppt_store(struct device *dev,return -EIO ; } + asus->ppt_pl2_sppt = value;sysfs_notify (&asus->platform_device->dev.kobj,NULL ,"ppt_pl2_sppt" );return count; } -static DEVICE_ATTR_WO (ppt_pl2_sppt); + +static ssize_t ppt_pl2_sppt_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->ppt_pl2_sppt); +} +static DEVICE_ATTR_RW (ppt_pl2_sppt);/* Tunable: PPT, Intel=PL1, AMD=SPL ******************************************/ static ssize_t ppt_pl1_spl_store(struct device *dev,
@@ -1054,11 +1064,20 @@ static ssize_t ppt_pl1_spl_store(struct device *dev,return -EIO ; } + asus->ppt_pl1_spl = value;sysfs_notify (&asus->platform_device->dev.kobj,NULL ,"ppt_pl1_spl" );return count; } -static DEVICE_ATTR_WO (ppt_pl1_spl); +static ssize_t ppt_pl1_spl_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->ppt_pl1_spl); +} +static DEVICE_ATTR_RW (ppt_pl1_spl);/* Tunable: PPT APU FPPT ******************************************************/ static ssize_t ppt_fppt_store(struct device *dev,
@@ -1088,11 +1107,21 @@ static ssize_t ppt_fppt_store(struct device *dev,return -EIO ; } + asus->ppt_fppt = value;sysfs_notify (&asus->platform_device->dev.kobj,NULL ,"ppt_fpu_sppt" );return count; } -static DEVICE_ATTR_WO (ppt_fppt); + +static ssize_t ppt_fppt_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->ppt_fppt); +} +static DEVICE_ATTR_RW (ppt_fppt);/* Tunable: PPT APU SPPT *****************************************************/ static ssize_t ppt_apu_sppt_store(struct device *dev,
@@ -1122,11 +1151,21 @@ static ssize_t ppt_apu_sppt_store(struct device *dev,return -EIO ; } + asus->ppt_apu_sppt = value;sysfs_notify (&asus->platform_device->dev.kobj,NULL ,"ppt_apu_sppt" );return count; } -static DEVICE_ATTR_WO (ppt_apu_sppt); + +static ssize_t ppt_apu_sppt_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->ppt_apu_sppt); +} +static DEVICE_ATTR_RW (ppt_apu_sppt);/* Tunable: PPT platform SPPT ************************************************/ static ssize_t ppt_platform_sppt_store(struct device *dev,
@@ -1156,11 +1195,21 @@ static ssize_t ppt_platform_sppt_store(struct device *dev,return -EIO ; } + asus->ppt_platform_sppt = value;sysfs_notify (&asus->platform_device->dev.kobj,NULL ,"ppt_platform_sppt" );return count; } -static DEVICE_ATTR_WO (ppt_platform_sppt); + +static ssize_t ppt_platform_sppt_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->ppt_platform_sppt); +} +static DEVICE_ATTR_RW (ppt_platform_sppt);/* Tunable: NVIDIA dynamic boost *********************************************/ static ssize_t nv_dynamic_boost_store(struct device *dev,
@@ -1190,11 +1239,21 @@ static ssize_t nv_dynamic_boost_store(struct device *dev,return -EIO ; } + asus->nv_dynamic_boost = value;sysfs_notify (&asus->platform_device->dev.kobj,NULL ,"nv_dynamic_boost" );return count; } -static DEVICE_ATTR_WO (nv_dynamic_boost); + +static ssize_t nv_dynamic_boost_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->nv_dynamic_boost); +} +static DEVICE_ATTR_RW (nv_dynamic_boost);/* Tunable: NVIDIA temperature target ****************************************/ static ssize_t nv_temp_target_store(struct device *dev,
@@ -1224,11 +1283,21 @@ static ssize_t nv_temp_target_store(struct device *dev,return -EIO ; } + asus->nv_temp_target = value;sysfs_notify (&asus->platform_device->dev.kobj,NULL ,"nv_temp_target" );return count; } -static DEVICE_ATTR_WO (nv_temp_target); + +static ssize_t nv_temp_target_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->nv_temp_target); +} +static DEVICE_ATTR_RW (nv_temp_target);/* Battery ********************************************************************/
@@ -4277,19 +4346,19 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj,else if (attr == &dev_attr_throttle_thermal_policy.attr) ok = asus->throttle_thermal_policy_available;else if (attr == &dev_attr_ppt_pl2_sppt.attr) - ok = asus->ppt_pl2_sppt_available; + devid =ASUS_WMI_DEVID_PPT_PL2_SPPT ;else if (attr == &dev_attr_ppt_pl1_spl.attr) - ok = asus->ppt_pl1_spl_available; + devid =ASUS_WMI_DEVID_PPT_PL1_SPL ;else if (attr == &dev_attr_ppt_fppt.attr) - ok = asus->ppt_fppt_available; + devid =ASUS_WMI_DEVID_PPT_FPPT ;else if (attr == &dev_attr_ppt_apu_sppt.attr) - ok = asus->ppt_apu_sppt_available; + devid =ASUS_WMI_DEVID_PPT_APU_SPPT ;else if (attr == &dev_attr_ppt_platform_sppt.attr) - ok = asus->ppt_plat_sppt_available; + devid =ASUS_WMI_DEVID_PPT_PLAT_SPPT ;else if (attr == &dev_attr_nv_dynamic_boost.attr) - ok = asus->nv_dyn_boost_available; + devid =ASUS_WMI_DEVID_NV_DYN_BOOST ;else if (attr == &dev_attr_nv_temp_target.attr) - ok = asus->nv_temp_tgt_available; + devid =ASUS_WMI_DEVID_NV_THERM_TARGET ;else if (attr == &dev_attr_boot_sound.attr) devid =ASUS_WMI_DEVID_BOOT_SOUND ;else if (attr == &dev_attr_panel_od.attr)
@@ -4535,18 +4604,20 @@ static int asus_wmi_add(struct platform_device *pdev)if (err) goto fail_platform; +/* ensure defaults for tunables */ + asus->ppt_pl2_sppt =5 ; + asus->ppt_pl1_spl =5 ; + asus->ppt_apu_sppt =5 ; + asus->ppt_platform_sppt =5 ; + asus->ppt_fppt =5 ; + asus->nv_dynamic_boost =5 ; + asus->nv_temp_target =75 ; + asus->charge_mode_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_CHARGE_MODE ); asus->egpu_enable_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_EGPU ); asus->egpu_connect_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_EGPU_CONNECTED ); asus->dgpu_disable_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_DGPU ); asus->kbd_rgb_state_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_TUF_RGB_STATE ); - asus->ppt_pl2_sppt_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_PPT_PL2_SPPT ); - asus->ppt_pl1_spl_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_PPT_PL1_SPL ); - asus->ppt_fppt_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_PPT_FPPT ); - asus->ppt_apu_sppt_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_PPT_APU_SPPT ); - asus->ppt_plat_sppt_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_PPT_PLAT_SPPT ); - asus->nv_dyn_boost_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_NV_DYN_BOOST ); - asus->nv_temp_tgt_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_NV_THERM_TARGET ); asus->panel_overdrive_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_PANEL_OD ); asus->ally_mcu_usb_switch =acpi_has_method (NULL ,ASUS_USB0_PWR_EC0_CSEE ) &&dmi_match (DMI_BOARD_NAME ,"RC71L" );
Signature · 1 line
2.44.0
Luke D. Jones
maintainerPATCH 6/9 platform/x86: asus-wmi: adjust formatting of ppt-<name>() functions
In reply to Luke D. JonesShift the call to dev_get_drvdata() up to top of the function block in all of the ppt_<name>() functions as part of a minor cleanup.
--- drivers/platform/x86/asus-wmi.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
drivers/platform/x86/asus-wmi.c +7 -14
@@ -997,11 +997,10 @@ static ssize_t ppt_pl2_sppt_store(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { + struct asus_wmi *asus = dev_get_drvdata(dev);int result, err;u32 value; -struct asus_wmi *asus =dev_get_drvdata (dev); - result =kstrtou32 (buf,10 , &value);if (result)return result;
@@ -1041,11 +1040,10 @@ static ssize_t ppt_pl1_spl_store(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { + struct asus_wmi *asus = dev_get_drvdata(dev);int result, err;u32 value; -struct asus_wmi *asus =dev_get_drvdata (dev); - result =kstrtou32 (buf,10 , &value);if (result)return result;
@@ -1084,11 +1082,10 @@ static ssize_t ppt_fppt_store(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { + struct asus_wmi *asus = dev_get_drvdata(dev);int result, err;u32 value; -struct asus_wmi *asus =dev_get_drvdata (dev); - result =kstrtou32 (buf,10 , &value);if (result)return result;
@@ -1128,11 +1125,10 @@ static ssize_t ppt_apu_sppt_store(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { + struct asus_wmi *asus = dev_get_drvdata(dev);int result, err;u32 value; -struct asus_wmi *asus =dev_get_drvdata (dev); - result =kstrtou32 (buf,10 , &value);if (result)return result;
@@ -1172,11 +1168,10 @@ static ssize_t ppt_platform_sppt_store(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { + struct asus_wmi *asus = dev_get_drvdata(dev);int result, err;u32 value; -struct asus_wmi *asus =dev_get_drvdata (dev); - result =kstrtou32 (buf,10 , &value);if (result)return result;
@@ -1216,11 +1211,10 @@ static ssize_t nv_dynamic_boost_store(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { + struct asus_wmi *asus = dev_get_drvdata(dev);int result, err;u32 value; -struct asus_wmi *asus =dev_get_drvdata (dev); - result =kstrtou32 (buf,10 , &value);if (result)return result;
@@ -1260,11 +1254,10 @@ static ssize_t nv_temp_target_store(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { + struct asus_wmi *asus = dev_get_drvdata(dev);int result, err;u32 value; -struct asus_wmi *asus =dev_get_drvdata (dev); - result =kstrtou32 (buf,10 , &value);if (result)return result;
Signature · 1 line
2.44.0
Luke D. Jones
maintainerPATCH 7/9 platform/x86: asus-wmi: ROG Ally increase wait time, allow MCU powersave
In reply to Luke D. JonesThe previous work to allow the MCU to be resumed correctly after sleep and resume tried to take the shortest possible time. However as work continues in various other parts of the s2idle subsystems it has shown that it wasn't entirely reliable.
If the MCU disable/enable call is done correctly the MCU fully removes its USB endpoints, and this shows as a full USB device reconnection on resume. When we tried to short this as much as possible sometimes the MCU doesn't get to complete what it needs to do before going to low-power and this affected the reconnection.
Through trial it is found that the minimum time required is approx 1200ms to allow a proper disconnect and disable, and the same amount of time on resume is required to prevent a rapid disconnect/reconnect happening on seemingly random occasions. To be safe the time is now 1500ms for msleep.
--- drivers/platform/x86/asus-wmi.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/platform/x86/asus-wmi.c +2 -10
@@ -129,7 +129,7 @@ module_param(fnlock_default, bool, 0444);/* Controls the power state of the USB0 hub on ROG Ally which input is on */ #define ASUS_USB0_PWR_EC0_CSEE "\\_SB.PCI0.SBRG.EC0.CSEE"/* 300ms so far seems to produce a reliable result on AC and battery */ -#define ASUS_USB0_PWR_EC0_CSEE_WAIT 300 +#define ASUS_USB0_PWR_EC0_CSEE_WAIT 1500static const char *const ashs_ids[] = {"ATK4001" ,"ATK4002" ,NULL };
@@ -4814,6 +4814,7 @@ static int asus_hotk_resume_early(struct device *device)struct asus_wmi *asus =dev_get_drvdata (device);if (asus->ally_mcu_usb_switch) { +/* sleep required to prevent USB0 being yanked then reappearing rapidly */ if (ACPI_FAILURE (acpi_execute_simple_method (NULL ,ASUS_USB0_PWR_EC0_CSEE ,0xB8 )))dev_err (device,"ROG Ally MCU failed to connect USB dev\n" );else
@@ -4825,17 +4826,8 @@ static int asus_hotk_resume_early(struct device *device)static int asus_hotk_prepare (struct device *device) {struct asus_wmi *asus =dev_get_drvdata (device); -int result, err;if (asus->ally_mcu_usb_switch) { -/* When powersave is enabled it causes many issues with resume of USB hub */ - result =asus_wmi_get_devstate_simple (asus,ASUS_WMI_DEVID_MCU_POWERSAVE ); -if (result ==1 ) { -dev_warn (device,"MCU powersave enabled, disabling to prevent resume issues" ); - err =asus_wmi_set_devstate (ASUS_WMI_DEVID_MCU_POWERSAVE ,0 , &result); -if (err || result !=1 ) -dev_err (device,"Failed to set MCU powersave mode: %d\n" , err); - }/* sleep required to ensure USB0 is disabled before sleep continues */ if (ACPI_FAILURE (acpi_execute_simple_method (NULL ,ASUS_USB0_PWR_EC0_CSEE ,0xB7 )))dev_err (device,"ROG Ally MCU failed to disconnect USB dev\n" );
Signature · 1 line
2.44.0
Luke D. Jones
maintainerPATCH 8/9 platform/x86: asus-wmi: Add support for MCU powersave
In reply to Luke D. JonesAdd support for an MCU powersave WMI call. This is intended to set the MCU in to a low-power mode when sleeping. This mode can cut sleep power use by around half.
--- .../ABI/testing/sysfs-platform-asus-wmi | 11 +++- drivers/platform/x86/asus-wmi.c | 50 +++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-)
Documentation/ABI/testing/sysfs-platform-asus-wmi +10 -1
@@ -202,4 +202,13 @@ Contact: "Luke Jones" <[email protected]> Description: Set if the BIOS POST sound is played on boot. * 0 - False, - * 1 - True + * 1 - True + +What: /sys/devices/platform/<platform>/mcu_powersave +Date: Apr 2024 +KernelVersion: 6.10 +Contact: "Luke Jones" <[email protected]> +Description: + Set if the MCU can go in to low-power mode on system sleep + * 0 - False, + * 1 - True
drivers/platform/x86/asus-wmi.c +50 -0
68 lines not on this page · raw message
Signature · 1 line
2.44.0
Luke D. Jones
maintainerPATCH 9/9 platform/x86: asus-wmi: cleanup main struct to avoid some holes
In reply to Luke D. JonesReorganises some attr-available calls to remove a few unrequired booleans in the main driver struct which combined with some reorganisation prevents a series of large holes seen with pahole.
--- drivers/platform/x86/asus-wmi.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
drivers/platform/x86/asus-wmi.c +6 -11
@@ -243,6 +243,9 @@ struct asus_wmi {u32 tablet_switch_dev_id;bool tablet_switch_inverted; +/* The ROG Ally device requires the MCU USB device be disconnected before suspend */ +bool ally_mcu_usb_switch; +enum fan_type fan_type;enum fan_type gpu_fan_type;enum fan_type mid_fan_type;
@@ -255,9 +258,7 @@ struct asus_wmi {u8 fan_boost_mode_mask;u8 fan_boost_mode; -bool charge_mode_available;bool egpu_enable_available; -bool egpu_connect_available;bool dgpu_disable_available;u32 gpu_mux_dev;
@@ -298,9 +299,6 @@ struct asus_wmi {bool fnlock_locked; -/* The ROG Ally device requires the MCU USB device be disconnected before suspend */ -bool ally_mcu_usb_switch; -struct asus_wmi_debug debug;struct asus_wmi_driver *driver;
@@ -4373,11 +4371,11 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj,else if (attr == &dev_attr_als_enable.attr) devid =ASUS_WMI_DEVID_ALS_ENABLE ;else if (attr == &dev_attr_charge_mode.attr) - ok = asus->charge_mode_available; + devid =ASUS_WMI_DEVID_CHARGE_MODE ;else if (attr == &dev_attr_egpu_enable.attr) ok = asus->egpu_enable_available;else if (attr == &dev_attr_egpu_connected.attr) - ok = asus->egpu_connect_available; + devid =ASUS_WMI_DEVID_EGPU_CONNECTED ;else if (attr == &dev_attr_dgpu_disable.attr) ok = asus->dgpu_disable_available;else if (attr == &dev_attr_gpu_mux_mode.attr)
@@ -4405,7 +4403,7 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj,else if (attr == &dev_attr_boot_sound.attr) devid =ASUS_WMI_DEVID_BOOT_SOUND ;else if (attr == &dev_attr_panel_od.attr) - ok = asus->panel_overdrive_available; + devid =ASUS_WMI_DEVID_PANEL_OD ;else if (attr == &dev_attr_mini_led_mode.attr) ok = asus->mini_led_dev_id !=0 ;else if (attr == &dev_attr_available_mini_led_mode.attr)
@@ -4656,12 +4654,9 @@ static int asus_wmi_add(struct platform_device *pdev) asus->nv_dynamic_boost =5 ; asus->nv_temp_target =75 ; - asus->charge_mode_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_CHARGE_MODE ); asus->egpu_enable_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_EGPU ); - asus->egpu_connect_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_EGPU_CONNECTED ); asus->dgpu_disable_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_DGPU ); asus->kbd_rgb_state_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_TUF_RGB_STATE ); - asus->panel_overdrive_available =asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_PANEL_OD ); asus->ally_mcu_usb_switch =acpi_has_method (NULL ,ASUS_USB0_PWR_EC0_CSEE ) &&dmi_match (DMI_BOARD_NAME ,"RC71L" );
Signature · 1 line
2.44.0