platform/x86/amd: pmc: Don't dump data after resume from s0i3 on picasso
authorMario Limonciello <mario.limonciello@amd.com>
Sun, 9 Apr 2023 18:53:43 +0000 (00:23 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 May 2023 14:03:15 +0000 (23:03 +0900)
[ Upstream commit 7abc3618b65304d409d9489d77e4a8f047842fb7 ]

This command isn't supported on Picasso, so guard against running it
to avoid errors like `SMU cmd unknown. err: 0xfe` in the logs.

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2449
Fixes: 766205674962 ("platform/x86: amd-pmc: Add support for logging SMU metrics")
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20230409185348.556161-4-Shyam-sundar.S-k@amd.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/platform/x86/amd/pmc.c

index 7c9cadf..40cce95 100644 (file)
@@ -805,6 +805,14 @@ static void amd_pmc_s2idle_check(void)
                dev_err(pdev->dev, "error writing to STB: %d\n", rc);
 }
 
+static int amd_pmc_dump_data(struct amd_pmc_dev *pdev)
+{
+       if (pdev->cpu_id == AMD_CPU_ID_PCO)
+               return -ENODEV;
+
+       return amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_DUMP_DATA, 0);
+}
+
 static void amd_pmc_s2idle_restore(void)
 {
        struct amd_pmc_dev *pdev = &pmc;
@@ -817,7 +825,7 @@ static void amd_pmc_s2idle_restore(void)
                dev_err(pdev->dev, "resume failed: %d\n", rc);
 
        /* Let SMU know that we are looking for stats */
-       amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_DUMP_DATA, 0);
+       amd_pmc_dump_data(pdev);
 
        rc = amd_pmc_write_stb(pdev, AMD_PMC_STB_S2IDLE_RESTORE);
        if (rc)