Skip to contentSkip to conversation

FAILED: patch "[PATCH] platform/x86: amd-pmc: only use callbacks for suspend" failed to apply to 5.16-stable tree

PATCH [email protected] 2 participants 2 messages Jan 23, 2022 – Jan 24, 2022

Subsystems (2)
Stable branch x86 platform drivers
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.16-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From d386f7ef9f410266bc1f364ad6a11cb28dae09a8 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <[email protected]>
Date: Fri, 10 Dec 2021 08:35:29 -0600
Subject: [PATCH] platform/x86: amd-pmc: only use callbacks for suspend

This driver is intended to be used exclusively for suspend to idle so callbacks to send OS_HINT during hibernate and S5 will set OS_HINT at the wrong time leading to an undefined behavior.

Cc [email protected]
Signed-off-by Mario Limonciello <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Reviewed-by Hans de Goede <[email protected]>
Signed-off-by Hans de Goede <[email protected]>
drivers/platform/x86/amd-pmc.c +2 -1
index c709ff993e8b..f794343d6aaa 100644
@@ -585,7 +585,8 @@ static int __maybe_unused amd_pmc_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops amd_pmc_pm_ops = {
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(amd_pmc_suspend, amd_pmc_resume)
+	.suspend_noirq = amd_pmc_suspend,
+	.resume_noirq = amd_pmc_resume,
 };
 
 static const struct pci_device_id pmc_pci_ids[] = {
#1 lore raw

[Public]

It looks to me that this was already applied for both 5.15.y and 5.16.y, so that's why it won't be able to apply again, no concerns.

$ git log --oneline stable/linux-5.16.y drivers/platform/x86/amd-pmc.c | grep "only use callbacks for suspend"
09fc14061f3e platform/x86: amd-pmc: only use callbacks for suspend
$ git log --oneline stable/linux-5.15.y drivers/platform/x86/amd-pmc.c | grep "only use callbacks for suspend"
a42c41be8324 platform/x86: amd-pmc: only use callbacks for suspend
Quoted 59 lines

-----Original Message-----
From: [email protected] <[email protected]>
Sent: Sunday, January 23, 2022 08:15
To: Limonciello, Mario <[email protected]>; [email protected]
Cc: [email protected]
Subject: FAILED: patch "[PATCH] platform/x86: amd-pmc: only use callbacks for suspend" failed to apply to 5.16-stable tree

The patch below does not apply to the 5.16-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From d386f7ef9f410266bc1f364ad6a11cb28dae09a8 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <[email protected]>
Date: Fri, 10 Dec 2021 08:35:29 -0600
Subject: [PATCH] platform/x86: amd-pmc: only use callbacks for suspend

This driver is intended to be used exclusively for suspend to idle so callbacks to send OS_HINT during hibernate and S5 will set OS_HINT at the wrong time leading to an undefined behavior.

Cc [email protected]
Signed-off-by Mario Limonciello <[email protected]>

Link:
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.ker
nel.org%2Fr%2F20211210143529.10594-1- mario.limonciello%40amd.com&amp;data=04%7C01%7Cmario.limonciello%40a md.com%7Cec1064b7e16b4b48609208d9de7ab928%7C3dd8961fe4884e608e11 a82d994e183d%7C0%7C0%7C637785440946508125%7CUnknown%7CTWFpbGZ sb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0 %3D%7C3000&amp;sdata=Wbi1ZGIBtIaQAmTiYhLNSb%2BtnHQG93PkLtG2OPN NR%2Bg%3D&amp;reserved=0

Reviewed-by Hans de Goede <[email protected]>
Signed-off-by Hans de Goede <[email protected]>
drivers/platform/x86/amd-pmc.c +2 -1
index c709ff993e8b..f794343d6aaa 100644
@@ -585,7 +585,8 @@ static int __maybe_unused amd_pmc_resume(struct
 device *dev)
 }
 
 static const struct dev_pm_ops amd_pmc_pm_ops = {
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(amd_pmc_suspend,
 amd_pmc_resume)
+	.suspend_noirq = amd_pmc_suspend,
+	.resume_noirq = amd_pmc_resume,
 };

static const struct pci_device_id pmc_pci_ids[] = {