diff --git a/drivers/platform/x86/amd/pmc.c b/drivers/platform/x86/amd/pmc.c
index 439d282aafd192a9f051e553f2fe3b2caabfe0e0..0ebf98d15f77b36a69bde5ebbb06f1e72ff2a69f 100644
--- a/drivers/platform/x86/amd/pmc.c
+++ b/drivers/platform/x86/amd/pmc.c
@@ -742,8 +742,8 @@ 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) &&
+	/* Ensure that future s0i3 entry attempts at least 10ms passed */
+	if (!get_metrics_table(pdev, &table) &&
 	    table.s0i3_last_entry_status)
 		usleep_range(10000, 20000);