From: Matteo Bulloni The ThinkPad T14s Gen 2 AMD is sold under two machine types, 20XF and 20XG, but only 20XF is in the s2idle quirk list. On 20XG machines the Lenovo BIOS SMI handler runs during the NVMe D3->D0 transition, so every resume from s2idle stalls for about 10 seconds with a black screen. Measured on a 20XGS08D00 (BIOS R1NET68W 1.38, Ryzen 7 PRO 5850U) with pm_print_times: every PCI endpoint's pci_pm_resume_noirq returned after ~10.32 s, all finishing at the same moment. With the s2idle_bug_mmio workaround applied for 20XG, the same callbacks take 38-82 ms and the stall is gone. Cc: stable@vger.kernel.org Signed-off-by: Matteo Bulloni --- drivers/platform/x86/amd/pmc/pmc-quirks.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/drivers/platform/x86/amd/pmc/pmc-quirks.c +++ b/drivers/platform/x86/amd/pmc/pmc-quirks.c @@ -56,6 +56,14 @@ } }, { + .ident = "T14s Gen2 AMD", + .driver_data = &quirk_s2idle_spurious_8042, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "20XG"), + } + }, + { .ident = "X13 Gen2 AMD", .driver_data = &quirk_s2idle_spurious_8042, .matches = { -- 2.43.0