Unverified Commit 2d53c0ab authored by Mario Limonciello's avatar Mario Limonciello Committed by Ilpo Järvinen
Browse files

platform/x86/amd/pmc: Only run IRQ1 firmware version check on Cezanne 



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: default avatarMario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20231212045006.97581-3-mario.limonciello@amd.com


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 85980669

drivers/platform/x86/amd/pmc/pmc.c

+12 −9
Original line number Diff line number Diff line
@@ -756,11 +756,13 @@ 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;



	/* 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)
@@ -769,6 +771,7 @@ static int amd_pmc_czn_wa_irq1(struct amd_pmc_dev *pdev) 


		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);