From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E71DC7EE22 for ; Thu, 20 Apr 2023 11:07:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235363AbjDTLH1 (ORCPT ); Thu, 20 Apr 2023 07:07:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234188AbjDTLFR (ORCPT ); Thu, 20 Apr 2023 07:05:17 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 184A36E9F; Thu, 20 Apr 2023 04:03:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0CA2F647E0; Thu, 20 Apr 2023 11:03:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 746DDC433D2; Thu, 20 Apr 2023 11:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681988583; bh=6tVoMVjbXjSdhw+ClpiLyHKFwImWUjz0a/dDKuM6uMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qFC93I+rYDXYbU+VPcEHnRHvuDxnzpvWcenm6SZpcXAPZSJPRAmV/jwUeQsMnA8vQ tvArOv95oX23Qsymv1fCY7Hc4FQHz0cDg5KcJ2hZ8Q79v9GEzXY6S3Bfw15Z3UEpro ZZ4Rp7flhxpedYAtBLH9LFIkuLYjFtx4fOvh79GFro3CPh3Zz4HPnwpA+ZjRsGHwqG UoS+ktLzEDhb6HFLtcZbL1nWsW22zk3aaLwbAvnR9piM9xfuaAUwikCai5mgvMpR5w bQ8jurF9Pkugr52zUNN12hqCqZArrzHeBtBZdvYIcjy1MRj/98I12mBnyxEY0R+9hm dKB/AW+2OjT3Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Benjamin Asbach , Hans de Goede , Sasha Levin , hmh@hmh.eng.br, markgross@kernel.org, ibm-acpi-devel@lists.sourceforge.net, platform-driver-x86@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 13/15] platform/x86: thinkpad_acpi: Add missing T14s Gen1 type to s2idle quirk list Date: Thu, 20 Apr 2023 07:02:27 -0400 Message-Id: <20230420110231.505992-13-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230420110231.505992-1-sashal@kernel.org> References: <20230420110231.505992-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Benjamin Asbach [ Upstream commit 9a469c6dfab38326f99f105386db84230be09ee3 ] >From the commit message adding the first s2idle quirks: > Lenovo laptops that contain NVME SSDs across a variety of generations have > trouble resuming from suspend to idle when the IOMMU translation layer is > active for the NVME storage device. > > This generally manifests as a large resume delay or page faults. These > delays and page faults occur as a result of a Lenovo BIOS specific SMI > that runs during the D3->D0 transition on NVME devices. Add the DMI ids for another variant of the T14s Gen1, which also needs the s2idle quirk. Link: https://lore.kernel.org/all/20220503183420.348-1-mario.limonciello@amd.com/ Link: https://bbs.archlinux.org/viewtopic.php?pid=2084655#p2084655 Signed-off-by: Benjamin Asbach Tested-by: Benjamin Asbach Link: https://lore.kernel.org/r/20230331232447.37204-1-asbachb.kernel@impl.it Reviewed-by: Hans de Goede Signed-off-by: Hans de Goede Signed-off-by: Sasha Levin --- drivers/platform/x86/thinkpad_acpi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 2a48a2d880d86..d1ec31086e9ba 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -4481,6 +4481,14 @@ static const struct dmi_system_id fwbug_list[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "20UH"), } }, + { + .ident = "T14s Gen1 AMD", + .driver_data = &quirk_s2idle_bug, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "20UJ"), + } + }, { .ident = "P14s Gen1 AMD", .driver_data = &quirk_s2idle_bug, -- 2.39.2