Re: [PATCH 2/4] platform/x86/amd/pmc: Only run IRQ1 firmware version check on Cezanne

["Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>]

On Mon, 11 Dec 2023, Mario Limonciello wrote:

> amd_pmc_wa_czn_irq1() only runs on Cezanne platforms currently but
> may be extended to other platforms in the future.  Rename the function
> and only check platform firmware version when it's called for a Cezanne
> based platform.
> 
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
>  drivers/platform/x86/amd/pmc/pmc.c | 21 ++++++++++++---------
>  1 file changed, 12 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c
> index 666cc6e98267..824673a8673e 100644
> --- a/drivers/platform/x86/amd/pmc/pmc.c
> +++ b/drivers/platform/x86/amd/pmc/pmc.c
> @@ -756,19 +756,22 @@ static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev)
>  	return -EINVAL;
>  }
>  
> -static int amd_pmc_czn_wa_irq1(struct amd_pmc_dev *pdev)
> +static int amd_pmc_wa_irq1(struct amd_pmc_dev *pdev)
>  {
>  	struct device *d;
>  	int rc;
>  
> -	if (!pdev->major) {
> -		rc = amd_pmc_get_smu_version(pdev);
> -		if (rc)
> -			return rc;
> -	}
> +	/* cezanne platform firmware has a fix in 64.66.0 */
> +	if (pdev->cpu_id == AMD_CPU_ID_CZN) {
> +		if (!pdev->major) {
> +			rc = amd_pmc_get_smu_version(pdev);
> +			if (rc)
> +				return rc;
> +		}
>  
> -	if (pdev->major > 64 || (pdev->major == 64 && pdev->minor > 65))
> -		return 0;
> +		if (pdev->major > 64 || (pdev->major == 64 && pdev->minor > 65))
> +			return 0;
> +	}
>  
>  	d = bus_find_device_by_name(&serio_bus, NULL, "serio0");
>  	if (!d)
> @@ -928,7 +931,7 @@ static int amd_pmc_suspend_handler(struct device *dev)
>  	struct amd_pmc_dev *pdev = dev_get_drvdata(dev);
>  
>  	if (pdev->cpu_id == AMD_CPU_ID_CZN && !disable_workarounds) {
> -		int rc = amd_pmc_czn_wa_irq1(pdev);
> +		int rc = amd_pmc_wa_irq1(pdev);
>  
>  		if (rc) {
>  			dev_err(pdev->dev, "failed to adjust keyboard wakeup: %d\n", rc);
> 

Hi Mario,

This doesn't look necessary for the fix in this series, right?

I'd prefer to leave it to next and only take 1,3-4 to fixes.

-- 
 i.