Hi Mario, On Fri, 2022-09-09 at 13:05 -0500, Mario Limonciello wrote: > ASUS TUF Gaming A17 FA707RE has problems with ACPI events after > s2idle resume. It's from a missing call to an ASL method in AMD > the s2idle calling path. Force the system to use the Microsoft > Modern Standby calling path instead. > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=216101 > Reported-and-tested-by: catalin@xxxxxxxxxxx > Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx> > --- > drivers/acpi/x86/s2idle.c | 24 ++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > > diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c > index a9b0f2b54a1c..6a2c94fdbeae 100644 > --- a/drivers/acpi/x86/s2idle.c > +++ b/drivers/acpi/x86/s2idle.c > @@ -17,6 +17,7 @@ > > #include <linux/acpi.h> > #include <linux/device.h> > +#include <linux/dmi.h> > #include <linux/suspend.h> > > #include "../sleep.h" > @@ -400,6 +401,28 @@ static const struct acpi_device_id amd_hid_ids[] > = { > {} > }; > > +static int lps0_prefer_microsoft(const struct dmi_system_id *id) > +{ > + pr_debug("Preferring Microsoft GUID.\n"); > + prefer_microsoft_guid = true; > + return 0; > +} > + > +static const struct dmi_system_id s2idle_dmi_table[] __initconst = { > + { > + /* > + * ASUS TUF Gaming A17 FA707RE > + * https://bugzilla.kernel.org/show_bug.cgi?id=216101 > + */ > + .callback = lps0_prefer_microsoft, > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER > INC."), > + DMI_MATCH(DMI_PRODUCT_NAME, "ASUS TUF Gaming > A17"), > + }, > + }, > + {} > +}; > + > static int lps0_device_attach(struct acpi_device *adev, > const struct acpi_device_id *not_used) > { > @@ -568,6 +591,7 @@ static const struct platform_s2idle_ops > acpi_s2idle_ops_lps0 = { > > void acpi_s2idle_setup(void) > { > + dmi_check_system(s2idle_dmi_table); > acpi_scan_add_handler(&lps0_handler); > s2idle_set_ops(&acpi_s2idle_ops_lps0); > } I'm confirming that this works for another laptop with the same issue - the GA402R series. The diff as follows (I'm unsure of how best to submit this as it is dependant on your work - I don't need attribution for this): drivers/acpi/x86/s2idle.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index e2b73809ab50..0c8348de5cbc 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -420,6 +420,17 @@ static const struct dmi_system_id s2idle_dmi_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "ASUS TUF Gaming A17"), }, }, + { + /* + * ASUS ROG Zephyrus G14 GA402R<variant> series + * These laptops have a similar issue to the FA707RE + */ + .callback = lps0_prefer_microsoft, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "ROG Zephyrus G14 GA402R"), + }, + }, {} }; -- 2.37.3
