Skip to content

Commit

Permalink
platform/x86: amd-pmc: Output error codes in messages
Browse files Browse the repository at this point in the history
The return type for the s2idle callbacks is 'void', so any errors that
occur will no longer be displayed.

Output these error codes in the messages in case of any failures.

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20220317141445.6498-3-mario.limonciello@amd.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Mario Limonciello authored and Hans de Goede committed Mar 17, 2022
1 parent b1f6603 commit 23f5f70
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions drivers/platform/x86/amd-pmc.c
Original file line number Diff line number Diff line change
@@ -653,23 +653,25 @@ static void amd_pmc_s2idle_prepare(void)
/* Activate CZN specific RTC functionality */
if (pdev->cpu_id == AMD_CPU_ID_CZN) {
rc = amd_pmc_verify_czn_rtc(pdev, &arg);
if (rc)
if (rc) {
dev_err(pdev->dev, "failed to set RTC: %d\n", rc);
goto fail;
}
}

/* Dump the IdleMask before we send hint to SMU */
amd_pmc_idlemask_read(pdev, pdev->dev, NULL);
msg = amd_pmc_get_os_hint(pdev);
rc = amd_pmc_send_cmd(pdev, arg, NULL, msg, 0);
if (rc) {
dev_err(pdev->dev, "suspend failed\n");
dev_err(pdev->dev, "suspend failed: %d\n", rc);
goto fail;
}

if (enable_stb)
rc = amd_pmc_write_stb(pdev, AMD_PMC_STB_PREDEF);
if (rc) {
dev_err(pdev->dev, "error writing to STB\n");
dev_err(pdev->dev, "error writing to STB: %d\n", rc);
goto fail;
}
return;
@@ -688,7 +690,7 @@ static void amd_pmc_s2idle_restore(void)
msg = amd_pmc_get_os_hint(pdev);
rc = amd_pmc_send_cmd(pdev, 0, NULL, msg, 0);
if (rc)
dev_err(pdev->dev, "resume failed\n");
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);
@@ -700,7 +702,7 @@ static void amd_pmc_s2idle_restore(void)
if (enable_stb)
rc = amd_pmc_write_stb(pdev, AMD_PMC_STB_PREDEF + 1);
if (rc)
dev_err(pdev->dev, "error writing to STB\n");
dev_err(pdev->dev, "error writing to STB: %d\n", rc);

/* Restore the QoS request back to defaults if it was set */
if (pdev->cpu_id == AMD_CPU_ID_CZN)

0 comments on commit 23f5f70

Please sign in to comment.