hid-asus: asus-wmi: refactor Ally suspend/resume
Luke Jones
maintainerv2 cover hid-asus: asus-wmi: refactor Ally suspend/resume
This short series refactors the Ally suspend/resume functionality in the asus-wmi driver along with adding support for ROG Ally MCU version checking.
The version checking is then used to toggle the use of older CSEE call hacks that were initially used to combat Ally suspend/wake issues arising from the MCU not clearing a particular flag on resume. ASUS have since corrected this especially for Linux in newer firmware versions.
- hid-asus requests the MCU version and displays a warning if the version is older than the one that fixes the issue.
- hid-asus awill also toggle the CSEE hack off, and mcu_powersave to on if the version is high enough.
- Changelog:
+ V2:
- Adjust warning message to explicitly mention suspend issues
- Use switch/case block to set min_version
- Set min_version to 0 by default and toggle hacks off
Luke D. Jones (2):
hid-asus: check ROG Ally MCU version and warn platform/x86: asus-wmi: Refactor Ally suspend/resume
drivers/hid/hid-asus.c | 107 +++++++++++++++++- drivers/platform/x86/asus-wmi.c | 124 ++++++++++++++------- include/linux/platform_data/x86/asus-wmi.h | 15 +++ 3 files changed, 205 insertions(+), 41 deletions(-)
Signature · 1 line
2.48.1
Luke Jones
maintainerPATCH v2 1/2 hid-asus: check ROG Ally MCU version and warn
From: "Luke D. Jones" <[email protected]>
ASUS have fixed suspend issues arising from a flag not being cleared in the MCU FW in both the ROG Ally 1 and the ROG Ally X.
Implement a check and a warning to encourage users to update the FW to a minimum supported version.
--- drivers/hid/hid-asus.c | 103 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 2 deletions(-)
drivers/hid/hid-asus.c +101 -2
@@ -52,6 +52,10 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");#define FEATURE_KBD_LED_REPORT_ID1 0x5d#define FEATURE_KBD_LED_REPORT_ID2 0x5e +#define ROG_ALLY_REPORT_SIZE 64 +#define ROG_ALLY_X_MIN_MCU 313 +#define ROG_ALLY_MIN_MCU 319 +#define SUPPORT_KBD_BACKLIGHT BIT(0)#define MAX_TOUCH_MAJOR 8
@@ -84,6 +88,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");#define QUIRK_MEDION_E1239T BIT(10)#define QUIRK_ROG_NKEY_KEYBOARD BIT(11)#define QUIRK_ROG_CLAYMORE_II_KEYBOARD BIT(12) +#define QUIRK_ROG_ALLY_XPAD BIT(13)#define I2C_KEYBOARD_QUIRKS (QUIRK_FIX_NOTEBOOK_REPORT | \ QUIRK_NO_INIT_REPORTS | \
@@ -534,9 +539,95 @@ static bool asus_kbd_wmi_led_control_present(struct hid_device *hdev)return !!(value &ASUS_WMI_DSTS_PRESENCE_BIT ); } +/* +* We don't care about any other part of the string except the version section. +* Example strings: FGA80100.RC72LA.312_T01, FGA80100.RC71LS.318_T01 +*/ +static int mcu_parse_version_string (const u8 *response,size_t response_size) +{ +const u8 *end = response + response_size; +const u8 *p = response; +int dots, err; +long version; + + dots =0 ; +while (p < end && dots <2 ) { +if (*p++ =='.' ) + dots++; + } + +if (dots !=2 || p >= end) +return -EINVAL ; + + err =kstrtol ((const char *)p,10 , &version); +if (err || version <0 ) +return -EINVAL ; + +return version; +} + +static int mcu_request_version (struct hid_device *hdev) +{ +const u8 request[] = {0x5a ,0x05 ,0x03 ,0x31 ,0x00 ,0x20 }; +u8 *response; +int ret; + + response =kzalloc (ROG_ALLY_REPORT_SIZE ,GFP_KERNEL ); +if (!response) +return -ENOMEM ; + + ret =asus_kbd_set_report (hdev, request,sizeof (request)); +if (ret <0 ) + goto out; + + ret =hid_hw_raw_request (hdev,FEATURE_REPORT_ID , response, +ROG_ALLY_REPORT_SIZE ,HID_FEATURE_REPORT , +HID_REQ_GET_REPORT ); +if (ret <0 ) + goto out; + + ret =mcu_parse_version_string (response,ROG_ALLY_REPORT_SIZE ); + +out: +if (ret <0 ) +hid_err (hdev,"Failed to get MCU version: %d, response: %*ph\n" , + ret,ROG_ALLY_REPORT_SIZE , response); +kfree (response); +return ret; +} + +static void validate_mcu_fw_version (struct hid_device *hdev,int idProduct) +{ +int min_version, version; + + version =mcu_request_version (hdev); +if (version <0 ) +return ; + +switch (idProduct) { +case USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY : + min_version =ROG_ALLY_MIN_MCU ; +break ; +case USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X : + min_version =ROG_ALLY_X_MIN_MCU ; +break ; +default : + min_version =0 ; + } + +hid_info (hdev,"Ally device MCU version: %d\n" , version); +if (version < min_version) { +hid_warn (hdev, +"The MCU firmware version must be %d or greater to avoid issues with suspend.\n" , + min_version); + } +} +static int asus_kbd_register_leds (struct hid_device *hdev) {struct asus_drvdata *drvdata =hid_get_drvdata (hdev); +struct usb_interface *intf; +struct usb_device *udev;unsigned char kbd_func;int ret;
@@ -560,6 +651,14 @@ static int asus_kbd_register_leds(struct hid_device *hdev)if (ret <0 )return ret; } + +if (drvdata->quirks &QUIRK_ROG_ALLY_XPAD ) { + intf =to_usb_interface (hdev->dev.parent); + udev =interface_to_usbdev (intf); +validate_mcu_fw_version (hdev, +le16_to_cpu (udev->descriptor.idProduct)); + } + }else {/* Initialize keyboard */ ret =asus_kbd_init (hdev,FEATURE_KBD_REPORT_ID );
@@ -1280,10 +1379,10 @@ static const struct hid_device_id asus_devices[] = { QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, {HID_USB_DEVICE (USB_VENDOR_ID_ASUSTEK ,USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY ), - QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, + QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_ROG_ALLY_XPAD}, { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X ), - QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, + QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_ROG_ALLY_XPAD }, { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD ), QUIRK_ROG_CLAYMORE_II_KEYBOARD },
Signature · 1 line
2.48.1
Re: [PATCH v2 1/2] hid-asus: check ROG Ally MCU version and warn
Quoted 46 lines · Luke Jones
From: "Luke D. Jones" <[email protected]>
ASUS have fixed suspend issues arising from a flag not being cleared in the MCU FW in both the ROG Ally 1 and the ROG Ally X.
Implement a check and a warning to encourage users to update the FW to a minimum supported version.
Signed-off-by Luke D. Jones <[email protected]>--- drivers/hid/hid-asus.c | 103 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 2 deletions(-)drivers/hid/hid-asus.c +11
-0@@ -52,6 +52,10 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");#define FEATURE_KBD_LED_REPORT_ID1 0x5d#define FEATURE_KBD_LED_REPORT_ID2 0x5e +#define ROG_ALLY_REPORT_SIZE 64 +#define ROG_ALLY_X_MIN_MCU 313 +#define ROG_ALLY_MIN_MCU 319 +#define SUPPORT_KBD_BACKLIGHT BIT(0)#define MAX_TOUCH_MAJOR 8@@ -84,6 +88,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");#define QUIRK_MEDION_E1239T BIT(10)#define QUIRK_ROG_NKEY_KEYBOARD BIT(11)#define QUIRK_ROG_CLAYMORE_II_KEYBOARD BIT(12) +#define QUIRK_ROG_ALLY_XPAD BIT(13)#define I2C_KEYBOARD_QUIRKS (QUIRK_FIX_NOTEBOOK_REPORT | \ QUIRK_NO_INIT_REPORTS | \@@ -534,9 +539,95 @@ static bool asus_kbd_wmi_led_control_present(struct hid_device *hdev)return !!(value &ASUS_WMI_DSTS_PRESENCE_BIT ); } +/* +* We don't care about any other part of the string except the version section. +* Example strings: FGA80100.RC72LA.312_T01, FGA80100.RC71LS.318_T01 +*/ +static int mcu_parse_version_string (const u8 *response,size_t response_size) +{
drivers/hid/hid-asus.c static bool asus_kbd_wmi_led_control_present(struct hid_device *hdev) · line 557
Quoted 10 lines
drivers/hid/hid-asus.c +10
-0+const u8 *end = response + response_size; +const u8 *p = response; +int dots, err; +long version; + + dots =0 ; +while (p < end && dots <2 ) { +if (*p++ =='.' ) + dots++; + }
Did you miss my comment about using strsep() instead?
drivers/hid/hid-asus.c static bool asus_kbd_wmi_led_control_present(struct hid_device *hdev) · line 562
Quoted 5 lines
drivers/hid/hid-asus.c +5
-0+ +if (dots !=2 || p >= end) +return -EINVAL ; + + err =kstrtol ((const char *)p,10 , &version);
It seems a bit odd to me to convert to long only to then convert again to an int (for the return code).
Would it make more sense to jump right to an integer immediately?
Sorry I missed this the first time.
drivers/hid/hid-asus.c static bool asus_kbd_wmi_led_control_present(struct hid_device *hdev) · line 572
Quoted 10 lines
drivers/hid/hid-asus.c +10
-0+if (err || version <0 ) +return -EINVAL ; + +return version; +} + +static int mcu_request_version (struct hid_device *hdev) +{ +const u8 request[] = {0x5a ,0x05 ,0x03 ,0x31 ,0x00 ,0x20 }; +u8 *response;
If you're spinning away, maybe worth using a __free() macro to avoid a manual kfree.
You could also drop the goto statements then and return ret for the failures. Although admittedly you'll lose your error message for the asus_kbd_set_report() and hid_hw_raw_request().
tedly > + int ret;
Quoted 88 lines
drivers/hid/hid-asus.c +64
-2+ + response =kzalloc (ROG_ALLY_REPORT_SIZE ,GFP_KERNEL ); +if (!response) +return -ENOMEM ; + + ret =asus_kbd_set_report (hdev, request,sizeof (request)); +if (ret <0 ) + goto out; + + ret =hid_hw_raw_request (hdev,FEATURE_REPORT_ID , response, +ROG_ALLY_REPORT_SIZE ,HID_FEATURE_REPORT , +HID_REQ_GET_REPORT ); +if (ret <0 ) + goto out; + + ret =mcu_parse_version_string (response,ROG_ALLY_REPORT_SIZE ); + +out: +if (ret <0 ) +hid_err (hdev,"Failed to get MCU version: %d, response: %*ph\n" , + ret,ROG_ALLY_REPORT_SIZE , response); +kfree (response); +return ret; +} + +static void validate_mcu_fw_version (struct hid_device *hdev,int idProduct) +{ +int min_version, version; + + version =mcu_request_version (hdev); +if (version <0 ) +return ; + +switch (idProduct) { +case USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY : + min_version =ROG_ALLY_MIN_MCU ; +break ; +case USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X : + min_version =ROG_ALLY_X_MIN_MCU ; +break ; +default : + min_version =0 ; + } + +hid_info (hdev,"Ally device MCU version: %d\n" , version); +if (version < min_version) { +hid_warn (hdev, +"The MCU firmware version must be %d or greater to avoid issues with suspend.\n" , + min_version); + } +} +static int asus_kbd_register_leds (struct hid_device *hdev) {struct asus_drvdata *drvdata =hid_get_drvdata (hdev); +struct usb_interface *intf; +struct usb_device *udev;unsigned char kbd_func;int ret;@@ -560,6 +651,14 @@ static int asus_kbd_register_leds(struct hid_device *hdev)if (ret <0 )return ret; } + +if (drvdata->quirks &QUIRK_ROG_ALLY_XPAD ) { + intf =to_usb_interface (hdev->dev.parent); + udev =interface_to_usbdev (intf); +validate_mcu_fw_version (hdev, +le16_to_cpu (udev->descriptor.idProduct)); + } + }else {/* Initialize keyboard */ ret =asus_kbd_init (hdev,FEATURE_KBD_REPORT_ID );@@ -1280,10 +1379,10 @@ static const struct hid_device_id asus_devices[] = { QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, {HID_USB_DEVICE (USB_VENDOR_ID_ASUSTEK ,USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY ), - QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, + QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_ROG_ALLY_XPAD}, { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X ), - QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, + QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_ROG_ALLY_XPAD }, { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD ), QUIRK_ROG_CLAYMORE_II_KEYBOARD },
Luke Jones
maintainerPATCH v2 2/2 platform/x86: asus-wmi: Refactor Ally suspend/resume
In reply to Luke JonesFrom: "Luke D. Jones" <[email protected]>
Adjust how the CSEE direct call hack is used.
The results of months of testing combined with help from ASUS to determine the actual cause of suspend issues has resulted in this refactoring which immensely improves the reliability for devices which do not have the following minimum MCU FW version:
- ROG Ally X: 313
- ROG Ally 1: 319
For MCU FW versions that match the minimum or above the CSEE hack is disabled and mcu_powersave set to on by default as there are no negatives beyond a slightly slower device reinitialization due to the MCU being powered off.
As this is set only at module load time, it is still possible for mcu_powersave sysfs attributes to change it at runtime if so desired.
--- drivers/hid/hid-asus.c | 4 + drivers/platform/x86/asus-wmi.c | 124 ++++++++++++++------- include/linux/platform_data/x86/asus-wmi.h | 15 +++ 3 files changed, 104 insertions(+), 39 deletions(-)
drivers/hid/hid-asus.c +4 -0
@@ -620,6 +620,9 @@ static void validate_mcu_fw_version(struct hid_device *hdev, int idProduct)hid_warn (hdev,"The MCU firmware version must be %d or greater to avoid issues with suspend.\n" , min_version); + }else { +set_ally_mcu_hack (false); +set_ally_mcu_powersave (true); } }
@@ -1426,4 +1429,5 @@ static struct hid_driver asus_driver = { };module_hid_driver (asus_driver); +MODULE_IMPORT_NS ("ASUS_WMI" );MODULE_LICENSE ("GPL" );
drivers/platform/x86/asus-wmi.c +85 -39
200 lines not on this page · raw message
include/linux/platform_data/x86/asus-wmi.h +15 -0
@@ -158,8 +158,23 @@#define ASUS_WMI_DSTS_LIGHTBAR_MASK 0x0000000F#if IS_REACHABLE (CONFIG_ASUS_WMI ) +void set_ally_mcu_hack (bool enabled); +void set_ally_mcu_powersave (bool enabled); +int asus_wmi_set_devstate (u32 dev_id,u32 ctrl_param,u32 *retval);int asus_wmi_evaluate_method (u32 method_id,u32 arg0,u32 arg1,u32 *retval);#else +static inline void set_ally_mcu_hack (bool enabled) +{ +return -ENODEV ; +} +static inline void set_ally_mcu_powersave (bool enabled) +{ +return -ENODEV ; +} +static inline int asus_wmi_set_devstate (u32 dev_id,u32 ctrl_param,u32 *retval) +{ +return -ENODEV ; +}static inline int asus_wmi_evaluate_method (u32 method_id,u32 arg0,u32 arg1,u32 *retval) {
Signature · 1 line
2.48.1
Re: [PATCH v2 2/2] platform/x86: asus-wmi: Refactor Ally suspend/resume
Quoted 107 lines · Luke Jones
From: "Luke D. Jones" <[email protected]>
Adjust how the CSEE direct call hack is used.
The results of months of testing combined with help from ASUS to determine the actual cause of suspend issues has resulted in this refactoring which immensely improves the reliability for devices which do not have the following minimum MCU FW version:
- ROG Ally X: 313
- ROG Ally 1: 319For MCU FW versions that match the minimum or above the CSEE hack is disabled and
mcu_powersaveset to on by default as there are no negatives beyond a slightly slower device reinitialization due to the MCU being powered off.As this is set only at module load time, it is still possible for
mcu_powersavesysfs attributes to change it at runtime if so desired.Signed-off-by Luke D. Jones <[email protected]>--- drivers/hid/hid-asus.c | 4 + drivers/platform/x86/asus-wmi.c | 124 ++++++++++++++------- include/linux/platform_data/x86/asus-wmi.h | 15 +++ 3 files changed, 104 insertions(+), 39 deletions(-)drivers/hid/hid-asus.c +4
-0@@ -620,6 +620,9 @@ static void validate_mcu_fw_version(struct hid_device *hdev, int idProduct)hid_warn (hdev,"The MCU firmware version must be %d or greater to avoid issues with suspend.\n" , min_version); + }else { +set_ally_mcu_hack (false); +set_ally_mcu_powersave (true); } }@@ -1426,4 +1429,5 @@ static struct hid_driver asus_driver = { };module_hid_driver (asus_driver); +MODULE_IMPORT_NS ("ASUS_WMI" );MODULE_LICENSE ("GPL" );drivers/platform/x86/asus-wmi.c +12
-8@@ -142,16 +142,20 @@ module_param(fnlock_default, bool, 0444);#define ASUS_MINI_LED_2024_STRONG 0x01#define ASUS_MINI_LED_2024_OFF 0x02 -/* 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 1500 +/* +* The period required to wait after screen off/on/s2idle.check in MS. +* Time here greatly impacts the wake behaviour. Used in suspend/wake. +*/ +#define ASUS_USB0_PWR_EC0_CSEE_WAIT 600 +#define ASUS_USB0_PWR_EC0_CSEE_OFF 0xB7 +#define ASUS_USB0_PWR_EC0_CSEE_ON 0xB8static const char *const ashs_ids[] = {"ATK4001" ,"ATK4002" ,NULL };static int throttle_thermal_policy_write (struct asus_wmi *); -static const struct dmi_system_id asus_ally_mcu_quirk[] = { +static const struct dmi_system_id asus_rog_ally_device[] = { { .matches = {DMI_MATCH (DMI_BOARD_NAME ,"RC71L" ),@@ -274,9 +278,6 @@ 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;@@ -335,6 +336,9 @@ struct asus_wmi {struct asus_wmi_driver *driver; }; +/* Global to allow setting externally without requiring driver data */ +static bool use_ally_mcu_hack; +/* WMI ************************************************************************/ static int asus_wmi_evaluate_method3(u32 method_id,@@ -549,7 +553,7 @@ static int asus_wmi_get_devstate(struct asus_wmi *asus, u32 dev_id, u32 *retval)return 0 ; } -static int asus_wmi_set_devstate (u32 dev_id,u32 ctrl_param, +int asus_wmi_set_devstate (u32 dev_id,u32 ctrl_param,u32 *retval) { return asus_wmi_evaluate_method(ASUS_WMI_METHODID_DEVS, dev_id,@@ -1343,6 +1347,38 @@ static ssize_t nv_temp_target_show(struct device *dev,static DEVICE_ATTR_RW (nv_temp_target);
drivers/platform/x86/asus-wmi.c static ssize_t nv_temp_target_show(struct device *dev, · line 1358
Quoted 10 lines
drivers/platform/x86/asus-wmi.c +9
-0/* Ally MCU Powersave ********************************************************/ + +/* +* The HID driver needs to check MCU version and set this to false if the MCU FW +* version is >= the minimum requirements. New FW do not need the hacks. +*/ +void set_ally_mcu_hack (bool enabled) +{ + use_ally_mcu_hack = enabled; +pr_info ("Disabled Ally MCU suspend quirks" );
Shouldn't this message change when set_ally_mcu_hack() is called with different values? Also is pr_info() the right level? Or should be this be pr_debug()?
Quoted 8 lines
drivers/platform/x86/asus-wmi.c +8
-0+} +EXPORT_SYMBOL_NS_GPL (set_ally_mcu_hack,"ASUS_WMI" ); + +/* +* mcu_powersave should be enabled always, as it is fixed in MCU FW versions: +* - v313 for Ally X +* - v319 for Ally 1 +* The HID driver checks MCU versions and so should set this if requirements match
drivers/platform/x86/asus-wmi.c static ssize_t nv_temp_target_show(struct device *dev, · line 1376
Quoted 10 lines
drivers/platform/x86/asus-wmi.c +10
-0+*/ +void set_ally_mcu_powersave (bool enabled) +{ +int result, err; + + err =asus_wmi_set_devstate (ASUS_WMI_DEVID_MCU_POWERSAVE , enabled, &result); +if (err) +pr_warn ("Failed to set MCU powersave: %d\n" , err); +if (result >1 ) +pr_warn ("Failed to set MCU powersave (result): 0x%x\n" , result);
Don't you want to add some return statements for these two blocks? Otherwise you're goign to have pr_warn() saying it didn't work followed by pr_info() saying it did leading to confusion.
drivers/platform/x86/asus-wmi.c static ssize_t nv_temp_target_show(struct device *dev, · line 1378
Quoted 2 lines
drivers/platform/x86/asus-wmi.c +2
-0+ +pr_info ("Set mcu_powersave to enabled" );
This is a bit noisy, no? Is this better for pr_debug()?
Quoted 152 lines
drivers/platform/x86/asus-wmi.c +44
-31+} +EXPORT_SYMBOL_NS_GPL (set_ally_mcu_powersave,"ASUS_WMI" ); +static ssize_t mcu_powersave_show (struct device *dev,struct device_attribute *attr,char *buf) {@@ -4711,6 +4747,18 @@ static int asus_wmi_add(struct platform_device *pdev)if (err) goto fail_platform; + use_ally_mcu_hack =acpi_has_method (NULL ,ASUS_USB0_PWR_EC0_CSEE ) + &&dmi_check_system (asus_rog_ally_device); +if (use_ally_mcu_hack &&dmi_match (DMI_BOARD_NAME ,"RC71" )) { +/* +* These steps ensure the device is in a valid good state, this is +* especially important for the Ally 1 after a reboot. +*/ +acpi_execute_simple_method (NULL ,ASUS_USB0_PWR_EC0_CSEE , +ASUS_USB0_PWR_EC0_CSEE_ON ); +msleep (ASUS_USB0_PWR_EC0_CSEE_WAIT ); + } +/* ensure defaults for tunables */ asus->ppt_pl2_sppt =5 ; asus->ppt_pl1_spl =5 ;@@ -4723,8 +4771,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->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->ally_mcu_usb_switch =acpi_has_method (NULL ,ASUS_USB0_PWR_EC0_CSEE ) - &&dmi_check_system (asus_ally_mcu_quirk);if (asus_wmi_dev_is_present (asus,ASUS_WMI_DEVID_MINI_LED_MODE )) asus->mini_led_dev_id =ASUS_WMI_DEVID_MINI_LED_MODE ;@@ -4910,34 +4956,6 @@ static int asus_hotk_resume(struct device *device)return 0 ; } -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 -msleep (ASUS_USB0_PWR_EC0_CSEE_WAIT ); - } -return 0 ; -} - -static int asus_hotk_prepare (struct device *device) -{ -struct asus_wmi *asus =dev_get_drvdata (device); - -if (asus->ally_mcu_usb_switch) { -/* 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" ); -else -msleep (ASUS_USB0_PWR_EC0_CSEE_WAIT ); - } -return 0 ; -} -static int asus_hotk_restore (struct device *device) {struct asus_wmi *asus =dev_get_drvdata (device);@@ -4978,11 +4996,34 @@ static int asus_hotk_restore(struct device *device)return 0 ; } +static void asus_ally_s2idle_restore (void ) +{ +if (use_ally_mcu_hack) { +acpi_execute_simple_method (NULL ,ASUS_USB0_PWR_EC0_CSEE , +ASUS_USB0_PWR_EC0_CSEE_ON ); +msleep (ASUS_USB0_PWR_EC0_CSEE_WAIT ); + } +} + +static int asus_hotk_prepare (struct device *device) +{ +if (use_ally_mcu_hack) { +acpi_execute_simple_method (NULL ,ASUS_USB0_PWR_EC0_CSEE , +ASUS_USB0_PWR_EC0_CSEE_OFF ); +msleep (ASUS_USB0_PWR_EC0_CSEE_WAIT ); + } +return 0 ; +} + +/* Use only for Ally devices due to the wake_on_ac */ +static struct acpi_s2idle_dev_ops asus_ally_s2idle_dev_ops = { + .restore = asus_ally_s2idle_restore, +}; +static const struct dev_pm_ops asus_pm_ops = { .thaw = asus_hotk_thaw, .restore = asus_hotk_restore, .resume = asus_hotk_resume, - .resume_early = asus_hotk_resume_early, .prepare = asus_hotk_prepare, };@@ -5010,6 +5051,10 @@ static int asus_wmi_probe(struct platform_device *pdev)return ret; } + ret =acpi_register_lps0_dev (&asus_ally_s2idle_dev_ops); +if (ret) +pr_warn ("failed to register LPS0 sleep handler in asus-wmi\n" ); +return asus_wmi_add (pdev); }@@ -5042,6 +5087,7 @@ EXPORT_SYMBOL_GPL(asus_wmi_register_driver);void asus_wmi_unregister_driver (struct asus_wmi_driver *driver) { +acpi_unregister_lps0_dev (&asus_ally_s2idle_dev_ops);platform_device_unregister (driver->platform_device);platform_driver_unregister (&driver->platform_driver); used = false;include/linux/platform_data/x86/asus-wmi.h +15
-0@@ -158,8 +158,23 @@#define ASUS_WMI_DSTS_LIGHTBAR_MASK 0x0000000F#if IS_REACHABLE (CONFIG_ASUS_WMI ) +void set_ally_mcu_hack (bool enabled); +void set_ally_mcu_powersave (bool enabled); +int asus_wmi_set_devstate (u32 dev_id,u32 ctrl_param,u32 *retval);int asus_wmi_evaluate_method (u32 method_id,u32 arg0,u32 arg1,u32 *retval);#else +static inline void set_ally_mcu_hack (bool enabled) +{ +return -ENODEV ; +} +static inline void set_ally_mcu_powersave (bool enabled) +{ +return -ENODEV ; +} +static inline int asus_wmi_set_devstate (u32 dev_id,u32 ctrl_param,u32 *retval) +{ +return -ENODEV ; +}static inline int asus_wmi_evaluate_method (u32 method_id,u32 arg0,u32 arg1,u32 *retval) {