Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <cebae02c-6a9b-e9fa-91dd-509b83543141@amd.com>
Date:   Sat, 17 Sep 2022 08:26:06 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.10.0
Subject: Re: [PATCH 4/4] acpi/x86: s2idle: Add a quirk for ASUS TUF Gaming A17
 FA707RE
Content-Language: en-US
To:     Luke Jones <luke@ljones.dev>, rafael@kernel.org,
        linux-kernel@vger.kernel.org
Cc:     catalin@antebit.com, Shyam-sundar.S-k@amd.com,
        Len Brown <lenb@kernel.org>, linux-acpi@vger.kernel.org
References: <20220909180509.638-1-mario.limonciello@amd.com>
 <20220909180509.638-5-mario.limonciello@amd.com>
 <a5f1976a3b8e905a09ebb08f3baad0996101c5bb.camel@ljones.dev>
From:   Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <a5f1976a3b8e905a09ebb08f3baad0996101c5bb.camel@ljones.dev>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aklPdXRXaklXcEJjQWgrcnJBL3BJSHgvcHNMdU9FenlIOUVtMTQwV3R4MFhh?=
 =?utf-8?B?bVY1OFRtWm1sR0ZvYmZnbFlEcVZWVlJOOGwyTUhhSURaRytxZDUvV2wvWVYy?=
 =?utf-8?B?ZHNqaHdWZnBua0M5V21UczdiQjZKS0RPUnhZK1JuTUZVNlQ3Y3RxdVZxWktT?=
 =?utf-8?B?ZUVlcjg3ZFAzN01RblVjSEZrazNnTFl4TFpDd3ZpSzl1QW1qU3Fwbm9ma0FM?=
 =?utf-8?B?bndpNk91UDhwUml1NDF2cE1vdjJBR0svdkVYODU5a3RrVHhHVCtlZURVNWpG?=
 =?utf-8?B?SDVVRnJ1Zk5MWUtXMnRBbVZ4bUdEVzY5eTkvS3NVU0R0emR3d1RWak5oOWIv?=
 =?utf-8?B?Z3JGc1pRc21TenV6Vm1TN3F4eTdVQzBVOGhCZHdldjBFeWVKa3BNbDQ2UGd3?=
 =?utf-8?B?UE5KTis3ZS96UG9SS2FZcWxTZ2JscXVWVERmTERySEVlMHNLU2hnV1FsZmZE?=
 =?utf-8?B?QzlUelA5OUM1Nlg4QUVzeEJvRnloMFdKR2V4cVN3N2dpL1phbGlHNllKcHo1?=
 =?utf-8?B?UENsbGZMT3FBdWN3NVB4WDFSQmVTVUdGRnh6MTNiQ3doSnJoWEwwRk9EbXFy?=
 =?utf-8?B?WkplaDJFbEFNc2FYenltWW1iRWVKbUZrY1BxRWFuTmVnNEJIMUdZSFlrV0xt?=
 =?utf-8?B?WXQwWTFlK2s4WktFQ255MFJJUWVWem9UcHhHcklCNys5Y2tkVzVUeWJDUEUx?=
 =?utf-8?B?VHRIb0NVWTZFc3p3dVpxMFRwVG9BcThUTVEwUUlVTXNKS2ZqbHFrVEFjV0dZ?=
 =?utf-8?B?NzlaMzVuRGpuT0U5VXdVU01OWmNwUGxCYm1raUtITE9nQnBaNnMwN3NQVlgv?=
 =?utf-8?B?TnY2SXY0ZFNXL1p6UVg1bzcxTnJPOWdHbDB4QmwwV0tyZnJTSnJQdEUrVFpU?=
 =?utf-8?B?ZTI1S3hvZFhsNTEydTBuRXlXU0xtRmhNcUl4bVJOdVFFK0pMdnZnUWRzSXNK?=
 =?utf-8?B?cEluY0JVTHJpQzdhU2NGZFRONUpnY0JkZDdhOXRLWDRGaDlOKy96bUZDalpX?=
 =?utf-8?B?ZWVVRnN5L1Ivay93WkdCK3k4VFRpcmVjeHJIc2YwMmZ3ZFlSMnJDVGppUWtK?=
 =?utf-8?B?QjFBNWROeXlGb3ZSYXcyRzVrU1RSUStLQnJ0bU1WRzArcy9WeGlWNnFUa3gv?=
 =?utf-8?B?TGNGTkFtbGd1VGp0MitMaTFDanVoeWx1ZlB1eGlMZk5GTU9QL0grbE5NTXl2?=
 =?utf-8?B?MWp4cWZ5UVpaSlBtOEdhTVdTY3NBenN4UFhuNEFZa3NJQTVtcG1pckhnZFFX?=
 =?utf-8?B?NzZsU2ZCSFM0ZkF3U1M3Rm05aXZWb25OWjhLWDJ0WVQyazR0b1FmL0ttaTNI?=
 =?utf-8?B?TCttV2ZpZ3NHNEJyblZDaTQ3Y2ZBRTY0QU9CckxmQjZhOGQvT1E1c1F6WjVv?=
 =?utf-8?B?WExoeVgwdnI0TVA0MUlSdXRmb2o5MFlRSWprUXRMYjBudmthdnBQKzMyLzBU?=
 =?utf-8?B?enQ5SGlzc1M4R3ovQXUzWVJ3VUtlWEJzWWVNNGxrV1ZsUDVJam9vMDFzbXRu?=
 =?utf-8?B?MVJzRDNjd2N1Q2p6VWhLSVk3UmVINVJuNCtSazFnUDZMMUxTQTFWMmljLzBY?=
 =?utf-8?B?TUJ3dnJ4dy9UOU8vRVpTZlRsMEp6Rlh5ajF2MDVyQ3NLZGRjYVBEV2FiNldw?=
 =?utf-8?B?SjcrTW9nSjk5bjFMYWU2SDhGTC9PU0ZnS2R5QjdScXBEc1JnUkJsbUJNNEtK?=
 =?utf-8?B?U2VKa2p0NTBiMlFqLzY2dy9SSVdNVkdWVU1wZkF3RCtyTW5TbVR5VW9lSE45?=
 =?utf-8?B?dklMUkdaaVJXRlROTG83bSt0MENOWnNOUnU2SGlRZEJQbUFzY2RPZFdXaHY5?=
 =?utf-8?B?RHk5QXJwaU5XT1Ayek5RUEtEUTlLb1JRYng3dVJLbkdZeWxXNkdTMko5RkU5?=
 =?utf-8?B?cjIzd0huUUNzSzdMU2dQMU9KUEFVNVRSdE53TEJsaFVkb2xYMzFqaXhFQ2x5?=
 =?utf-8?B?RU9UVlRtbm9MKzZralhtZmZDVTNJZ0xSV1dqck1RRFZvTHMrOHVBSm5iQnpr?=
 =?utf-8?B?NEdmUGpUa0cwVExrSzl5dk54bUVuUTRvTTJBMVphQldreGVSOFNycVhrT0pX?=
 =?utf-8?B?eE0rdGp5VUZ0eFRINjRoL212WnhTdDl2N3g4OVB4YmNxUzF6ZmlrUG9hdTF5?=
 =?utf-8?Q?UYJaCkBq2tJlAhZT0Wf5bU2x7?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c864868c-fcf5-47e0-18e4-08da98b02fa0
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2022 13:26:10.9220
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6ns7t8A5jWMOsaJDlQnFeXW6tzGwMK86qOT9GCbyAZY6/4VcRxLTpUrIkUfzdB4W92yXaVLGfs+s9xuYq/c18A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4861
X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 9/17/22 02:35, Luke Jones wrote:
> 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://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugzilla.kernel.org%2Fshow_bug.cgi%3Fid%3D216101&amp;data=05%7C01%7Cmario.limonciello%40amd.com%7Cc89466a0fc1b40d2dfd808da987f390b%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637989969450224307%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=hFj1HnKnG9HPiQDc0fDFs07flY9N2KiOpY2g61bIdyE%3D&amp;reserved=0
>> Reported-and-tested-by: catalin@antebit.com
>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>> ---
>>   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://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugzilla.kernel.org%2Fshow_bug.cgi%3Fid%3D216101&amp;data=05%7C01%7Cmario.limonciello%40amd.com%7Cc89466a0fc1b40d2dfd808da987f390b%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637989969450224307%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=hFj1HnKnG9HPiQDc0fDFs07flY9N2KiOpY2g61bIdyE%3D&amp;reserved=0
>> +                */
>> +               .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"),
> +		},
> +	},
>   	{}
>   };
>   

Hi Luke,

Thanks!

Your model is actually already rolled into v2 and v3 of the series, 
reported by Phillip Zabel.

https://lore.kernel.org/linux-acpi/20220916182609.3039-1-mario.limonciello@amd.com/T/#mc37fd351eb5460a36c9e3da12c408fd3acb9f515

Thanks,