Received-SPF: pass (google.com: domain of linux-kernel+bounces-55575-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <26c73a47-c672-4c99-9c41-aa0bdc162a4c@amd.com>
Date: Tue, 6 Feb 2024 13:58:00 -0600
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v1] ACPI: PM: s2idle: Enable Low-Power S0 Idle MSFT UUID
 for non-AMD systems
Content-Language: en-US
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
 Linux ACPI <linux-acpi@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>, Linux PM <linux-pm@vger.kernel.org>,
 "Rafael J. Wysocki" <rafael@kernel.org>,
 Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
 Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>,
 David Box <david.e.box@linux.intel.com>
References: <12388452.O9o76ZdvQC@kreacher>
From: Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <12388452.O9o76ZdvQC@kreacher>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?cFhTVmlZQTQydnlIN2E0QjRMMnNXS3V0K056TkxWamVudFpZcmM5ODNBVEV1?=
 =?utf-8?B?K0QrOVQ0TzR3T0tieWNlOW4vUVFkT3dzUGtlNVVTdDJSSFcxTUZJOW1vUDZX?=
 =?utf-8?B?VmJVU1NlM0FWNW42Yk9qWm0yd29IdkdEQWtvU1I0WXFsU3NQczZjdVZKRFYy?=
 =?utf-8?B?MkpEZ1Q3azBYcjhWNnVSVkg2TXJrZ25aTXhYVm5WZThodXRVcXFFYU1pMVR6?=
 =?utf-8?B?NzhOVHNUNVQ3d29UcmM1SmJRMzJxL1dmaHJjK3FYQXd1dExvUkJ1OUprV2VU?=
 =?utf-8?B?RnFkczMwcml2bXg2MEYxM05qd3pVYTFIcDQzY1lDL29YMCtlZ2JFVVlOTzZT?=
 =?utf-8?B?NjE3Nzd5UjhWWXdseXRWM2ZlTlk3NU5tSWJrUjRqU09iYVRTOGhKNkt3VWtv?=
 =?utf-8?B?Yk5VN3BBRXRQeTVlYlg4ZGxyODRrZzhWN3M0cThMazRESm9UTUpQVGlJdGRt?=
 =?utf-8?B?aVFFRnAwRi80dGd5dlZUOFpWWnlIRjhWRUdaeGFqekhncmxJZ0FjU3dmWEQ3?=
 =?utf-8?B?UW0zcGMzeWMzTEJ5dklKYWVKZzRrOHVTbUxLNHhSL05FaVkyZHlwSllrV00r?=
 =?utf-8?B?VEswK0txdlVwYTRDb1ZKYnRRWHRUTXVkMEgzTE9GMitCbXZJK0JvNW93SENa?=
 =?utf-8?B?QitaTVZPaEFBUHBiSE1BL2pKaGo4SDk4K29oTDV6Y29YQ2hCVjk3OUZiaTJ6?=
 =?utf-8?B?RkxWaWhjTWlhaXlvOFV0cXFlVzJLRU53eGJVQkw2K2hyeUR5TWgxZzc3bE0r?=
 =?utf-8?B?MmRqT1dvUE40b1pFUll2MFc2QXFRKzc3NERZVHU3NmhhY1czbnFuc01RRy9Z?=
 =?utf-8?B?dnc5eCtwSEQ0UDZETTlJMTdpM09ld3ArZnRJTzNzMzVTQW1jYi82SXQrWU5k?=
 =?utf-8?B?cWpWMGcwM3BSV3hWc1loY3QrZ1FMWVg0SlNTUHFKNkhsSGlWMXFMZXIyaW9P?=
 =?utf-8?B?SURLdVZaOFNlUGhZTG9UODBaY1BSbGh1aWIyekhVWmZiWDRpNnJXZzZYVXgy?=
 =?utf-8?B?dllPdThJbGNOaWNZVTlSejVBUXE2NXp2dU8yZnFDWlNSYlcrNHVSb0p1Ti9z?=
 =?utf-8?B?ZXVWV2FGVlBKa1RoMlJaOTRvZG9EckIrVlhqckx4aWVMaklpNjhhS3grMXRw?=
 =?utf-8?B?eHdDWlR6bmhibzFkVjhaWU5vdUllN2lKazVwNE1VRTNjSmN0RDM0cmVOczZZ?=
 =?utf-8?B?a1YxWlpQSzY2R0xUZk40RVM0Yk5ML2x2clg1UlBlS0w3dzFlSUNiRVRtNGJV?=
 =?utf-8?B?azRXRzhYNENVaHNqYjkvcXV0VkhDckJHZFpndnloZ2h5SDA1ZHA3RUpJM014?=
 =?utf-8?B?bkNZMi9NSDhab0pKdGxjcHZ5UEZWSzFGKzRZeTZNUWhweDljK01Da3NPTk1z?=
 =?utf-8?B?OEJTaW5aQzVkTzF1Q0RWdjVCc2FLKzNtSGlobFlONjRsVGZSNCt2S25qWnJU?=
 =?utf-8?B?RVFaTkdLSFk3M0hjaExKUUUwWFJ3dHAwK0dUQUh1aTlSWnlxUFh1TTNWMGwr?=
 =?utf-8?B?VXVwVUFLOEFaaCtqUGgrNjdHbkRFeHdjNHoyR0xxc2YydllULzI0dnVVbUc3?=
 =?utf-8?B?KzJvYk50VDQ2WHg5RWRnWllhbGhkZWE2VGdRd1Jwem5hbGZ3TE9NTjlhRU1U?=
 =?utf-8?B?dVJGWHNwS0h5cWpiRkdSbElmZTM5bVhKQTJuYng5R0d0VWs0bWVXeXdtbmQr?=
 =?utf-8?B?RWF2UVZ5VWlMNU8rNENvTEI2T2JpL0h5RVJQRDhoUGpUVmgyS2c5T09sTzhi?=
 =?utf-8?B?a2IzaUM2NjNWRjJrYjdvZXQ2N2kzdnQ2Q3VERnlQK3BSVEU1R1lPeHZXZHNi?=
 =?utf-8?B?dk5KNzZCQWpFRGZYMlNSZXpuTURIQjdJbnk3R3l0cThKekk2cWFkWXVLUVIw?=
 =?utf-8?B?WjJndm1xa1RuMllrS1NTMTNxTjY0Qml4YmtWZnJGa3BjOExnNG42bnVSbG1L?=
 =?utf-8?B?aXlrZDMyaUlaVmZFbERsaFJ3Qkg4Qnl0MW1YVVkxanJNdU9lRXFVT0dLMXll?=
 =?utf-8?B?WGJBSHhjMlZEbVF2YlY1MUV0L0JhcUFvVk5GUGpLSisySlFXeTJrQlBDMW5a?=
 =?utf-8?B?QWlDWWs5TjNiaytZbmVSNWlRZW1IUjVxQU5FRmg1WmpGR0FyZ3pwRUxIVmVU?=
 =?utf-8?Q?wiWXXGCtNiQ+buPcD4mo9nOhp?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e63f8018-ed95-4e3f-035e-08dc274ded43
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 19:58:02.7448
 (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: a48wjBLT/JMS7gOxfiyWMofoBiiZxGo6yLl/j/yVFAXdSHomLKe6K3HZC0D2DeRh5tbLrH+8M+yi4VErhG2Lfg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8837

On 2/6/2024 13:33, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> Systems based on Intel platforms that use the MSFT UUID for Low-Power S0
> Idle (LPS0) have started to ship, so allow the kernel to use the MSFT
> UUID in the non-AMD case too, but in that case make it avoid evaluating
> the same _DSM function for two different UUIDs and prioritize the MSFT
> one.
> 
> While at it, combine two MSFT _DSM function mask checks in
> acpi_s2idle_restore_early() so as to make it reflect the
> acpi_s2idle_prepare_late() flow more closely and adjust the
> Modern Standby entry and exit comments slightly.
> 
> Non-AMD systems that do not support MSFT UUID for Low-power S0 Idle are
> not expected to be affected by this change in any way.
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
>   drivers/acpi/x86/s2idle.c |   37 +++++++++++++++++++++++++++----------
>   1 file changed, 27 insertions(+), 10 deletions(-)
> 
> Index: linux-pm/drivers/acpi/x86/s2idle.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/x86/s2idle.c
> +++ linux-pm/drivers/acpi/x86/s2idle.c
> @@ -488,7 +488,21 @@ static int lps0_device_attach(struct acp
>   		rev_id = 1;
>   		lps0_dsm_func_mask = validate_dsm(adev->handle,
>   					ACPI_LPS0_DSM_UUID, rev_id, &lps0_dsm_guid);
> -		lps0_dsm_func_mask_microsoft = -EINVAL;
> +		if (lps0_dsm_func_mask > 0 && lps0_dsm_func_mask_microsoft > 0) {
> +			unsigned int func_mask;
> +
> +			/*
> +			 * Avoid evaluating the same _DSM function for two
> +			 * different UUIDs and prioritize the MSFT one.
> +			 */
> +			func_mask = lps0_dsm_func_mask & lps0_dsm_func_mask_microsoft;
> +			if (func_mask) {
> +				acpi_handle_info(adev->handle,
> +						 "Duplicate LPS0 _DSM functions (mask: 0x%x)\n",
> +						 func_mask);
> +				lps0_dsm_func_mask &= ~func_mask;
> +			}
> +		}
>   	}
>   
>   	if (lps0_dsm_func_mask < 0 && lps0_dsm_func_mask_microsoft < 0)
> @@ -549,19 +563,22 @@ int acpi_s2idle_prepare_late(void)
>   				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
>   
>   	/* LPS0 entry */
> -	if (lps0_dsm_func_mask > 0)
> -		acpi_sleep_run_lps0_dsm(acpi_s2idle_vendor_amd() ?
> -					ACPI_LPS0_ENTRY_AMD :
> -					ACPI_LPS0_ENTRY,
> +	if (lps0_dsm_func_mask > 0 && acpi_s2idle_vendor_amd())
> +		acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY_AMD,
>   					lps0_dsm_func_mask, lps0_dsm_guid);
> +
>   	if (lps0_dsm_func_mask_microsoft > 0) {
> -		/* modern standby entry */
> +		/* Modern Standby entry */
>   		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_ENTRY,
>   				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
>   		acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY,
>   				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
>   	}
>   
> +	if (lps0_dsm_func_mask > 0 && !acpi_s2idle_vendor_amd())
> +		acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY,
> +					lps0_dsm_func_mask, lps0_dsm_guid);
> +
>   	list_for_each_entry(handler, &lps0_s2idle_devops_head, list_node) {
>   		if (handler->prepare)
>   			handler->prepare();
> @@ -600,14 +617,14 @@ void acpi_s2idle_restore_early(void)
>   					ACPI_LPS0_EXIT_AMD :
>   					ACPI_LPS0_EXIT,
>   					lps0_dsm_func_mask, lps0_dsm_guid);
> -	if (lps0_dsm_func_mask_microsoft > 0)
> +
> +	if (lps0_dsm_func_mask_microsoft > 0) {
>   		acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT,
>   				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
> -
> -	/* Modern standby exit */
> -	if (lps0_dsm_func_mask_microsoft > 0)
> +		/* Modern Standby exit */
>   		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_EXIT,
>   				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
> +	}
>   
>   	/* Screen on */
>   	if (lps0_dsm_func_mask_microsoft > 0)
> 
> 
>