From patchwork Wed Sep 21 20:40:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12984126 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 39F17C6FA8B for ; Wed, 21 Sep 2022 20:41:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230479AbiIUUk6 (ORCPT ); Wed, 21 Sep 2022 16:40:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230487AbiIUUkz (ORCPT ); Wed, 21 Sep 2022 16:40:55 -0400 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2059.outbound.protection.outlook.com [40.107.223.59]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96AF39DF91; Wed, 21 Sep 2022 13:40:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PjgW5u5vz2ysT77dCBfdHZCTOgQE7LeEwX2zxSUTc4j1R/N1K8KaYMRUd1yBhEepdWX8rE2jfawBkeQMGced1Aaxa+aaor5fwRp2fpZqNQpMp1gPTyVZ3yQlhJVEXRqb8+9xepkv67pta5IbNrsLqY7D0WGxkm+MqdfWGc+KieLzg9px2vX8pTARibGYbvGpKE3jjvrrp0Hjn7j4CXDk37bn+5K4q8Zc+LLGPGHdDkRxZrtH4YoEh1wIkepjysmEvhJSkfMlccca9+UoN73BtrNzMVofJ4HCrxF4ZJ9+9pjtZ1I5R7d8ddOeYjFKnG7LehmEMSpAno81CqK1xyrzsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=j08TOhv36F/p8hgL5sflLK730tx+jsN8nYOB5PstjXk=; b=Tdl5PjyPwZGqG2+RowLzbZdhPk27QgEt3QawB0qK77WkCK8oweXZPgmewsot5WyAIAY/iJ+IPuonHsaNR342SDcLiQPnRi66r0tutDvA95X6iJQ7SeDRnCCNhVue+55+pFP95JnhBhofBQE4EmFyCiBLN3km56vkuHbF273vVIYBuTDwbqp8T1PvsoTQTDHbE6MCfP9lvMF6dZlKX1pGCYOuOvvPTdPticA1Cx0kmEflgIYY4NIZMna1eypqEcCcWGDNobzcl5WPWj1fLB3a5Em6RrbLdgp//1PFh1SYNaUEuYNCaX/NMsbQJR89peXQ58EKNNVYnIWldn4wtt+dtw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j08TOhv36F/p8hgL5sflLK730tx+jsN8nYOB5PstjXk=; b=y8V0FjUSenJCWhoqumdNCL8GZkYWkdS1BUq7IXck3t5c5Er5/Zors2BOwo8J7IRSxL0kEs8JU1cb+zXZHT+6Na5zkA+5DbFot20xfE2uDL71i7kexig2D/UHWQy1wRm4Hufz3WKy4/RX4tkDMSAnTMrwoeWE+8aMz4lkPsaeXNw= Received: from DS7PR05CA0096.namprd05.prod.outlook.com (2603:10b6:8:56::28) by BY5PR12MB4067.namprd12.prod.outlook.com (2603:10b6:a03:212::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Wed, 21 Sep 2022 20:40:52 +0000 Received: from DS1PEPF0000B07A.namprd05.prod.outlook.com (2603:10b6:8:56:cafe::31) by DS7PR05CA0096.outlook.office365.com (2603:10b6:8:56::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.5 via Frontend Transport; Wed, 21 Sep 2022 20:40:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0000B07A.mail.protection.outlook.com (10.167.17.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5654.11 via Frontend Transport; Wed, 21 Sep 2022 20:40:51 +0000 Received: from AUS-LX-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Wed, 21 Sep 2022 15:40:50 -0500 From: Mario Limonciello To: , CC: , , , , , , , , , Mario Limonciello , Len Brown , Subject: [PATCH v4 1/7] acpi/x86: s2idle: Move _HID handling for AMD systems into structures Date: Wed, 21 Sep 2022 15:40:48 -0500 Message-ID: <20220921204055.22889-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220921204055.22889-1-mario.limonciello@amd.com> References: <20220921204055.22889-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000B07A:EE_|BY5PR12MB4067:EE_ X-MS-Office365-Filtering-Correlation-Id: 6229e927-dda4-4f6e-4caf-08da9c1192b5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Naac6fN0VnYkzru8snVNK2RHoLgBh+KTX+EP8Y9EUXG9wIir+zb9QZpJXZKLctnlptukYDMvDOusn3xWe9ARhSH+kIYWFHMM1tly28CkvSMJjZrzx11cENGlnO4/hoz1H6egggDdEOvNUX+kqkLJPO1diilcea2sIccwTMY++wUQ8NY7lXRBHTbXnnE/TBKyE7AJ7lAac6gv2ZHkREG3PxH1QOoAYx732zV1NHr1Sjh0o/ka05ceBq5FQtrseeQFemE5vQoiE0aP1tTJde7daHcbcX/tcx5n/3L6IQQSfVqUhTs5cy4MH2OdvTYv7l5fxzIGJcYupTqguxhDvPSnpMPSctx2ahN8N2T39qEyvHEhAq2sIh9i1GDengvxkEllufmDQc23Gp3cWKsdL9KAD86l0qUkXw8Aeoa1+W98kstGsRV7sINBAbI8v/p98XNTw2q2iMRo8kiXHYL8sC6wLXYeqesEQ/KOhaMAbuCW/CbXjDO4o6ZWU0h7pFCdXJ43V2hPOTuogqPIVdo0U0yYCDSjfgLl7bELCv+ztfcXsySGsBBEowSlgBWXywneaXOzfu3a0RwhVzLJgVN4vw6vMWsbw1i00RQJsh3ec+VCJSNgjveuAGQv174OpW49dTwsKiuMuk2aMdHIdast+Me2xh2wrZOM03iikTd63I1ldcSSpoU4Q+eL0zw/qnX623Kvvj5/AKGOBM93s+hBFTv7cRSN/hc2JInap36YQPtzlENzKT87UsaMh2/cmyjaxOzwi0XlnELY/zKKJ/lltn5KEDwamCdgEnPuJBpF0Hijf6xgE39aaPtJq6G0WbneTJd0 X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(346002)(396003)(376002)(136003)(39860400002)(451199015)(46966006)(36840700001)(40470700004)(47076005)(2616005)(83380400001)(16526019)(336012)(1076003)(426003)(82740400003)(44832011)(356005)(81166007)(36860700001)(2906002)(7416002)(41300700001)(82310400005)(40480700001)(8936002)(70206006)(5660300002)(478600001)(7696005)(70586007)(40460700003)(26005)(8676002)(4326008)(45080400002)(316002)(54906003)(110136005)(186003)(86362001)(36756003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2022 20:40:51.4984 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6229e927-dda4-4f6e-4caf-08da9c1192b5 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000B07A.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4067 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Right now the information about which cases to use for what are in a comment, but this is error prone. Instead move all information into a dedicated structure. Tested-by: catalin@antebit.com Reviewed-by: Philipp Zabel Tested-by: Philipp Zabel # GA402RJ Signed-off-by: Mario Limonciello --- v2->v3: * Add tags * Don't check for != NULL --- drivers/acpi/x86/s2idle.c | 63 ++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index f9ac12b778e6..28a3ef9a6bc1 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -363,6 +363,39 @@ static int validate_dsm(acpi_handle handle, const char *uuid, int rev, guid_t *d return ret; } +struct amd_lps0_hid_device_data { + const unsigned int rev_id; + const bool check_off_by_one; + const bool prefer_amd_guid; +}; + +static const struct amd_lps0_hid_device_data amd_picasso = { + .rev_id = 0, + .check_off_by_one = true, + .prefer_amd_guid = false, +}; + +static const struct amd_lps0_hid_device_data amd_cezanne = { + .rev_id = 0, + .check_off_by_one = false, + .prefer_amd_guid = false, +}; + +static const struct amd_lps0_hid_device_data amd_rembrandt = { + .rev_id = 2, + .check_off_by_one = false, + .prefer_amd_guid = true, +}; + +static const struct acpi_device_id amd_hid_ids[] = { + {"AMD0004", (kernel_ulong_t)&amd_picasso, }, + {"AMD0005", (kernel_ulong_t)&amd_picasso, }, + {"AMDI0005", (kernel_ulong_t)&amd_picasso, }, + {"AMDI0006", (kernel_ulong_t)&amd_cezanne, }, + {"AMDI0007", (kernel_ulong_t)&amd_rembrandt, }, + {} +}; + static int lps0_device_attach(struct acpi_device *adev, const struct acpi_device_id *not_used) { @@ -370,31 +403,27 @@ static int lps0_device_attach(struct acpi_device *adev, return 0; if (acpi_s2idle_vendor_amd()) { - /* AMD0004, AMD0005, AMDI0005: - * - Should use rev_id 0x0 - * - function mask > 0x3: Should use AMD method, but has off by one bug - * - function mask = 0x3: Should use Microsoft method - * AMDI0006: - * - should use rev_id 0x0 - * - function mask = 0x3: Should use Microsoft method - * AMDI0007: - * - Should use rev_id 0x2 - * - Should only use AMD method - */ - const char *hid = acpi_device_hid(adev); - rev_id = strcmp(hid, "AMDI0007") ? 0 : 2; + static const struct acpi_device_id *dev_id; + const struct amd_lps0_hid_device_data *data; + + for (dev_id = &amd_hid_ids[0]; dev_id->id[0]; dev_id++) + if (acpi_dev_hid_uid_match(adev, dev_id->id, NULL)) + break; + if (dev_id) + data = (const struct amd_lps0_hid_device_data *) dev_id->driver_data; + else + return 0; + rev_id = data->rev_id; lps0_dsm_func_mask = validate_dsm(adev->handle, ACPI_LPS0_DSM_UUID_AMD, rev_id, &lps0_dsm_guid); lps0_dsm_func_mask_microsoft = validate_dsm(adev->handle, ACPI_LPS0_DSM_UUID_MICROSOFT, 0, &lps0_dsm_guid_microsoft); - if (lps0_dsm_func_mask > 0x3 && (!strcmp(hid, "AMD0004") || - !strcmp(hid, "AMD0005") || - !strcmp(hid, "AMDI0005"))) { + if (lps0_dsm_func_mask > 0x3 && data->check_off_by_one) { lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) | 0x1; acpi_handle_debug(adev->handle, "_DSM UUID %s: Adjusted function mask: 0x%x\n", ACPI_LPS0_DSM_UUID_AMD, lps0_dsm_func_mask); - } else if (lps0_dsm_func_mask_microsoft > 0 && + } else if (lps0_dsm_func_mask_microsoft > 0 && data->prefer_amd_guid && (!strcmp(hid, "AMDI0007") || !strcmp(hid, "AMDI0008"))) { lps0_dsm_func_mask_microsoft = -EINVAL; From patchwork Wed Sep 21 20:40:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12984125 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 B4761ECAAD8 for ; Wed, 21 Sep 2022 20:41:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230525AbiIUUk6 (ORCPT ); Wed, 21 Sep 2022 16:40:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229912AbiIUUk5 (ORCPT ); Wed, 21 Sep 2022 16:40:57 -0400 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2059.outbound.protection.outlook.com [40.107.100.59]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F8CB9AFBE; Wed, 21 Sep 2022 13:40:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HjU/KTxZfCFuWPXeD76kOUNtBoXeCP9SLAvLGNkGWwma7T1hvlLCzRX4X48Us1hhyk00mUiixsoX0wW73kfZHtgH/LG1tfVGvaPR/e+qhK0GjJlL9SndN6z4ePyG6KhW6UBsmIxGYJC4N6xvPmNH7agdiAqZczhvTyTjRJFIu4NuXLepLrCyHD2xuThkeCFnNdozskAXvzWMYCyFaG0Ac5ezMenS0hHrY0NgryB5mImvUwD7ZE2UkTuINJerT8bbSEQF923cn3ezJi+RxqHePPnX6dQaXU0VfPMOeNwn2DTIJ8DsB6idDB+yAYHIO9Fe4nX9xn6d8a0wgsTReaexkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WX01IQsh1BxsH+c5+jv84ywbcDBl7HEozausjPBN5W4=; b=FC2gk974CwE7ASLQv6i7a/jdURkrGDv7bhuxZoENSdgznFZGJA0+UDykDijamblJynoVHCbMuRU2cT5NZHWMIIP9uwmqn0okpxkplktbE3XKVpv6nqRglsrjV7f+wjVH6I0YVOyoIh280ZqwCOspXlrcfZ9ptHTAfqQdT8ylJ6Fdm3DSZJSGWDX/AXS8AeX8iAy7IB+fm4E8dwxVk7UwGUAQaKAxLrzU0HjAyYiLOOY+WKKOMqKzWEWfB1aeJzKjYFOBxXRHGmNWBKk+Cmd4KnKyECopvQxNBSx2DBDbiTAsu5G4Wmw7YFaKDC/5xvaHPlsgu6acbAuKFrfi/laydA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WX01IQsh1BxsH+c5+jv84ywbcDBl7HEozausjPBN5W4=; b=z5T5YsXNubOAlt8TfdKBAqRUOJiRE/lnQKWj7FMafZVVweDYmVgrOtQYW8CBAjdXsCSfjefiIobsfFbGvWng+NOe/Y1i8Gtn2ici2+iX0MDESK/X8qv4GxxQwVEvVoHQ8vPtlpq8/xLRNyIaQqMMclEZH4nqHH/ImJWYEmRh4+E= Received: from DM6PR07CA0102.namprd07.prod.outlook.com (2603:10b6:5:337::35) by PH7PR12MB7354.namprd12.prod.outlook.com (2603:10b6:510:20d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.21; Wed, 21 Sep 2022 20:40:53 +0000 Received: from DS1PEPF0000B077.namprd05.prod.outlook.com (2603:10b6:5:337:cafe::e2) by DM6PR07CA0102.outlook.office365.com (2603:10b6:5:337::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.17 via Frontend Transport; Wed, 21 Sep 2022 20:40:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0000B077.mail.protection.outlook.com (10.167.17.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5654.11 via Frontend Transport; Wed, 21 Sep 2022 20:40:52 +0000 Received: from AUS-LX-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Wed, 21 Sep 2022 15:40:51 -0500 From: Mario Limonciello To: , CC: , , , , , , , , , Mario Limonciello , Len Brown , Subject: [PATCH v4 2/7] acpi/x86: s2idle: If a new AMD _HID is missing assume Rembrandt Date: Wed, 21 Sep 2022 15:40:49 -0500 Message-ID: <20220921204055.22889-3-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220921204055.22889-1-mario.limonciello@amd.com> References: <20220921204055.22889-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000B077:EE_|PH7PR12MB7354:EE_ X-MS-Office365-Filtering-Correlation-Id: 81dc4fb3-7a33-4610-109f-08da9c1193bf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Hs2kxDjjPu8Ow57L5qmltYOii6CnB6wCD1e6wOsaR+yFMeQBoO0AhzYqVnj7saTPtEfNaEjv+WCeyBdAorA1D4Arads80Yefp3/qMXNbb52h8e7Pl1hcLQlkG6UJJzVIl4Ku3EN4mZPxmOHEoyOS16Lvv8h7//Nr1AOPD5MAtQM4/koyUosVXkjarwUVhcoYI1JX6Zhvm9Kbq61EWeO4tXDqgUqzpV5yYUyYr1hRFT0ICHW36yAt6V9QLBIRFrY6R3FrN7yQBg/eD8g8q45DAamoRA9YazUxaIJn2XyBpMoYM+YV1PU+OMNyo5R41lB02jDvJ6trU1tOXeZwjZv6cBrmbiPIWEwf1ZedOOZu8qIG0w7x7V+BKCg3Hw6EAVmKs9uOFLHPqnjFh6ugEdbQri6p4YL9rT01aNhSy/nDBoseL/Q7ldtP8O/Tff6dRrR+wqlqbKLVE0QGxaDtZEU+EVMrELnlNNtEmHwKW3Kp2it7L3SwyOSr2D4rOfK0FAnXW+ozGrLwz87/+izz1MLSRTRD6moxgaXIsYIHzUJY2EkY/qUay2Q74wCbwyvI0oefituj9I+adbteb7/WoQV9X1np6yCNgo48dhY3NecRz22BcxRuoXL5Lmlo8NMljZ2qVcDU/cRVaxRhiabwSewp+GrhqGUXIJK3sNrQow3XAe4y3hhPzSfDqArYHF10k7xRs0MQpnEh/kdMvOCtBs90ujLcE6/sdPL+h0kJq+o01Ca8B+bz38tnnhjlfH/ecnjPSUZolJ6+5mflwYHM22eI81pWQ0yK5WCo+iI4f8ciKZHTgjwAD9EhAF7KznxFeppT X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(346002)(396003)(376002)(136003)(451199015)(46966006)(36840700001)(40470700004)(44832011)(40480700001)(2906002)(82310400005)(36860700001)(426003)(47076005)(7416002)(5660300002)(8936002)(36756003)(8676002)(86362001)(70206006)(316002)(110136005)(4326008)(70586007)(82740400003)(186003)(1076003)(478600001)(356005)(336012)(16526019)(26005)(2616005)(40460700003)(83380400001)(54906003)(81166007)(41300700001)(7696005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2022 20:40:52.9902 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 81dc4fb3-7a33-4610-109f-08da9c1193bf X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000B077.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7354 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org A mistake was made that only AMDI0007 was set to rev of "2", but it should have been also set for AMDI008. If an ID is missing from the _HID table, then assume it matches Rembrandt behavior. This implicitly means that if any other behavior changes happen in the future missing IDs must be added to that table. Tested-by: catalin@antebit.com Reviewed-by: Philipp Zabel Tested-by: Philipp Zabel # GA402RJ Signed-off-by: Mario Limonciello --- v2->v3: * Add tags --- drivers/acpi/x86/s2idle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index 28a3ef9a6bc1..2c5931d247a2 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -412,7 +412,7 @@ static int lps0_device_attach(struct acpi_device *adev, if (dev_id) data = (const struct amd_lps0_hid_device_data *) dev_id->driver_data; else - return 0; + data = &amd_rembrandt; rev_id = data->rev_id; lps0_dsm_func_mask = validate_dsm(adev->handle, ACPI_LPS0_DSM_UUID_AMD, rev_id, &lps0_dsm_guid); From patchwork Wed Sep 21 20:40:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12984127 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 29AE1ECAAD8 for ; Wed, 21 Sep 2022 20:41:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231136AbiIUUlC (ORCPT ); Wed, 21 Sep 2022 16:41:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231139AbiIUUk6 (ORCPT ); Wed, 21 Sep 2022 16:40:58 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2080.outbound.protection.outlook.com [40.107.94.80]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 154299AFDB; Wed, 21 Sep 2022 13:40:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cShTlf8oPjCWnSDt9Gqo4/QCjLm4w9jIAusaK7hIMBCW6hVrZ2PNFhp14mzeu25RYz0YALz6rEHFbRJ3icxbTIBBJsmEKgVvpCtB9GNfdGvgRMpWhVwIud+quq/doM0Fq1Fdd6iVwQbsFhqyIWlinXB/O3yK69eImpFKDHbDQ9ou3Qnn2SJ7H+rp9k45ny8APSF2EAcqlPTgLyKpxC9MHvVRo9yQmeNtJt5kZLrlWH3wQiVrR70EmiTjhjsxNn5LVv0R9vRwIYlVxtPza2Gdn8Nv3G2K7lJUtsATtj9xDhijqPklVEfV4xcjVdgJbaGVNhCEsyCVmcpVnOPvZN1kYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bu+mo1iXMAanBkfxUMrBrYqB1ngbY/23z24VwDxRvUs=; b=AzDmazSC9GHq3VL78+tbs7GuEBkQrqEc5pi5NfsyNiVmoAUkDV3ImsLxyGmouh4t6dUUAbD9NGUn9q60EUwAM928IOpeCgAgqBtbirA2h/BCiYLpOkTPQnKb0Yqdn56A/buqSgpQH/JhoJvhvn/eGgKsq/GmOdATkn/nNHV+rLIiZNUHPUHrmfD1+9JE+kidSoJAUaSV7HAqyt/neH8/L8t8aOTsicUBqU+/Rl8AqxWdwRUDrCK4DxUqQMMeZFSvryqv9apJEqa1dC+J74DOwpJnazR/sOnEJQpWaDU21/+wPpu1zfkjBt6NDHM9hTgbUVYzRC7Inn6qqJ+Rq8ocOA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bu+mo1iXMAanBkfxUMrBrYqB1ngbY/23z24VwDxRvUs=; b=Lf/ECWzT5IUM8t9j+scjzfAku3M20r3R5BoJKUC8643yN5L5kWCTSqPLEovf+ISt9WLz15WOYvJXiMpHmVJK8oDMwVAnlV+pVt0MozAjj0twyfeqm/vSwxjfog26D/VIC1Gk9mdgvlOzIhPi7rwXPdEGjJFUfP9BjjqHCwwMK9M= Received: from DM6PR07CA0080.namprd07.prod.outlook.com (2603:10b6:5:337::13) by CO6PR12MB5443.namprd12.prod.outlook.com (2603:10b6:303:13a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.17; Wed, 21 Sep 2022 20:40:55 +0000 Received: from DS1PEPF0000B077.namprd05.prod.outlook.com (2603:10b6:5:337:cafe::cd) by DM6PR07CA0080.outlook.office365.com (2603:10b6:5:337::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.17 via Frontend Transport; Wed, 21 Sep 2022 20:40:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0000B077.mail.protection.outlook.com (10.167.17.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5654.11 via Frontend Transport; Wed, 21 Sep 2022 20:40:55 +0000 Received: from AUS-LX-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Wed, 21 Sep 2022 15:40:52 -0500 From: Mario Limonciello To: , CC: , , , , , , , , , Mario Limonciello , Len Brown , Subject: [PATCH v4 3/7] acpi/x86: s2idle: Add module parameter to prefer Microsoft GUID Date: Wed, 21 Sep 2022 15:40:50 -0500 Message-ID: <20220921204055.22889-4-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220921204055.22889-1-mario.limonciello@amd.com> References: <20220921204055.22889-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000B077:EE_|CO6PR12MB5443:EE_ X-MS-Office365-Filtering-Correlation-Id: 69a936f5-e0dc-425e-65e2-08da9c1194d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /vsgOQzOHFBzl5EySF2ddchPdhv9GgYbMCi0rIXQIm13ysvr2faAblWeuL2ATjApYrOWvW2sgNaLoHRIY52vK8Ftj8ccGVEIdYhTsu5IidLDP6LeXdDg8GEz9WCr3Gvu1+s6avpgPv+BzIaR1RpIfS2IUi9GnW4aSzDT9A+K+JkMTVNdFjUm7q0NYdkURaYxf0ZlhxaeyEMN96Hw7+J2lIVQUcOc2GyozS+jk7Z0DN/ngkvMUu2FqupU726ioeZQoRgVFMV6/U2m/CNohYqOuEuAxZK7MYoeLhIC1xHQnOvyRJNI93uq3aAlh0tof2hKk4YCnSE7sTvOnxgqdboZLlTi2C+9cLowPZ4xAVN5CSeqBgZjtYu/tDiTi34zQLuXGLcni//RTUejCzaohd+M8maEV4p9bNZ8qVeMWVe7GQp00kYAa0GeG05oDKYlZGwaRIWYwYG/E/l65VHZdhrWdQujW+3250RwAPH1un8PTgqkOGlKS8O5XRTbFjvLvl2EcGk66sLqHqWD/FvegHYIG+c/Fe6mo4SV9ckLXOok1wjakYwBFSblGYzs8IOGDUxzWdXefN1F7OcTREhJpqjubSs5ho+BMSpcfTGiJUvzd8gdNoBCU6vGrSHB7Lrps9sPyymDZ7wVyuhWWWXr9nDNChVW56YM8Ajj8cvKFq25+OEiEpxd5qNL1vz/ddkFRsmM0CLrfBDzHg5oHd9MhWkrKfRI5jNg+C84aHdybi25GMYFWXT/YsuSoZwHZXawcf6Z6gNbbBAypNO8IIfBcjAT1F3DYX9C7+GxBJ5ZHUDLEC9NgYsNUebulUnETcFSMIQe X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(136003)(346002)(39860400002)(396003)(376002)(47530400004)(451199015)(40470700004)(46966006)(36840700001)(45080400002)(478600001)(4326008)(36756003)(41300700001)(5660300002)(7416002)(8936002)(54906003)(8676002)(316002)(110136005)(70586007)(70206006)(82310400005)(356005)(81166007)(36860700001)(40480700001)(82740400003)(26005)(2616005)(426003)(7696005)(52230400001)(40460700003)(186003)(1076003)(16526019)(336012)(83380400001)(47076005)(86362001)(2906002)(44832011)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2022 20:40:55.0371 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 69a936f5-e0dc-425e-65e2-08da9c1194d8 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000B077.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR12MB5443 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org OEMs have made some mistakes in the past for the AMD GUID support and not populated the method properly. To add an escape hatch for this problem introduce a module parameter that can force using the Microsoft GUID. This is intentionally introduced to both Intel and AMD codepaths to allow using the parameter as a debugging tactic on either. Reviewed-by: Philipp Zabel Tested-by: Philipp Zabel # GA402RJ Signed-off-by: Mario Limonciello --- v3->v4: * Rename parameter and string per Rafael's request v2->v3: * Add tags --- drivers/acpi/x86/s2idle.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index 2c5931d247a2..725d2a6c87ed 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -27,6 +27,10 @@ static bool sleep_no_lps0 __read_mostly; module_param(sleep_no_lps0, bool, 0644); MODULE_PARM_DESC(sleep_no_lps0, "Do not use the special LPS0 device interface"); +static bool prefer_microsoft_dsm_guid __read_mostly; +module_param(prefer_microsoft_dsm_guid, bool, 0644); +MODULE_PARM_DESC(prefer_microsoft_dsm_guid, "Prefer using Microsoft GUID in LPS0 device _DSM evaluation"); + static const struct acpi_device_id lps0_device_ids[] = { {"PNP0D80", }, {"", }, @@ -402,6 +406,9 @@ static int lps0_device_attach(struct acpi_device *adev, if (lps0_device_handle) return 0; + lps0_dsm_func_mask_microsoft = validate_dsm(adev->handle, + ACPI_LPS0_DSM_UUID_MICROSOFT, 0, + &lps0_dsm_guid_microsoft); if (acpi_s2idle_vendor_amd()) { static const struct acpi_device_id *dev_id; const struct amd_lps0_hid_device_data *data; @@ -416,16 +423,12 @@ static int lps0_device_attach(struct acpi_device *adev, rev_id = data->rev_id; lps0_dsm_func_mask = validate_dsm(adev->handle, ACPI_LPS0_DSM_UUID_AMD, rev_id, &lps0_dsm_guid); - lps0_dsm_func_mask_microsoft = validate_dsm(adev->handle, - ACPI_LPS0_DSM_UUID_MICROSOFT, 0, - &lps0_dsm_guid_microsoft); if (lps0_dsm_func_mask > 0x3 && data->check_off_by_one) { lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) | 0x1; acpi_handle_debug(adev->handle, "_DSM UUID %s: Adjusted function mask: 0x%x\n", ACPI_LPS0_DSM_UUID_AMD, lps0_dsm_func_mask); } else if (lps0_dsm_func_mask_microsoft > 0 && data->prefer_amd_guid && - (!strcmp(hid, "AMDI0007") || - !strcmp(hid, "AMDI0008"))) { + !prefer_microsoft_dsm_guid) { lps0_dsm_func_mask_microsoft = -EINVAL; acpi_handle_debug(adev->handle, "_DSM Using AMD method\n"); } @@ -433,7 +436,8 @@ static int lps0_device_attach(struct acpi_device *adev, rev_id = 1; lps0_dsm_func_mask = validate_dsm(adev->handle, ACPI_LPS0_DSM_UUID, rev_id, &lps0_dsm_guid); - lps0_dsm_func_mask_microsoft = -EINVAL; + if (!prefer_microsoft_dsm_guid) + lps0_dsm_func_mask_microsoft = -EINVAL; } if (lps0_dsm_func_mask < 0 && lps0_dsm_func_mask_microsoft < 0) From patchwork Wed Sep 21 20:40:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12984128 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 9F6B6C6FA8E for ; Wed, 21 Sep 2022 20:41:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231164AbiIUUlD (ORCPT ); Wed, 21 Sep 2022 16:41:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231126AbiIUUlA (ORCPT ); Wed, 21 Sep 2022 16:41:00 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2082.outbound.protection.outlook.com [40.107.237.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A8D59DF91; Wed, 21 Sep 2022 13:40:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BgX90EABTAaSuyjCpXDhxD5kYqIc/EGyRuOJgIIclC0TevWbMW4WgHe873Ghs2I8c95li3C1P2CgkfkhA0aNESMXNDvfGViIcRvrsOMc4+0lS3yUTbcZlOoPou3RGdT7o7ZTRwFdKWWuJcMuF3b7G8Lxsdt7brcxcGD53QyxTQRnirIde1PudC88j+RWvGqYoPle075EBCd0yqQpoPENtXtDG+LJUXSZ3fisWXo9n9nF2XEQIiFiZP5D7ytr/hsCOGoNrnfGHaxqeo1TfMVqga0acIr98WkTq3E5b0r8OFrDLhOxefOGVG8h545WEaAHE2k4r0OTOr4A+XXZJsJ4lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KKqcJNcHmIvYByUS375q8UZD1SDsKqYT2s5xqmccxRs=; b=fQE7EAVvaCdv3+WaJ5hOHNlURTdHoerDVQYvn60EGLXJPqESJwOsAowwZ5Ab/2f2ObtsVw4EzThFJ5ue2ueB2X5z5CGVJ+HhqzIjcSjBhWpAuw9iPnMikymksNWD+No5TCnNAIyZGb5e67UGuSDI1SS0m1tA+DRYgPn6sGUPZ68C276X+5ISlgVe6Wuuy5ZsTAk3XkUvlY3XJbWN1j+dC0oDzPiJIucUXhK01Rt2yTgPeUUozGIVTHdHr5negaysrD9C9rX4h9B02MpfnPvLEFEGrsE6BQNSzdVTTw44Ol34/8RuNqbuZ8jOxBZlOa0DkJg1WBmOJ8UoJUAJjE3V1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KKqcJNcHmIvYByUS375q8UZD1SDsKqYT2s5xqmccxRs=; b=wuMZmww7Zaq+V85riYR8qFfVrk82MlXlQT7NN2yNZ6oVcVlShdhQRPXb7lgG4Km4XugT4iig9KiWCY2xuRRj8PdrDsc584kTkKuyYwn2uZkm7Kt4o/SZmcwRx4d4crxzhqgS6LTLqzfeu2y1RAhYTL3DuXRPP859SfEyCuZpHGA= Received: from DM6PR07CA0097.namprd07.prod.outlook.com (2603:10b6:5:337::30) by PH8PR12MB7112.namprd12.prod.outlook.com (2603:10b6:510:22c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.17; Wed, 21 Sep 2022 20:40:56 +0000 Received: from DS1PEPF0000B077.namprd05.prod.outlook.com (2603:10b6:5:337:cafe::80) by DM6PR07CA0097.outlook.office365.com (2603:10b6:5:337::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.17 via Frontend Transport; Wed, 21 Sep 2022 20:40:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0000B077.mail.protection.outlook.com (10.167.17.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5654.11 via Frontend Transport; Wed, 21 Sep 2022 20:40:56 +0000 Received: from AUS-LX-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Wed, 21 Sep 2022 15:40:54 -0500 From: Mario Limonciello To: , CC: , , , , , , , , , Mario Limonciello , Len Brown , Subject: [PATCH v4 4/7] acpi/x86: s2idle: Add a quirk for ASUS TUF Gaming A17 FA707RE Date: Wed, 21 Sep 2022 15:40:51 -0500 Message-ID: <20220921204055.22889-5-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220921204055.22889-1-mario.limonciello@amd.com> References: <20220921204055.22889-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000B077:EE_|PH8PR12MB7112:EE_ X-MS-Office365-Filtering-Correlation-Id: 32472976-00eb-4549-5bbf-08da9c1195b1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0kuJJhLdyIv9B4MuqzFBEKRZHy82LJwytv4zFke8yXPwb4trRCFl8u9yhR9qGrBkg/nGgsej4228ZnJb0BQzwM0t9plYQGm5kz/0m3PavgtHwsmccwLfgiBnsEwjvs/E8iFmHNXi3TbJYgmWRuaZIz0Hb+5cswl1serCBieUWwghrgRhtnu8BZkTOo75xQckCxksDc9oOdQTm7ZAZmTdxsBTuAZqc7/rg1jUUjHMR9YNkfbm5Fu80WZbteBEbnzrT/OKLp9YN1hEfmAnAGKemfCf+458pKSrQ7x7+2DUgpLectuaEBndRkAQzbygqA7mCffivbg/4wEJ0G78UFTHv8WdfuspaIzdZKwsOup+fafw+dZVjAwmAzBddDT6mr93qjDGNZqLt3v5iAR8sIA9cEDfs/8hTP5+qYkUjxQJ47pnl2bHXL+fqFNHFkdAT/efVoqQgBs6KkvPCeeqYiYmQ5GJFW+qfmU6fgXzGWGKE48yI+8IHy4qDgsnGfrA14aJ1ML3QFnEBwCnyZYIc3GvHmsviuF6N3eFWeI92J424zHaDm1EPmSbS5SLOziW9MO6WIvdJYfNnFyJ7QKft71TaYRGFcmg8EqJ0BKQ+u1jYQDSi+NVXSOU65zEGZE0ou0yeQU3lPx2ycBGxJIkVQ/5B9FJJQBKTDfWhSNda+CTGtAKc+3v9Xx9h6iLcnxAPeBnpRO9TpaXbJ3gElx2ZE+V3h5SHZVZuaWW6auQbdCtbJAoGhyyrH5iDQ9LZOZdfVUrls5eOND/jmo9i9CdhSxOJE9omdOaNJ69AB39nhkyKFEpRrS7n99EtszjHwEBNQv5XwtMvTHdL4sOP4Ooe8J+pA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(136003)(376002)(346002)(39860400002)(396003)(451199015)(36840700001)(40470700004)(46966006)(82310400005)(6666004)(110136005)(478600001)(26005)(81166007)(356005)(316002)(54906003)(45080400002)(966005)(5660300002)(36860700001)(16526019)(86362001)(40480700001)(186003)(8676002)(426003)(336012)(1076003)(2616005)(47076005)(36756003)(2906002)(40460700003)(44832011)(8936002)(41300700001)(7696005)(70206006)(70586007)(83380400001)(7416002)(4326008)(82740400003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2022 20:40:56.5214 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 32472976-00eb-4549-5bbf-08da9c1195b1 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000B077.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7112 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org ASUS TUF Gaming A17 FA707RE has problems with ACPI events after s2idle resume. It's from a missing call to an ASL method in AMD the s2idle calling path. Force the system to use the Microsoft Modern Standby calling path instead. Link: https://bugzilla.kernel.org/show_bug.cgi?id=216101 Reported-and-tested-by: catalin@antebit.com Reviewed-by: Philipp Zabel Tested-by: Philipp Zabel # GA402RJ Signed-off-by: Mario Limonciello --- v3->v4: * Rename parameter per change in 3/7 v2->v3: * Add tags v1->v2: * Fixup for __init --- drivers/acpi/x86/s2idle.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index 725d2a6c87ed..99eae362de6d 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -17,6 +17,7 @@ #include #include +#include #include #include "../sleep.h" @@ -400,6 +401,28 @@ static const struct acpi_device_id amd_hid_ids[] = { {} }; +static int lps0_prefer_microsoft(const struct dmi_system_id *id) +{ + pr_debug("Preferring Microsoft GUID.\n"); + prefer_microsoft_dsm_guid = true; + return 0; +} + +static const struct dmi_system_id s2idle_dmi_table[] __initconst = { + { + /* + * ASUS TUF Gaming A17 FA707RE + * https://bugzilla.kernel.org/show_bug.cgi?id=216101 + */ + .callback = lps0_prefer_microsoft, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "ASUS TUF Gaming A17"), + }, + }, + {} +}; + static int lps0_device_attach(struct acpi_device *adev, const struct acpi_device_id *not_used) { @@ -566,8 +589,9 @@ static const struct platform_s2idle_ops acpi_s2idle_ops_lps0 = { .end = acpi_s2idle_end, }; -void acpi_s2idle_setup(void) +void __init acpi_s2idle_setup(void) { + dmi_check_system(s2idle_dmi_table); acpi_scan_add_handler(&lps0_handler); s2idle_set_ops(&acpi_s2idle_ops_lps0); } From patchwork Wed Sep 21 20:40:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12984129 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 13346ECAAD8 for ; Wed, 21 Sep 2022 20:41:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231139AbiIUUlR (ORCPT ); Wed, 21 Sep 2022 16:41:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231179AbiIUUlD (ORCPT ); Wed, 21 Sep 2022 16:41:03 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2087.outbound.protection.outlook.com [40.107.92.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2855A9AFF2; Wed, 21 Sep 2022 13:41:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iHivs/eellJJzBlQmnyIACrjz7S9GWV8tn4l4q+ret0jR7kUfLhIkHDd3YejW1FDfaCIC7cA3UwAGIheWOzdra2KbczBsh2bHtu6Kj32vmBNV0HkDnl+HfkuzzpJAc8K0SlPvpmBCI5S9dvhicZhEKUYYMf6tvQWK9kmWBG+CQq4Jh4KMekfg1ihXrnhKhlpy55PsizmCv9nT40jVz068ezCFaJ27CpeEhMXaw8XL+ce+1y6h4TDQ8C7k0IHI1V1uUCI3VOWQsyVagguFe2XJsol09IOnNSOcuHsR4gpUi+OsUBrdSEtHpvl3CzYqEAySYcl56OC/FrkyX2/XTL4QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cmAk/8L+coGzY4tBa8Q4np3URFhbQsc8/wCA/KWjjOc=; b=FFcScU1vrWMR2SFR/FB0aIdARgq2gVL/zaLtwY1Q5QRB73bCokhYGG2Ze6RCTAlRX+TMWJ2VLulIFGnFS2jfhbU353g6hrfx26RXVIjwNYlPpXqcQeCp92EPr/lYEyx8rP9tSWy/Mdq8S4pTHb3evVC5uWtgwyhpoABu18Jl20d2/UNXqVj1kOhZp07FKZ78sKU8MyboVObboJF8sZYcWa7yZHt3er1vWVw/RZYqziLUJlYa2wSigWJbc2NZmA4Ks/Y1aEFpajPtt77K1jWGp15nbmdJetlEuK31410eoFZE40rnyBPefgNhtEXQyWDv/tok+Xe8WPrfVlaMJOvZEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cmAk/8L+coGzY4tBa8Q4np3URFhbQsc8/wCA/KWjjOc=; b=ev6j2hJFlvmD/KDcHn30BlIQChbx9UqkVApT9Nh10tOgiC8BNstEZc85LcPya18cXR0RMkT5UVJ+p3Jf5ZORW+vLKsr6LOZakE/lsylUi60H2lkbNiubJjT9JvyWKCTvRZkGEPbiTwiPWwC+1r5VMR2usRU73c6U9HBjZT/fnhg= Received: from DM6PR07CA0095.namprd07.prod.outlook.com (2603:10b6:5:337::28) by PH7PR12MB5925.namprd12.prod.outlook.com (2603:10b6:510:1d8::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.18; Wed, 21 Sep 2022 20:40:58 +0000 Received: from DS1PEPF0000B077.namprd05.prod.outlook.com (2603:10b6:5:337:cafe::9e) by DM6PR07CA0095.outlook.office365.com (2603:10b6:5:337::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16 via Frontend Transport; Wed, 21 Sep 2022 20:40:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0000B077.mail.protection.outlook.com (10.167.17.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5654.11 via Frontend Transport; Wed, 21 Sep 2022 20:40:58 +0000 Received: from AUS-LX-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Wed, 21 Sep 2022 15:40:56 -0500 From: Mario Limonciello To: , CC: , , , , , , , , , Mario Limonciello , Len Brown , Subject: [PATCH v4 5/7] acpi/x86: s2idle: Add a quirk for ASUS ROG Zephyrus G14 Date: Wed, 21 Sep 2022 15:40:52 -0500 Message-ID: <20220921204055.22889-6-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220921204055.22889-1-mario.limonciello@amd.com> References: <20220921204055.22889-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000B077:EE_|PH7PR12MB5925:EE_ X-MS-Office365-Filtering-Correlation-Id: 07370bd9-2f66-4088-133e-08da9c1196cd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b/iIKjEsRhy0Dz3bh3cr/lkBZvwM7iOTZfMi6Gx0PSu96IPG1KmiJ0g+WfvxLSSZ8ZYjgWRoQUiBUUok+W5+vD5Pxt6fPoef0r0+8aBqAB5ZEW/dRLTuqcrjvLSn9KMxkG9/oiA0kuNvGh8bthHhkYf8A9B+glAXBWcNuuPpCiQJWOco3i/cuNAgjEvm/Zw3+1UQ01FgG3lCw2R3RQ84I83418yPxkTbfWl+vnZBY8cD9KVxWIUncvmGCpkm32lzrxtmMBgCKoXr1D3Vk4vhZm+wzsXLWjjllYjBbkUbTaTRJJH0KZWvvHdm3dnSQ91/bX/glrhrmeuVtWB8tDQlO6mfcFe4iZpVoFGcFQBSB6XrmwaGbmnwhn5b67Jx2uS7fICoU1Ntb2gvlwD6QiYBTVwFQyDL6uXgUPwUNgU3e/D/MhGA2gTpNADL7BTrM2VzYzalnAJEVrplFwWAsG+hpB1QoVohDuYB1f2UeiP2H/ebn3e02MLl1Bm4UYaSZB3MvJ8GXCoY+wEkDrFzbsmTcYlIB8Sn5hHg4kMgtgJUv8tGVF6W665fBXhp8DCTDWiQJ/RF/pfSz2nPG+QDXAzzZd/B6iR0icvmpsiPTyEVSGGGDSQwPVhBq2O3EQDPYGO9ic/qwdA1CjjE1YDdaNdi9MwULcHCKJ5BFqLda0q3yfDqayUb5rO0E9MPFdLpVyyTAWyYIpvowp4Z1oFDFF+bDVeLXaKsKSv9mK0jflzDo/c/QDEFglT4+Qj/arW010Ea/CBFystXe9hlcEc2s0c9u3M4S1OegIEdB5HI1lB8+GArvQxs5iEq3uxbRlTTfHG6 X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(346002)(39860400002)(376002)(136003)(396003)(451199015)(36840700001)(46966006)(40470700004)(8676002)(36860700001)(44832011)(478600001)(186003)(70206006)(54906003)(36756003)(70586007)(45080400002)(86362001)(41300700001)(356005)(8936002)(4326008)(7696005)(81166007)(82310400005)(26005)(336012)(82740400003)(40480700001)(16526019)(110136005)(40460700003)(7416002)(5660300002)(1076003)(6666004)(316002)(2906002)(426003)(2616005)(47076005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2022 20:40:58.3808 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 07370bd9-2f66-4088-133e-08da9c1196cd X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000B077.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5925 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org ASUS ROG Zephyrus G14 is affected by the same BIOS bug as ASUS TUF Gaming A17 where important ASL is not called in the AMD code path. Use the Microsoft codepath instead. Reported-and-suggested-by: Philipp Zabel Tested-by: Philipp Zabel Tested-by: Matthew Anderson Tested-by: Marko Cekrlic Signed-off-by: Mario Limonciello --- v3-v4: * Absorb tags v2->v3: * Absorb tags v1->v2: * New patch --- drivers/acpi/x86/s2idle.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index 99eae362de6d..2cd381f6c002 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -420,6 +420,14 @@ static const struct dmi_system_id s2idle_dmi_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "ASUS TUF Gaming A17"), }, }, + { + /* ASUS ROG Zephyrus G14 (2022) */ + .callback = lps0_prefer_microsoft, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "ROG Zephyrus G14 GA402"), + }, + }, {} }; From patchwork Wed Sep 21 20:40:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12984130 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 87BBEECAAD8 for ; Wed, 21 Sep 2022 20:41:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231237AbiIUUln (ORCPT ); Wed, 21 Sep 2022 16:41:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230487AbiIUUlF (ORCPT ); Wed, 21 Sep 2022 16:41:05 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CE8FA3D22; Wed, 21 Sep 2022 13:41:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YCXwzy4KSI3YXZNnTC65rla5xDxD2UEHGXRUfOKkIaj4YuYJ3kKXg8OQtOjCKBHu1FVh7fIzpBFTD0y7Lnv37Ns7Ek8+hxtS5kfLIY5v8q+0i5KSuUou6W3d/1unWcd0yXNw2nR7fA1hS/5BNuSTj9LT/FUtzObXS3lNqsUFx8+TaIhbS5zFfAKXzHaUQsnFlRmBi6T83GwmqYwBfRQObfI+fiZxn21ixsyRhd40BmVUMDJ3aNwF8C6kOf8aq7fPZuII2zD06FNepFfHkdmY9XvOhpzf9WVPCH5peh9mUvww3yX8kR3hTXhUr6v6GWVAXSNBg9tFT6z9Aw53rE90mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cUI/OhsC6+aL5T0coZPgXzHZbnSUMWBi1W2PP67AaOE=; b=KsDs97ev+HIq0nXWqW7Lgcx8IE8/Hc5PE+FgUybD4+8h+KUANWBNojo+gqdnDsEeKEZcy2LBfyAQHZxH9U3K3vfAMqv1a2YcvLBYynTsWkeiCayI85QJHsLTe5jsoBcZx0Amwrxh5lk8OKpanL0B8QVbLtN+/NuiNzUSHe9v0XC9TrBOiA2jOISts0xkA3cEEDFUGMHbtVYLMQRQ2SFU4XRxoO/WrAM1K7HlLtGukyBub4SZP84UsHZUxv0XGmhu5N3hFk9E5Ae31MvkWQ6Av3Uc5NABRMWZGjQQLWvGYBdOu8RIwE308PCC7Lmcmt9FYyZzGk9fXjTVH0zsobuH8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cUI/OhsC6+aL5T0coZPgXzHZbnSUMWBi1W2PP67AaOE=; b=igcs4TNOwqkR5PfKhu1TTZE0JrvgnCo9wm5X4CUZvouCf1SUPJqZDgbBqHp/AvglbRT2PD9Kn3kXaTnb+fyCWBH8TbBUpz4qvXThB14D7noNU2UxNo45HZTlw/EyviDkGluAhgeygx+SvJr2t2FdsWzLzAh+/wDWpZSqW8GGguI= Received: from DM6PR07CA0097.namprd07.prod.outlook.com (2603:10b6:5:337::30) by DM4PR12MB6327.namprd12.prod.outlook.com (2603:10b6:8:a2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Wed, 21 Sep 2022 20:41:01 +0000 Received: from DS1PEPF0000B077.namprd05.prod.outlook.com (2603:10b6:5:337:cafe::c7) by DM6PR07CA0097.outlook.office365.com (2603:10b6:5:337::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.17 via Frontend Transport; Wed, 21 Sep 2022 20:41:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0000B077.mail.protection.outlook.com (10.167.17.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5654.11 via Frontend Transport; Wed, 21 Sep 2022 20:41:00 +0000 Received: from AUS-LX-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Wed, 21 Sep 2022 15:40:58 -0500 From: Mario Limonciello To: , CC: , , , , , , , , , Mario Limonciello , Len Brown , Subject: [PATCH v4 6/7] acpi/x86: s2idle: Add a quirk for Lenovo Slim 7 Pro 14ARH7 Date: Wed, 21 Sep 2022 15:40:53 -0500 Message-ID: <20220921204055.22889-7-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220921204055.22889-1-mario.limonciello@amd.com> References: <20220921204055.22889-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000B077:EE_|DM4PR12MB6327:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a0f3ab1-62c9-44b5-1492-08da9c119854 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tu8hdNNb6LNgIxug75R1S1z0TAbdk/TQ3MWgFfQ0lB2u4RY1CE8cY/guvxk+qFqEgnpcX3r9R6LZZqzmhUxwWH8D1LYXhecr9WWAyvaLzJDZYoZPnGk/6SEtc7LvCtxzN7rI9+AhPYRCTfwKLzFEvyFVL9Ag4i7yg+sQbNFuv7vGrRrqHto+y+tpz9koDnVm3ZdtveP5V4cGT/EwK3HRLmj/2bBRzqtuNyyjh+/5dfYXCY9TXNutF4YUQXfQT3Hz89GFRnPf0JsVGGLuR/SArbUhditMlWNM0te1bacn16TzZwJ+aruYetgCjs3U/HUvWf+R/qmb+IWywF/+q34Zuf3hsd+bDyC6LFNAkXLhui/6PFTnV2NoTpcgGxTAyzu6ST9tOG6+W6ENsNjUXyBrgZgZHCuNtaiROKEWVMMVuyMZN8JJr7SodYqcUOQFizT5pxfS+vMuEi2pvdN4DAYJcizW2u1pB1BLl7LwWuiEnU6CKvEXZNd1zZvXVLEn1VT8ADqLmARM2yd1CMDEvaJQKIdxFdtp0o4HjRJ0Nm2d+hL71HpqxxDoN4IYewiFWTJkGVlzGWx2QKGyNV0YlrSqUqZfOLWxtfV6u0qtkgW6MvQkdTEc1SRUjFM/X+VF+wpuDwr8deDVwoDr5uHbbLyJyqyr3OvIL1oCdXX1hHAdethUe4VH2/b3Ord7ZklHIchLJZnew0bWvQ1Q8P5RrCIaA+w6JrB4azQ4+H9ZBl91i/YwQPW17w8xVTzlsf1YyHBR/UPh0687KdNwuWr3ZfnFg4ma6FrIjEHCeqLk6FNSQhdc157IT9lKqTI786+KjZMcHD0GTr302dxG1MbLr0/xEla42+YtEX622kIRj8yKew/psWot/6MYe3F/rspdBvIS X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(376002)(396003)(346002)(39860400002)(136003)(451199015)(36840700001)(46966006)(40470700004)(186003)(44832011)(336012)(8676002)(1076003)(2616005)(478600001)(81166007)(86362001)(7416002)(356005)(70206006)(70586007)(966005)(36860700001)(40460700003)(7696005)(8936002)(2906002)(82740400003)(45080400002)(82310400005)(40480700001)(26005)(54906003)(316002)(47076005)(16526019)(5660300002)(6666004)(41300700001)(110136005)(4326008)(36756003)(426003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2022 20:41:00.8965 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9a0f3ab1-62c9-44b5-1492-08da9c119854 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000B077.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6327 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Lenovo Slim 7 Pro 14ARH7 has a sporadically non-functional keyboard when resuming from s2idle. This is caused by some missing calls to the EC that don't occur in the AMD codepath but only in the Microsoft codepath. Add the system to the quirk list to force Microsoft codepath. Reported-by: Travis Glenn Hansen Reported-by: Sebastian S. Link: https://bugzilla.kernel.org/show_bug.cgi?id=216473 Link: https://bugzilla.kernel.org/show_bug.cgi?id=216438 Signed-off-by: Mario Limonciello --- v3->v4: * Fix URL for one of the bugzilla links v2->v3: * Adjust prefix to cover multiple systems * Add another Link tag v1->v2: * New patch --- drivers/acpi/x86/s2idle.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index 2cd381f6c002..c811eeed42cd 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -428,6 +428,18 @@ static const struct dmi_system_id s2idle_dmi_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "ROG Zephyrus G14 GA402"), }, }, + { + /* + * Lenovo Yoga Slim 7 Pro X 14ARH7 + * https://bugzilla.kernel.org/show_bug.cgi?id=216473 : 82V2 + * https://bugzilla.kernel.org/show_bug.cgi?id=216438 : 82TL + */ + .callback = lps0_prefer_microsoft, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "82"), + }, + }, {} }; From patchwork Wed Sep 21 20:40:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 12984131 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 77E33C6FA82 for ; Wed, 21 Sep 2022 20:41:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230227AbiIUUln (ORCPT ); Wed, 21 Sep 2022 16:41:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231194AbiIUUlF (ORCPT ); Wed, 21 Sep 2022 16:41:05 -0400 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2085.outbound.protection.outlook.com [40.107.223.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D00F5A3D7E; Wed, 21 Sep 2022 13:41:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dkUQAAZRr+i2yS9i1qj8bNVpdES5cFamZ+mD/BLE5ybqI018TkXdZFQMP0J1SHegSdbRZSoipYYr1hAyWIP8KuMXxBQsEiBd4YMGzsCR+v1qjVDlWc0e5sxLLq0qAU8cXvLDSTwT6i9KypFB8BojQD3WD3X+SoZlXc9ANtW46kP6df0PbVkV7phwBGtFU6pKZE8nr95OvKO+/mxEnF4v3ggGQSnHBWy7IYBfHK8A6Sj8s0M+8MjVtf0LHeMtrF5VR9uRLoH6qi406acf3hPGOMLaMRjqf1yIDSYWsy6pT0rPXjP/qTiFe5hEHNrDCb1BCrebgBmAtqPhbIQ4OSbqqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cBSOjxZsPkZ9YhD40xr9ihuKaZmFQMXW0IpCGm6pwgQ=; b=Qieahu5jKYQIm1oXRdZ2kg20BZUuLNKONcmJ1LhVZ/T2bwg6BSpbpQHFb4cONcg06DQnm69Q9heMp1ZQQSYDKWUM4voE80kENzIU/ALGjpKVs+LXqQvopZ0L5Gud7Stg2i9B2jSHokhet8gZ6chC9Rm95hGf2kKUME7zM+zJVOzpYVntiIr1ZdNWzsgyloZfquv5QBrgSo2l2q0krA0OjXMxMrRJJXO69UYYawHbKcEHuXc48K5Nl54GH0Lv4sY2Mvcpp/T9nUTQFXH4AHjImQKeBUUg00AREqB1zJCccMWDtVBa2BD8rhrVWCYy9g6qeW8/7DODVUNRki91LtH4sw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cBSOjxZsPkZ9YhD40xr9ihuKaZmFQMXW0IpCGm6pwgQ=; b=K9XgO1xNnf2uPK/4WyIcYcbIXQfZKzEEkxHmdl7n6k7TqKEOPg+McrPAsqZOWRe/fgq58o1jQeX9ZZpHayjD8n4RZ4BQFRAy66m4+fSM9eBLmq8aAAhggRLYyBtVG6KmOofOHzXjDKDFFz8wspwqRFIhw5zX4Vz0TpO1fYSJJls= Received: from DM6PR07CA0080.namprd07.prod.outlook.com (2603:10b6:5:337::13) by LV2PR12MB5872.namprd12.prod.outlook.com (2603:10b6:408:173::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.21; Wed, 21 Sep 2022 20:41:01 +0000 Received: from DS1PEPF0000B077.namprd05.prod.outlook.com (2603:10b6:5:337:cafe::8) by DM6PR07CA0080.outlook.office365.com (2603:10b6:5:337::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.17 via Frontend Transport; Wed, 21 Sep 2022 20:41:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0000B077.mail.protection.outlook.com (10.167.17.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5654.11 via Frontend Transport; Wed, 21 Sep 2022 20:41:01 +0000 Received: from AUS-LX-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Wed, 21 Sep 2022 15:40:59 -0500 From: Mario Limonciello To: , CC: , , , , , , , , , Mario Limonciello , Len Brown , Subject: [PATCH v4 7/7] acpi/x86: s2idle: Add a quirk for ASUSTeK COMPUTER INC. ROG Flow X13 Date: Wed, 21 Sep 2022 15:40:54 -0500 Message-ID: <20220921204055.22889-8-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220921204055.22889-1-mario.limonciello@amd.com> References: <20220921204055.22889-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000B077:EE_|LV2PR12MB5872:EE_ X-MS-Office365-Filtering-Correlation-Id: 57219f81-4439-4cc2-af7e-08da9c11988f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AzfYwKBXBnpU3tBS4arUY5KZtWQT/Q18SwduEOjlvJRfm+AlDPJQVi4z5vv+yCZO4e/zGvJEbAcZ7s3ewoyg1T9g3joIA4kq3FCr9GanJRMRzfrokjKYjSRnVk6Cv0M0wFXX9zB4bVKoweQLRDGhpmooSb/mPxYBUA/6J+VKTZFHbxaDm5rHoK998UbVP/rS5wOG+5f4dYhblwL7C5Zg/ZvhPq53oEBYbgFzoAuDfrTBezYnAZ7nlUOI3roFiYdFWeAtOcNPZiZOyORmhZs+OrqMf6Rfr5UWqI2tb1dXHI9rvmDPGpZ7krF2jrDoe02URN7zMolcipMWJfqOLxBb3Vby/HN+6IPaBa9KRLlvwvdbKO4nRCTAj/4IjC4DG/mHTGKZ+f0jZQdWhBd3LurR4ELg0rlKhERKQ+n+Qp/7VK3kBp14T5x5x5iBqZW7hXcukepoUd5arzI9WGLOGisien2HtymgZ0f7mcmLISr+uzJ5yeIj56F6SZerr7paavp47bx71NmSApJQ+Nvu8KyFJO2ucvmmU8ULzDQfi1/3P6O8Mo8k4cHd/82J8MJuLoTb+JvKJ0WR/+bH29KbWSQnAzzxXYBYD2dxH6iHzGkbF06jf8643USb7gqwdjbIfTbfrR551zxp4xspNE1GVx/ctAgDwn8lwp2idJO3iidE/lB8TIwj7hxKkPGmlCvQEustPzaP+Y9OtG89NWGksuVxwkqSEOi3PHmWr10kx1m9sCFoOPNL/oPfgHRTIq/VXySk X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(136003)(396003)(376002)(346002)(39860400002)(451199015)(46966006)(40470700004)(36840700001)(54906003)(2616005)(44832011)(1076003)(186003)(86362001)(336012)(36860700001)(82740400003)(45080400002)(316002)(426003)(5660300002)(47076005)(7416002)(8936002)(4326008)(16526019)(81166007)(356005)(8676002)(70206006)(70586007)(110136005)(40480700001)(6666004)(2906002)(41300700001)(26005)(36756003)(966005)(478600001)(7696005)(40460700003)(82310400005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2022 20:41:01.3339 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 57219f81-4439-4cc2-af7e-08da9c11988f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000B077.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5872 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org ASUSTeK COMPUTER INC. ROG Flow X13 has a problem with fans upon wakeup from s2idle. In examining the ASL, functions 3 and 4 are not called in the AMD codepath but only in the Microsoft codepath. Add the system to the quirk list to force Microsoft codepath. Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2148 Tested-by: short-circuit Signed-off-by: Mario Limonciello --- v3->v4: * Absorb tag v2->v3: * New patch --- drivers/acpi/x86/s2idle.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index c811eeed42cd..eedd21d8a284 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -440,6 +440,17 @@ static const struct dmi_system_id s2idle_dmi_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "82"), }, }, + { + /* + * ASUSTeK COMPUTER INC. ROG Flow X13 GV301RE_GV301RE + * https://gitlab.freedesktop.org/drm/amd/-/issues/2148 + */ + .callback = lps0_prefer_microsoft, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "ROG Flow X13 GV301"), + }, + }, {} };