From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-42ac.mail.infomaniak.ch (smtp-42ac.mail.infomaniak.ch [84.16.66.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6FF742DCC04 for ; Fri, 1 May 2026 03:27:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=84.16.66.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777606047; cv=none; b=UV0Fim2MzdglVEIL5pOE0A9Ri+VPF3qfZgTpQdYNkVUeiQItg1Hm+/jGR1ONt0i9Tq+D5figHGg2NBvEh5cnR0TTNFQz8cIZgn6HfoeVvVF2esyt6N93oYhhPW+X/ISLY63RFk6EENUfVgp3cDZxvtrlWXIHjqE4ai+7Q6YEO1M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777606047; c=relaxed/simple; bh=n/NmCXpi4W3Gwnft4DFeECuo/XzZUMn3qdmCGP3Z+o0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OSdom8fEeJEbL8foHJE/y6tJ1PtmDplwMtlAWqtYTbQOyG6YTCmUgL6XmdJ2KcR+r440kfFYoHQU5ZbnG433F3ypbzrGSk6j3RSLlnM5Wskcaq6ATdYTe1Efp39i7egsugnBpNYnPQAODB3epTJqBC5ZU1RRdInnp1878D5LnLI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.sh; spf=pass smtp.mailfrom=gibson.sh; dkim=pass (2048-bit key) header.d=gibson.sh header.i=@gibson.sh header.b=dioFEZiR; arc=none smtp.client-ip=84.16.66.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.sh Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gibson.sh Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gibson.sh header.i=@gibson.sh header.b="dioFEZiR" Received: from smtp-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4g6GgY5jFKzLth for ; Fri, 1 May 2026 05:27:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.sh; s=20260228; t=1777606041; bh=fYRyRFkQMEkAqHabar/FCyf0QrY6d1LISKOv19r61D0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dioFEZiRiN0/vY4o8XIkhfkEzJpbYHZFs5tkvwoPeXaXgxBmBvdzr+SnWZM0hNT/g 2qg1skBMCasSWEkRnBxZuQVKOuVz8hQgnb6kFeXZ6vHRUp/60Vsq2u9sFMT/8wQjn5 g21uTFwR+oPgKI3n2b+llllvwSriY8GHF8NhaOWDRE8uRJ6ARKmHA41HrcUY5SduNU nx180fHVF22wZJszvwqSe3fk4eMOhRB/ItYaMat5uY+RTbvGOvQqxfB3Vw1kan6A3t jymrMjxaoQ/K0nb8gSzktscMvdxi3l5nwSlrjZPDLyGcplhF8JU22mTP8eyHlzDtLf rk5rEci6LnVqQ== Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4g6GgY2btRz9hd for ; Fri, 1 May 2026 05:27:21 +0200 (CEST) Received: from unknown by spiderdemon.horst.lan (DragonFly Mail Agent v0.13); Fri, 01 May 2026 05:27:20 +0200 From: Daniel Gibson To: Shyam Sundar S K , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mario Limonciello , Daniel Gibson , Sindre Henriksen Subject: [PATCH 1/2] platform/x86/amd/pmc: Delay suspend for some Lenovo Laptops Date: Fri, 1 May 2026 05:26:54 +0200 Message-ID: <20260501032655.283789-2-daniel@gibson.sh> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260501032655.283789-1-daniel@gibson.sh> References: <20260501032655.283789-1-daniel@gibson.sh> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Infomaniak-Routing: alpha Some IdeaPad Slim 3 devices and similar with AMD CPUs have a nonfunctional keyboard and lid switch after s2idle. It helps to delay suspend by 2.5 seconds so the EC has some time to do whatever it needs to get done before suspend. This issue has been reported for many different devices, this patch has been tested with the Zen3-based IdeaPad Slim 3 16ABR8 (82XR) and the Zen3+-based IdeaPad Slim 3 14ARP10 (83K6), see https://bugzilla.kernel.org/show_bug.cgi?id=221383 Reported-by: Sindre Henriksen Closes: https://bugzilla.kernel.org/show_bug.cgi?id=221383 Tested-by: Sindre Henriksen Tested-by: Daniel Gibson Suggested-by: Mario Limonciello (AMD) Reviewed-by: Mario Limonciello (AMD) Signed-off-by: Daniel Gibson --- drivers/platform/x86/amd/pmc/pmc-quirks.c | 36 +++++++++++++++++++++++ drivers/platform/x86/amd/pmc/pmc.c | 5 +++- drivers/platform/x86/amd/pmc/pmc.h | 1 + 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/amd/pmc/pmc-quirks.c b/drivers/platform/x86/amd/pmc/pmc-quirks.c index 24506e342943..cea30f68f8dc 100644 --- a/drivers/platform/x86/amd/pmc/pmc-quirks.c +++ b/drivers/platform/x86/amd/pmc/pmc-quirks.c @@ -18,6 +18,7 @@ struct quirk_entry { u32 s2idle_bug_mmio; bool spurious_8042; + bool need_suspend_delay; }; static struct quirk_entry quirk_s2idle_bug = { @@ -33,6 +34,10 @@ static struct quirk_entry quirk_s2idle_spurious_8042 = { .spurious_8042 = true, }; +static struct quirk_entry quirk_s2idle_need_suspend_delay = { + .need_suspend_delay = true +}; + static const struct dmi_system_id fwbug_list[] = { { .ident = "L14 Gen2 AMD", @@ -203,6 +208,32 @@ static const struct dmi_system_id fwbug_list[] = { DMI_MATCH(DMI_PRODUCT_NAME, "82XQ"), } }, + /* + * Some Lenovo Laptops (like different IdeaPad 3 Slims) need some + * me-time before sleeping or they get uncooperative after waking + * up and don't send events for keyboard and lid switch anymore. + * See https://bugzilla.kernel.org/show_bug.cgi?id=221383 + */ + { + .ident = "Zen3-based IdeaPad Slim and similar", + .driver_data = &quirk_s2idle_need_suspend_delay, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), + /* + * Note: there are also some Zen2-based 82X* devices that + * need different quirks, they're already handled above + */ + DMI_MATCH(DMI_PRODUCT_NAME, "82X") + } + }, + { + .ident = "Zen3+-based IdeaPad Slim and similar", + .driver_data = &quirk_s2idle_need_suspend_delay, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "83K") + } + }, /* https://bugzilla.kernel.org/show_bug.cgi?id=221273 */ { .ident = "Thinkpad L14 Gen3", @@ -356,6 +387,11 @@ void amd_pmc_process_restore_quirks(struct amd_pmc_dev *dev) amd_pmc_skip_nvme_smi_handler(dev->quirks->s2idle_bug_mmio); } +bool amd_pmc_quirk_need_suspend_delay(struct amd_pmc_dev *dev) +{ + return dev->quirks->need_suspend_delay; +} + void amd_pmc_quirks_init(struct amd_pmc_dev *dev) { const struct dmi_system_id *dmi_id; diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c index cae3fcafd4d7..c604dc7207ed 100644 --- a/drivers/platform/x86/amd/pmc/pmc.c +++ b/drivers/platform/x86/amd/pmc/pmc.c @@ -634,10 +634,13 @@ static void amd_pmc_s2idle_check(void) struct amd_pmc_dev *pdev = &pmc; struct smu_metrics table; int rc; + bool ec_needs_sleep = !disable_workarounds && amd_pmc_quirk_need_suspend_delay(pdev); /* Avoid triggering OVP */ - if (!get_metrics_table(pdev, &table) && table.s0i3_last_entry_status) + if (ec_needs_sleep || (!get_metrics_table(pdev, &table) && table.s0i3_last_entry_status)) { + dev_info(pdev->dev, "Delaying suspend by 2.5s to avoid platform bug\n"); msleep(2500); + } /* Dump the IdleMask before we add to the STB */ amd_pmc_idlemask_read(pdev, pdev->dev, NULL); diff --git a/drivers/platform/x86/amd/pmc/pmc.h b/drivers/platform/x86/amd/pmc/pmc.h index fe3f53eb5955..f5257e47b8c4 100644 --- a/drivers/platform/x86/amd/pmc/pmc.h +++ b/drivers/platform/x86/amd/pmc/pmc.h @@ -147,6 +147,7 @@ enum amd_pmc_def { }; void amd_pmc_process_restore_quirks(struct amd_pmc_dev *dev); +bool amd_pmc_quirk_need_suspend_delay(struct amd_pmc_dev *dev); void amd_pmc_quirks_init(struct amd_pmc_dev *dev); void amd_mp2_stb_init(struct amd_pmc_dev *dev); void amd_mp2_stb_deinit(struct amd_pmc_dev *dev); -- 2.48.1