ACK: [PATCH 1/1][SRU][Kinetic] UBUNTU: SAUCE: platform/x86/amd: pmc: Read SMU version during suspend on Cezanne systems

[Cory Todd]

On Fri, Oct 21, 2022 at 02:33:47PM +0800, You-Sheng Yang wrote:
> From: Mario Limonciello <mario.limonciello at amd.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1993715
> 
> commit b0c07116c8943 ("platform/x86: amd-pmc: Avoid reading SMU version at
> probe time") adjusted the behavior for amd-pmc to avoid reading the SMU version
> at startup but rather on first use to improve boot time.
> 
> However the SMU version is also used to decide whether to place a timer based
> wakeup in the OS_HINT message.  If the idlemask hasn't been read before this
> message was sent then the SMU version will not have been cached.
> 
> Ensure the SMU version has been read before deciding whether or not to run this
> codepath.
> 
> Cc: stable at vger.kernel.org # 6.0
> Reported-by: You-Sheng Yang <vicamo.yang at canonical.com>
> Tested-by: Anson Tsao <anson.tsao at amd.com>
> Fixes: b0c07116c8943 ("platform/x86: amd-pmc: Avoid reading SMU version at probe time")
> Signed-off-by: Mario Limonciello <mario.limonciello at amd.com>
> (cherry-picked from https://lore.kernel.org/all/20221020113749.6621-1-mario.limonciello@amd.com/)
> Signed-off-by: You-Sheng Yang (vicamo) <vicamo.yang at canonical.com>
> ---
>  drivers/platform/x86/amd-pmc.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
> index 700eb19e8450..fc326fdf483f 100644
> --- a/drivers/platform/x86/amd-pmc.c
> +++ b/drivers/platform/x86/amd-pmc.c
> @@ -635,6 +635,13 @@ static int amd_pmc_verify_czn_rtc(struct amd_pmc_dev *pdev, u32 *arg)
>  	struct rtc_time tm;
>  	int rc;
>  
> +	/* we haven't yet read SMU version */
> +	if (!pdev->major) {
> +		rc = amd_pmc_get_smu_version(pdev);
> +		if (rc)
> +			return rc;
> +	}
> +
>  	if (pdev->major < 64 || (pdev->major == 64 && pdev->minor < 53))
>  		return 0;
>  

Acked-by: Cory Todd <cory.todd at canonical.com>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20221021/fbb7c4a8/attachment-0001.sig>