platform-drivers-x86 for v6.1-5
A single fix for 6.12 for suspend/resume issues on some AMD systems. The following is an automated git shortlog grouped by driver: platform/x86/amd: - pmc: Add a workaround for an s0i3 issue on Cezanne -----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEEuvA7XScYQRpenhd+kuxHeUQDJ9wFAmOQyfYUHGhkZWdvZWRl QHJlZGhhdC5jb20ACgkQkuxHeUQDJ9xysAf+PZZ5W+yvgBOQJFok+dehxq2ctgzg sBIG21hAYohuJ3/XbKVHxl07iZRaZ3YWOsO00AFwQL/5TyNx9WzYu1B/kUwf04jU mboqJmnxuTRX76lDKHHJ/T5KQtGYEjqItzPkvqQilpvlcE6z3FJkJ6iiYk2YObD3 BKDhRCiL29Al2o2nkuecGqoBI9b9tdGPIBJdvaItDQfTn4jih3wkdU9Ts2dZaW7N 9K4WEGw3ztHUZDFKnj469lcg1RU4aMUhYFWugMaqqRSClj3Q3xnQbKdhDsn8MQnX VrmOyjfLLpGKox8OAUA0XYnJI20xRMCZj/ejWx4qOdAo/KcUTMcIQ3sP4g== =iSPt -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
479174d402
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue