]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
platform/x86/amd: pmc: Require at least 2.5 seconds between HW sleep cycles
authorMario Limonciello <mario.limonciello@amd.com>
Mon, 14 Apr 2025 16:24:00 +0000 (11:24 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 May 2025 07:43:53 +0000 (09:43 +0200)
commit 9f5595d5f03fd4dc640607a71e89a1daa68fd19d upstream.

When an APU exits HW sleep with no active wake sources the Linux kernel will
rapidly assert that the APU can enter back into HW sleep. This happens in a
few ms. Contrasting this to Windows, Windows can take 10s of seconds to
enter back into the resiliency phase for Modern Standby.

For some situations this can be problematic because it can cause leakage
from VDDCR_SOC to VDD_MISC and force VDD_MISC outside of the electrical
design guide specifications. On some designs this will trip the over
voltage protection feature (OVP) of the voltage regulator module, but it
could cause APU damage as well.

To prevent this risk, add an explicit sleep call so that future attempts
to enter into HW sleep will have enough time to settle. This will occur
while the screen is dark and only on cases that the APU should enter HW
sleep again, so it shouldn't be noticeable to any user.

Cc: stable@vger.kernel.org
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Acked-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Link: https://lore.kernel.org/r/20250414162446.3853194-1-superm1@kernel.org
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/platform/x86/amd/pmc/pmc.c

index 70907e8f3ea96d3b5f3cc6b780790f55ac344d07..946a546cd9dd014e37e3991f4d9406f43f4d6610 100644 (file)
@@ -823,10 +823,9 @@ static void amd_pmc_s2idle_check(void)
        struct smu_metrics table;
        int rc;
 
-       /* CZN: Ensure that future s0i3 entry attempts at least 10ms passed */
-       if (pdev->cpu_id == AMD_CPU_ID_CZN && !get_metrics_table(pdev, &table) &&
-           table.s0i3_last_entry_status)
-               usleep_range(10000, 20000);
+       /* Avoid triggering OVP */
+       if (!get_metrics_table(pdev, &table) && table.s0i3_last_entry_status)
+               msleep(2500);
 
        /* Dump the IdleMask before we add to the STB */
        amd_pmc_idlemask_read(pdev, pdev->dev, NULL);