Skip to content

Commit 2d53c0a

Browse files
superm1ij-intel
authored andcommitted
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: Mario Limonciello <mario.limonciello@amd.com> Link: https://lore.kernel.org/r/20231212045006.97581-3-mario.limonciello@amd.com Reviewed-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
1 parent 8598066 commit 2d53c0a

File tree

1 file changed

+12
-9
lines changed
  • drivers/platform/x86/amd/pmc

1 file changed

+12
-9
lines changed

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -756,19 +756,22 @@ static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev)
756756
return -EINVAL;
757757
}
758758

759-
static int amd_pmc_czn_wa_irq1(struct amd_pmc_dev *pdev)
759+
static int amd_pmc_wa_irq1(struct amd_pmc_dev *pdev)
760760
{
761761
struct device *d;
762762
int rc;
763763

764-
if (!pdev->major) {
765-
rc = amd_pmc_get_smu_version(pdev);
766-
if (rc)
767-
return rc;
768-
}
764+
/* cezanne platform firmware has a fix in 64.66.0 */
765+
if (pdev->cpu_id == AMD_CPU_ID_CZN) {
766+
if (!pdev->major) {
767+
rc = amd_pmc_get_smu_version(pdev);
768+
if (rc)
769+
return rc;
770+
}
769771

770-
if (pdev->major > 64 || (pdev->major == 64 && pdev->minor > 65))
771-
return 0;
772+
if (pdev->major > 64 || (pdev->major == 64 && pdev->minor > 65))
773+
return 0;
774+
}
772775

773776
d = bus_find_device_by_name(&serio_bus, NULL, "serio0");
774777
if (!d)
@@ -928,7 +931,7 @@ static int amd_pmc_suspend_handler(struct device *dev)
928931
struct amd_pmc_dev *pdev = dev_get_drvdata(dev);
929932

930933
if (pdev->cpu_id == AMD_CPU_ID_CZN && !disable_workarounds) {
931-
int rc = amd_pmc_czn_wa_irq1(pdev);
934+
int rc = amd_pmc_wa_irq1(pdev);
932935

933936
if (rc) {
934937
dev_err(pdev->dev, "failed to adjust keyboard wakeup: %d\n", rc);

0 commit comments

Comments
 (0)