Commit 479174d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.1-5' of... 

Merge tag 'platform-drivers-x86-v6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fix from Hans de Goede:
 "A single fix for 6.1 for suspend/resume issues on some AMD systems"

* tag 'platform-drivers-x86-v6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86/amd: pmc: Add a workaround for an s0i3 issue on Cezanne
parents b5b52de3 e4678483

drivers/platform/x86/amd/pmc.c

+6 −0
Original line number Diff line number Diff line
@@ -739,8 +739,14 @@ static void amd_pmc_s2idle_prepare(void) 
static void amd_pmc_s2idle_check(void)

{

	struct amd_pmc_dev *pdev = &pmc;

	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);



	/* Dump the IdleMask before we add to the STB */

	amd_pmc_idlemask_read(pdev, pdev->dev, NULL);