From patchwork Fri Sep 9 18:05:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 604219 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 74D82C6FA89 for ; Fri, 9 Sep 2022 18:05:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231293AbiIISFf (ORCPT ); Fri, 9 Sep 2022 14:05:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230513AbiIISFa (ORCPT ); Fri, 9 Sep 2022 14:05:30 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2052.outbound.protection.outlook.com [40.107.92.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 796439C1EE; Fri, 9 Sep 2022 11:05:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lPIsXUd9X/+3j/HIJYhf2Wj48I54bMmtDvObts3NeXWZGv3tEvFq+0exIvDdFGPt7NmHJBxHoHkD7mNDDs5itKck44kmCM4s43IwyUyNVBVA3Ih9go5QdlpvbOOBjGDDYTFSHZJihTaSe0A2CcUPPmoo16V7Wp+XZ0qWYRIpkDv7spMBBHKnpXjQjCIWvz1Qjw1Akg6x8MSVAf8T8fG1YImuZH9DK3+dLPGCq1LZzd7ZMvlVIV58KS370UiuA7rCk1L4yfAhJCvbN6isyjLF4oraK4myI+avgDACRkHFJMZmn3SulMR2BOdohovVEqIEZtfY1ybY34w/ACBpS7x3PQ== 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=GhFJrJW+CG7zhjQDljwvhx20SO8Rxv0eM8ClyPIVpvM=; b=J6ZC8vXgCMkERqgu0xgGIKObb6toxDF/FWVkZ30CmJWXnoa+NC6TwqH7is8WA8TkjWS1ia7BvLcPGSJ1TE4u4FA3dkNuprofuGKs8jUrvb5O3xtJsQJ0O/6qExlvJCnYyHtJvWeDVo9M3QUPU85JA+h4L3pZlEDWfMUlA0lYC7re4b84RLDEppCE5MsDUsRlBY6aASSMlENDHTZVe63Hra4/+Ms5KfN8yCSftVoH8+y52JLAuP5PDyQAeqBDvlvnzA5UHxvuCJNtg7YrXIFzu1MiRyDA7UNLgbnS4cfIGVfAcFQYQAhfCBMxzwnC4vWPsMWKwpovdoif4FSMltQ4sg== 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=GhFJrJW+CG7zhjQDljwvhx20SO8Rxv0eM8ClyPIVpvM=; b=3BlUaEP5ZxETFe95zVaEIDsq7dNSGYMyXW1+pqA3jvTzi/WDtH6Duv+aC/yzek9eH8aibcr3RIh288U96t/20Jb0N+/xSoKhGlxGwu9gHlhvNYnYwPxHGTZqFUgdtLb1nLnxNuzdzH4kn2kjGbV6vzkBMrEFruul7+FXrn+/Omg= Received: from DM6PR11CA0066.namprd11.prod.outlook.com (2603:10b6:5:14c::43) by PH8PR12MB7205.namprd12.prod.outlook.com (2603:10b6:510:227::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Fri, 9 Sep 2022 18:05:25 +0000 Received: from DM6NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:5:14c:cafe::11) by DM6PR11CA0066.outlook.office365.com (2603:10b6:5:14c::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.18 via Frontend Transport; Fri, 9 Sep 2022 18:05:25 +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 DM6NAM11FT025.mail.protection.outlook.com (10.13.172.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.13 via Frontend Transport; Fri, 9 Sep 2022 18:05:25 +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; Fri, 9 Sep 2022 13:05:24 -0500 From: Mario Limonciello To: , CC: , , Mario Limonciello , Len Brown , Subject: [PATCH 1/4] acpi/x86: s2idle: Move _HID handling for AMD systems into structures Date: Fri, 9 Sep 2022 13:05:06 -0500 Message-ID: <20220909180509.638-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220909180509.638-1-mario.limonciello@amd.com> References: <20220909180509.638-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT025:EE_|PH8PR12MB7205:EE_ X-MS-Office365-Filtering-Correlation-Id: bee3cf1d-2628-4c66-63ce-08da928ddedb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +rpTqVXLpwrvskhzLMLgkkli2rX2aiQWLjGtfv3P0dBr6iABccfKwgwBHybL19cjCb0i8kRy4h+ddRO+CjhkcX+af4cn+PaNJABv7cIAoBFgW7ze1smd9sBZDCkfXjKtuei07Bq6b66b+hls9G0lP8fa4H0Z5z9KTluOA6xCl5+r9cM1h0j/xJ55SvZnCrlg9uQJFblYzkPD4nIUdAubAdCCpubT4G4jB6+uJY8CJv7sBW6rHOC1OJxda/0tTF2rrN6FzjOtBxVyro9/fUMP09PREbwDf/osb7WrjDXlOY0JjdS63PRFu+DHI7+moH+QtjB3CfUfu0n87/Y9cASoWiLZZkzzG3nr3KS6UVlnS17wpXgD1kBIzcWncu2UOCJvh+RGEZRRm56GRr0U0l4l6H1LvZtx9eFvIl+w/XXM+SKg6+a8vY56HOwi08O/9/9++CU08t/MXAwwVA0qNgOoMUSIQ+6IZUNSDxNQWMtm3fNqF9Iab19vuWSahDqcaagaRiM2tvUqNVrIkNIoJVJ7OGN894aVhU83rkiGja9mDc8dvvls/h3IhyYCIyEZDeMUoQys6D2yLj0Fu3EgMw7WmHliA57AvRQpsqmxEdXEfI2g2vRx9uQsZ2Vqly7da7cX0/EbmAKCZGTY7jimdA891FtEoAkunbMeA/09BGVnxVZlO2gdvcXxzJR4+3QSiv0DoBmmgYJXMMl3Kh3Ozg6C/vFgmfzrRQ1uUlFrzLuxaJgP9Z1dco0IyKgaMNUp8ykom9L2rQzKsg1bvwBWCyq7OBrEIZ/9f+KZau+rabQgmiV0WIQIXWsosFCCpRbknrzk 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:(13230016)(4636009)(136003)(39860400002)(396003)(376002)(346002)(40470700004)(46966006)(36840700001)(336012)(44832011)(16526019)(6666004)(186003)(45080400002)(40460700003)(356005)(40480700001)(86362001)(47076005)(316002)(4326008)(82310400005)(7696005)(26005)(1076003)(41300700001)(54906003)(426003)(110136005)(82740400003)(5660300002)(8936002)(83380400001)(478600001)(36756003)(36860700001)(8676002)(2616005)(2906002)(70586007)(81166007)(70206006)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2022 18:05:25.2372 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bee3cf1d-2628-4c66-63ce-08da928ddedb 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: DM6NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7205 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 Signed-off-by: Mario Limonciello --- 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..a7757551f750 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 != NULL) + 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 Fri Sep 9 18:05:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 604792 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 A84E0ECAAA1 for ; Fri, 9 Sep 2022 18:05:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230150AbiIISFe (ORCPT ); Fri, 9 Sep 2022 14:05:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230163AbiIISFc (ORCPT ); Fri, 9 Sep 2022 14:05:32 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20611.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::611]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7F1C6E890; Fri, 9 Sep 2022 11:05:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HQ/zvXvIwpJr/eQU8oUnlIeSb25Pg63vJziQ74YOYUKFEv3Q5eAhxzghSlvJqm8eo+D1RVoKlOXHXjqzUNGE8wXNUwQwQS7IES9QScXWTA0UgG7sRCvO//TYOn5pOcgOTm4jupv+ZWG0kncazxf0MKr/OUXfRoXF1cIR/Csdg8OWg+bAdCOwRwfNrx8qJNL9LT6P4d9mDzJs+AingfDZtf5ib0NIrhmx6kyv9cWg5I4dxZGX4jWoGW373MXlEjGg3tfIn/Gamb1RGZ8knnNSa6ths3IjqCL/63vU/vCv237SPAUQrwLtRu68bSaiFMpygrTH7k6uSD7DFmwjDQcIWw== 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=3nQHF6cihPA7KZzNPRqdBCkFrOZ7QaWnoOMuPXT3MDw=; b=HIotHWNcZW/8dHJm5lsa+r1EcQDnA1vD4l5bwwEmc7PePT88B/FQf1D6mqvQMwRZgd2c5iTalNFBG64Y4KL31WrcYs6TTlw+WVfgM3LAER8uxzTa2XMcS8VYLcZIoSldvm/xStf5I0McDRI6g0ASN42FI81Ub4VIUiOUJPJVFTt+M4zSY5zrQh8TN37TxEiP9ej0s7r6/+VI5mPpwCTxvykqyjgPz8e2m4jDbkocwyYahjUkNg24D+Zzq2QNegMUNG4LKX8GI+gsuaxrBJ0dt98m9lnoJpPz/CTVaMN+IjeE/SGUrLv9Y1c6aLu6aL6DnikD/X466EqrUyXq/0+JpQ== 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=3nQHF6cihPA7KZzNPRqdBCkFrOZ7QaWnoOMuPXT3MDw=; b=SqoFjlc6YIHSbIWz+Xnek8V9vJbWPa4ep0YjPv++zTSe3/EEFMequzRwZ5ykyWGJqqlSblAFYqin1g283p+TrU5dVbKIE5Luj1++BGIkT5saiVUFSXhxNRVWgwcbRrcV+q8QEJwVEsCPXofi2gep6qfUFAH0z2HyA+QvD8wKvAs= Received: from DM6PR11CA0045.namprd11.prod.outlook.com (2603:10b6:5:14c::22) by SJ1PR12MB6075.namprd12.prod.outlook.com (2603:10b6:a03:45e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.16; Fri, 9 Sep 2022 18:05:26 +0000 Received: from DM6NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:5:14c:cafe::d3) by DM6PR11CA0045.outlook.office365.com (2603:10b6:5:14c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12 via Frontend Transport; Fri, 9 Sep 2022 18:05:26 +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 DM6NAM11FT025.mail.protection.outlook.com (10.13.172.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.13 via Frontend Transport; Fri, 9 Sep 2022 18:05:26 +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; Fri, 9 Sep 2022 13:05:25 -0500 From: Mario Limonciello To: , CC: , , Mario Limonciello , Len Brown , Subject: [PATCH 2/4] acpi/x86: s2idle: If a new AMD _HID is missing assume Rembrandt Date: Fri, 9 Sep 2022 13:05:07 -0500 Message-ID: <20220909180509.638-3-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220909180509.638-1-mario.limonciello@amd.com> References: <20220909180509.638-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT025:EE_|SJ1PR12MB6075:EE_ X-MS-Office365-Filtering-Correlation-Id: efde9137-a3c9-436f-a9f6-08da928ddf65 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M6XJ4OGSUCpo4wgFt+i9HzmnTyiIClUKGNOKkfNOtBG9L1nxFoKPywTkvYa4W4wqtXMNquxGkyQoT6YCzzbaqrsj7+NoXhyt33XDTZOAKvQmxGG7qrGE0+159CWOXhDXXNvO0hZXjo9zlh+sipwFEmCFwto5s+Wxxfx7AtgfmgZMuEK+w2jcqnXjsdiMB8E8uXYjTM6RxFWhcmtRchwYVU9oNOsYCqlhDv2fBwwiH06tXHqC/4NT+N4THAwBLt1E1xr75O+n0z2X9fiEtjm+bsJwVmw9EV3H3dfn2Yahh8Q7vYj/a8AI50fjgu/hC/hlirRxCyCbiWy6j1yLOLRPLwwIZOkY1o2l6oTxaGAL8115Z7Q7G4dMlQ5Dl3/kJwqyyao+IubBMVRkepKA63emcJOA0qUidW7QU/5bwbYiNXY6GHnygpCrPysV20jAlcSDZmjxRHYyNUAJgI5ilmMOk+WNo+9f86RXB7JLBe/tgc5i8J4xLkTbY+3O88F27TZUaqKoDRnzP4CLSWLWplXftvdDLGSmFoKOJI2y7iK98IefnS/maO2jwlJkThQjkpOnUF+Uc21Q8YCSkYvJtvEZejTfc1Rf/8fF6tX4LydnI5Ue9Hc9f8LnoyUVgLsEab6CQKn3vHWlCfM2TTfKhtCYdXKP+3xeewuCPJSVvbmvkVicXe2rFmBGc27b+TLoaJZMkKjSK7yQ5Wwml0LAqxd7pTWbs0rEQJ8ykexOOT3pYy527H+JMXGQYK9BE1RuVoSlo9RrY0AjPjmyrwohl+SJln4WFJUEgZfXmq1xlYvDY0Ui/EJmj6sCYbvzNihFy0Cn 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:(13230016)(4636009)(346002)(39860400002)(396003)(136003)(376002)(36840700001)(46966006)(40470700004)(83380400001)(8936002)(36860700001)(426003)(1076003)(2616005)(336012)(186003)(16526019)(110136005)(41300700001)(6666004)(478600001)(26005)(316002)(47076005)(7696005)(54906003)(36756003)(4326008)(44832011)(4744005)(5660300002)(40460700003)(8676002)(82740400003)(2906002)(70586007)(70206006)(81166007)(356005)(82310400005)(40480700001)(86362001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2022 18:05:26.1434 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: efde9137-a3c9-436f-a9f6-08da928ddf65 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: DM6NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6075 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 Signed-off-by: Mario Limonciello --- 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 a7757551f750..a8256e5a0e8a 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 != NULL) 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 Fri Sep 9 18:05:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 604791 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 23F17ECAAA1 for ; Fri, 9 Sep 2022 18:05:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230368AbiIISFg (ORCPT ); Fri, 9 Sep 2022 14:05:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230268AbiIISFd (ORCPT ); Fri, 9 Sep 2022 14:05:33 -0400 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2053.outbound.protection.outlook.com [40.107.212.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6AE06E2FF; Fri, 9 Sep 2022 11:05:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W0jdwxrCY4VXk24bX+mSaDshqyEwzQwLNR1XeJmvsuWQz6kb2E+h6r0loFEUe7k6CRxu31sz3bZ8GD7Pij/jdkeUY2I9SlC+Hx0RViJUjs3U1sPvOl2AMM31Wtz4KpNX2mTOeiQH6eTwV5oBh4VGveoahzGHYSstK6Iah4Y08oaecl+jnt/EYrbEOG5lStxls4gjo4JU3RwwyV+TiZr8oM1Dniow/8kbqKh1x3pPddRTXs2Pjj4MxgTaArlnEEqp0RVy7AQ1fuUyAMf11dBIfkLHVyo3R6dh/8vfn1YMOyqwjgseAPM89DywdxJua8YU3Ch5HJshrNHvTQ6M5EOU5A== 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=eJCqzRJRGdOcmbBQ/3UeozeAWVOetcD8M2l0k2hGyec=; b=lbTI7v4GBKjpYgV4h9jszx/xd9GtsvkGWBoa8l2RojueoLVwdFZ6VqNMdPCCHy+eCrSywNV7sd+TNPlj7GtEb8i4qKPn+1pRVVPBsOQ5/d1Zw2/ZrdbgMU0DGRO0sz1HrzotvM+vtBgJfFokziaRAX8IKGP50licMTK71McitIGfdWhF+zOJD9C8TDVMFYq4So6snyiI8099vQgbR5haqUVKURtVqv4pkrmdOQRhQvj+tqSVYUSXyzT3hO4djTkd651CRPYfhzs20f2g1OsRKx1sW+O/Hxn9bmQunrwpa1y66n6UZgq3M/tfjApcy2L/Uxw/BgfqdGnOUNH/q/o/rg== 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=eJCqzRJRGdOcmbBQ/3UeozeAWVOetcD8M2l0k2hGyec=; b=WNE7Kih/cvWQejdYNitIQmf54JMTUAJgTDjCfOLvRbWBGpN6da28tsD4shaCppjft9w3R5OJ++p87Rw7g4TQ5o2NTgg+TIH4yLmajhHDYnHKPoRoN+aWd1ij2vHiEh7yFjy7J/bjHRziWJmZAkpbkIcIVPnpNVKEuh/JuEtAKgc= Received: from DM6PR11CA0061.namprd11.prod.outlook.com (2603:10b6:5:14c::38) by SN7PR12MB7154.namprd12.prod.outlook.com (2603:10b6:806:2a5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.15; Fri, 9 Sep 2022 18:05:27 +0000 Received: from DM6NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:5:14c:cafe::51) by DM6PR11CA0061.outlook.office365.com (2603:10b6:5:14c::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12 via Frontend Transport; Fri, 9 Sep 2022 18:05:27 +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 DM6NAM11FT025.mail.protection.outlook.com (10.13.172.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.13 via Frontend Transport; Fri, 9 Sep 2022 18:05:27 +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; Fri, 9 Sep 2022 13:05:26 -0500 From: Mario Limonciello To: , CC: , , Mario Limonciello , Len Brown , Subject: [PATCH 3/4] acpi/x86: s2idle: Add module parameter to prefer Microsoft GUID Date: Fri, 9 Sep 2022 13:05:08 -0500 Message-ID: <20220909180509.638-4-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220909180509.638-1-mario.limonciello@amd.com> References: <20220909180509.638-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT025:EE_|SN7PR12MB7154:EE_ X-MS-Office365-Filtering-Correlation-Id: 6f0baae7-919a-4c4f-ec42-08da928de02d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z8gKpeudT8g1Z0qc0FRN8XjZr/9pQe371E0Y49lYO8/u0PYN9/SisLkjwK24KeUalLqVuy4+aAVTUi9HO7Phhy1A1I4usnGkyQG3L4DTkgTbyzfrPRvUwIbZvjqRjPqmit7LcO/bw3oKWYxQucF5NZEckFgpM1NZ1s57sijxtN7TezDkK1C8EEMTgoTMzlizuN62kq5hE+GaHkDy8OdXYHJ5yEPwddZJ9me8PRdEhjenUtN4uled5uSO97mWQQrHrNlBuHd9VOnTchCIm2w1pqMcZxJoCKEYH+TCMBAp2nSxEHI+95VurgoCrUL8VfAANz1k0/1sulCmM4nGS+x77DwdfQQsMb1jigdM1IP6I7hoRR5+zssUQml0Qs/drKtuDxbH+y/ZTYRU4bwLUSCvF/GFu4liqwVLOd6p4f3mSfH+AfI+7m7Zie4XogvtPEDMJkx6AcljZNw9Jgw07JqwJOnG8UsXO70AKYICsY14A5OnO4l9IITBcf8W2UTdjSlln0FgTTMFz9V8kBDCz2ISuWSi5nhCVvN4/pNX8cTo1srq/8lfPytlHW7c4WWn/mIlZE1Y6iKeC7aOXkMEh8YrtG1CWSD61WIt3R+Sn6jLQWPOyA/9GkigIfWARKDT5ex0lBA7YTP5C0pM3S0aIDSrlqtOvxuCj3TM0t9hK7vkuyAN9Hk3BMJwAlaZjgU4PtkBALAsvWkaLaOWmRBNyVqdNvfIAdTW1AWMy7PCPnHCoWio595CJO+ABKr7ONUeXXoGe5MqVlW6TpeYB1sFBk4IYyCBZd8OY+IyyAA1PBTco02ju2CCSRajLkbAMXqi6bpG 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:(13230016)(4636009)(376002)(136003)(346002)(396003)(39860400002)(47530400004)(36840700001)(46966006)(40470700004)(70586007)(45080400002)(16526019)(356005)(70206006)(2906002)(36860700001)(82310400005)(4326008)(40480700001)(86362001)(316002)(47076005)(36756003)(8936002)(54906003)(8676002)(44832011)(7696005)(110136005)(41300700001)(5660300002)(26005)(186003)(1076003)(6666004)(426003)(478600001)(40460700003)(83380400001)(2616005)(336012)(82740400003)(81166007)(52230400001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2022 18:05:27.4559 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6f0baae7-919a-4c4f-ec42-08da928de02d 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: DM6NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7154 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. Signed-off-by: Mario Limonciello --- 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 a8256e5a0e8a..a9b0f2b54a1c 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_guid __read_mostly; +module_param(prefer_microsoft_guid, bool, 0644); +MODULE_PARM_DESC(prefer_microsoft_guid, "Prefer selecting Microsoft GUID for LPS0 device"); + 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_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_guid) + lps0_dsm_func_mask_microsoft = -EINVAL; } if (lps0_dsm_func_mask < 0 && lps0_dsm_func_mask_microsoft < 0) From patchwork Fri Sep 9 18:05:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 604218 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 BBC21ECAAA1 for ; Fri, 9 Sep 2022 18:05:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230501AbiIISFo (ORCPT ); Fri, 9 Sep 2022 14:05:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230500AbiIISFd (ORCPT ); Fri, 9 Sep 2022 14:05:33 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2073.outbound.protection.outlook.com [40.107.244.73]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A812D72EF7; Fri, 9 Sep 2022 11:05:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G1jBouiHX1b9VOh2cN+1oPxshxtOrvKK6sdS9fYljvhDNObBRutvqzcGmDfpo0j1k4x8NsD7z9ajG6bHfvyweZCuyd+gPgUG5RiA2w3HzMvPHAYtXnO8l3Pe4zQoRrcMyaUYzJOYQojOMI1AMpyEJteCcxYgcH5Fy1QELjg5ZuZwK+oHTkbe0Fao9tSgAqo+IXkgrdPvxdyZ3GkoWs3FNizvKoj6qsXGb7AXk4CcDIATp/Jd2aNgZCM/W1bpJ3p2pHBKVhZZzRrKO//VzCgjLGnOVoDQB3Hoiw8OI38Lbcra+ulf9G4pq4DhR8gInaXdUfW8yoj6LZQE1XLbCwWm+w== 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=BK3S96XOwX1WmlP0btZwOoKTndcVypd7IxZ4MZSTqyw=; b=dJKvW8vjQklR0Cdx0MZCBfeY97PcKskG25+lvxMLRltgsJkvWx47u2UIFrR0XJ9hegR6vlB+X3okrhJSZ3QgvO0pSHMwDWlNeKwsd09I6+zWy7+HZKnCrlOBQIl5e0uFWfYTggvheych1Wq3o01hYOaeTgdgOab628F9Gn4rXZBAcCFcTnXy6YOUev3b0kZxPtMc5MfgMKzNn9YKyufhia+fDNgk4ikpevSJGFHyQPvUSWYLTV575Ij9cY8vXPyLS/r1nRT3Fltril4qyjV3GPEEGr8tWHzxFRv6m/lrwieAEyApNegsTLNd21fWXkgI5JPmeZ01UnR46eqCuuljvg== 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=BK3S96XOwX1WmlP0btZwOoKTndcVypd7IxZ4MZSTqyw=; b=ujSe+XlkKZrqybZ3k7xePYX3fx/mTAsKmryArMX+2bnJtc3slBaSWKQPvWGdXf51NdkF9hY314lRuBz7+0njRzc+QDgKUXzc9xBW+Bv1zn/JIp7mZMesayrLfPoFZ9dmQYDLDn28XiTYlZI8WTBGAhO1CwLGb/CbPYIGsS5dEx8= Received: from DM6PR11CA0044.namprd11.prod.outlook.com (2603:10b6:5:14c::21) by PH0PR12MB5484.namprd12.prod.outlook.com (2603:10b6:510:eb::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.16; Fri, 9 Sep 2022 18:05:28 +0000 Received: from DM6NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:5:14c:cafe::69) by DM6PR11CA0044.outlook.office365.com (2603:10b6:5:14c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12 via Frontend Transport; Fri, 9 Sep 2022 18:05:28 +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 DM6NAM11FT025.mail.protection.outlook.com (10.13.172.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.13 via Frontend Transport; Fri, 9 Sep 2022 18:05:27 +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; Fri, 9 Sep 2022 13:05:27 -0500 From: Mario Limonciello To: , CC: , , Mario Limonciello , Len Brown , Subject: [PATCH 4/4] acpi/x86: s2idle: Add a quirk for ASUS TUF Gaming A17 FA707RE Date: Fri, 9 Sep 2022 13:05:09 -0500 Message-ID: <20220909180509.638-5-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220909180509.638-1-mario.limonciello@amd.com> References: <20220909180509.638-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT025:EE_|PH0PR12MB5484:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e7c062d-2276-440a-3647-08da928de07a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DVXTlB7V17Ysb2+i0vubmdFHfEHOXeDZc1KKP5UUridBXLWUWSytdQF+X/4K7atV658QctQOV6lmKqcezz6wv2LxUnCgwpYXutFHFyfHkHzRVYvUFeGpZOfXDdsdo1dvN6hEZ60C4f2KNQb2xbrsO3ZrGR4nvwybEMBMJ+z4obzI70MpH0uHUVAitlD6GtS8d9NjV/QeEW3nWQnnyhSE2fzp66lVlDfwEtJu/WCdonGO9xJZqEGla8SGkzFAlA2K1ztGAbPQlyegRt40B9d8jbM3OIRs2T1V46nau3d6XXOVNdtuYkJ7BH5kc1G4EzZxR42arA/zt1otaDtyu7MSi3oUD4EOmaqBWDhPVa5IQUdGLedD3iw9nwl/uzZJ94IAOXDa6Kq9/zeV+RRsx/Zr+/T7M7eIdp4FjyfY9XzTZOzySp5HTvZhBib2ox7e92CM+lKjDW9SanEohcAQUJFKszNYzmC7bsDScb1Oac6f1Qw6NY1+CdbZbvjv5tT1nu6eaYXM51xBlIsTrf0NmbXxLrJiYfzB+N8JYFfECuW4RIaVzEO5VPgUPl5Y1u21LWhXhxBV6gJWBhFHi6bO8Hk/OOFpD+Q2z0l3YlMsfpHUbfDeDkzm2Y1vqQnL0kv4R+iKUTDB5BcH0Rr6ux+3qptHR8HjSxx/dbRd34Fxbr4RvOpu0jyDerSJ0dUHga0XZZZkyTN7xIy01FKp6E5KigCsVkErou2Br710UiUiDQtH9KzVnW9pqCQgVPXd9IitxFHauhQ2yekVvvouiwJL5v00uk7nhhzFCrXDSfIaNkmNwYUSVJN3DVi/dZz6R1UzdyPeaNDRmwrjHhoExtaPTcZskw== 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:(13230016)(4636009)(39860400002)(346002)(376002)(396003)(136003)(36840700001)(46966006)(40470700004)(36860700001)(82310400005)(356005)(81166007)(40460700003)(36756003)(82740400003)(70206006)(7696005)(41300700001)(8676002)(4326008)(70586007)(5660300002)(6666004)(8936002)(45080400002)(478600001)(54906003)(110136005)(966005)(316002)(47076005)(16526019)(426003)(83380400001)(336012)(186003)(40480700001)(2906002)(44832011)(26005)(1076003)(2616005)(86362001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2022 18:05:27.9558 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e7c062d-2276-440a-3647-08da928de07a 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: DM6NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB5484 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 Signed-off-by: Mario Limonciello --- drivers/acpi/x86/s2idle.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index a9b0f2b54a1c..6a2c94fdbeae 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_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) { @@ -568,6 +591,7 @@ static const struct platform_s2idle_ops acpi_s2idle_ops_lps0 = { void acpi_s2idle_setup(void) { + dmi_check_system(s2idle_dmi_table); acpi_scan_add_handler(&lps0_handler); s2idle_set_ops(&acpi_s2idle_ops_lps0); }