From patchwork Tue Dec 12 04:50:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 13489371 X-Patchwork-Delegate: ilpo.jarvinen@linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="mZI5HexL" Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2085.outbound.protection.outlook.com [40.107.243.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C54B5F7 for ; Tue, 12 Dec 2023 07:13:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ho9DLjlHCXNbQ3LVe64DtoiWyfdehdxwD0sfki5wN0HQB+Dw7it6aFp05IkNSWgJOlmrZuaDq/frjMJSAwf3lP5aczVZopxnZlRRAVh+jaOPYFhNAVlHRof8Uxn3D9+2wSY9/DGeXCp8Um2ry0s88ODkEVw7L0txKVKefcYb78NavxwB6usOf1x4AIeVOytkoKdgO/an8nJ2ElHXqHZ4H6Z5b6a/lflhBpHgBkA84dWq0t205BwHfFuUohVYvSTYLcAfTK7kqQkHc4XdLM4Hq819LYVtZEfH/S2eVj/JbscWk+8COLS/6l2uYhSxsp4HzhBGQTrkoZXKiLYD6TL3xQ== 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=52Qp6EB7nrrdMNtAwzaTG73U7IK+GT4u0KuwGpGvI4w=; b=JAg3R4eaXT8u6SF2ZjMpg4AfSVubgVT65HdqIB1o9eJjMmkNLN6+dm39veL8oI0VuJzbeyVezLZOBJXDaBJXKjXga1p5Fnco1UNteTX6MJFKU8nmV0cOeK5SBPlw22V0WigtqTXKsqvRFZk4y479U1P3jEmsCqWk7tSgmd21I/CIpS/vWhOi54KYgBkUIQq6/Xa8t4Kw2+aPFpB0ph6qgkBNyGNXOfyMIHwNOlhzF7F5MhojUeRKDVt96KRgnhkTuO7reidbPOq73Z1OLzpYw+eIhAYEzdYKbf78ggs1YPlQPBlkumNEKu7LmAJz3PIwc6UyYbK3Rukpl+sDJp9MvQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 (0) 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=52Qp6EB7nrrdMNtAwzaTG73U7IK+GT4u0KuwGpGvI4w=; b=mZI5HexLIS/2GUG+VvAg3n1slDjQ0SqBQxpgSqpmYbzGmflLapYeWKFSq9sdHWDZOzPEOrZTm5s/YNyUAtmB++HxsEwUwXDBbZN/g4Ni19pf7VjZt+c1tXv/KH3jiJeytaZVDlAy/vsoJE0GyOaver1wzMnoqhBZGgGTRzk+s+U= Received: from DM5PR07CA0088.namprd07.prod.outlook.com (2603:10b6:4:ae::17) by CH0PR12MB5121.namprd12.prod.outlook.com (2603:10b6:610:bc::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Tue, 12 Dec 2023 15:13:38 +0000 Received: from DS1PEPF00017093.namprd03.prod.outlook.com (2603:10b6:4:ae:cafe::b5) by DM5PR07CA0088.outlook.office365.com (2603:10b6:4:ae::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33 via Frontend Transport; Tue, 12 Dec 2023 15:13:38 +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 DS1PEPF00017093.mail.protection.outlook.com (10.167.17.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7091.26 via Frontend Transport; Tue, 12 Dec 2023 15:13:38 +0000 Received: from AUS-P9-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.2507.34; Tue, 12 Dec 2023 09:13:35 -0600 From: Mario Limonciello To: Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= CC: "open list:X86 PLATFORM DRIVERS" , Shyam Sundar S K , Goswami Sanket , Mario Limonciello Subject: [PATCH 1/4] platform/x86/amd/pmc: Move platform defines to header Date: Mon, 11 Dec 2023 22:50:03 -0600 Message-ID: <20231212045006.97581-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231212045006.97581-1-mario.limonciello@amd.com> References: <20231212045006.97581-1-mario.limonciello@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: DS1PEPF00017093:EE_|CH0PR12MB5121:EE_ X-MS-Office365-Filtering-Correlation-Id: 600f4f8b-c064-4641-af76-08dbfb24eae0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gQRIPYcpiO9GZlOK6IgyerDB4HNjFx6t49fTFG5WgAC/Rw3hGr7tuPX94eNxOegwhz3P+Hv7cItN0lUC9X4lKi0ooYN9QYPZcBQ1TGNSu+Xr7y/qu7esahMU2F63O/T8v4FraibWKrOBSHhMh6+f4tnU0f5gsvFacRSuo9cDe+fLklx93s2BQIr3p2J4wQ/lgEJl8mF4GKXL37Dp8W+vqVPnPHcAr5z3bayaUzZohcXeRb9H92IUsLpL5jmFT3npUWseGz1I5lqFzr/icvc6wBe/+YM/uFo+a7KhllogYVGrFp7Aq1woL+d43lh8LDGrgFPhCnzNoLqMnsKnTx3mCe4Mz1ru7EUG8ZcNuLiAA9YPNGX3kFwRobjhnLm0Oa/LobZIgLCLfmzGqjGeGk0aR6MQ7UaI2oBJIp/ujudiCP1a+2AH4IBbk3/LnaYRgsma1ugP7GftxJtV4GlttQGO8IFlQaYi697Pohwxgi1j8UGUGAY9kjRa/zBpNF6HOMGtFJ99DZqmFvC7i2b7BvLmWYhPtyBAZmtR8fJr09y3rvaKOYf/wW7ZEwBfiKxweC2BJ8BcYo6E278mqJsdeoitNB6ZsSRg6MGWqk15nOhMyXj2xz4QDHO0BhO1ezOwe4erabTiVOm3e6LW866F7YdrtU2OANQa4it5R8WtbErAkDHMnsI9L/gLFoG5ugCZWQl48DGd7FK29FBMiFdWuZMFT0OiHr27sOWKwZagsfjFZZQxVLvZ0faiL0Z5DYTI0HsoBwFcagCJjvh0eFJESffgdQ== 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:(13230031)(4636009)(376002)(136003)(396003)(39860400002)(346002)(230922051799003)(451199024)(186009)(82310400011)(64100799003)(1800799012)(40470700004)(46966006)(36840700001)(40460700003)(16526019)(426003)(83380400001)(7696005)(2616005)(1076003)(47076005)(36860700001)(8676002)(44832011)(5660300002)(8936002)(41300700001)(4326008)(2906002)(478600001)(336012)(26005)(6666004)(110136005)(316002)(54906003)(70206006)(70586007)(86362001)(36756003)(82740400003)(356005)(81166007)(40480700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2023 15:13:38.0263 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 600f4f8b-c064-4641-af76-08dbfb24eae0 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: DS1PEPF00017093.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5121 The platform defines will be used by the quirks in the future, so move them to the common header to allow use by both source files. Signed-off-by: Mario Limonciello --- drivers/platform/x86/amd/pmc/pmc.c | 10 ---------- drivers/platform/x86/amd/pmc/pmc.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c index c3104714b480..666cc6e98267 100644 --- a/drivers/platform/x86/amd/pmc/pmc.c +++ b/drivers/platform/x86/amd/pmc/pmc.c @@ -91,16 +91,6 @@ #define SMU_MSG_LOG_RESET 0x07 #define SMU_MSG_LOG_DUMP_DATA 0x08 #define SMU_MSG_GET_SUP_CONSTRAINTS 0x09 -/* List of supported CPU ids */ -#define AMD_CPU_ID_RV 0x15D0 -#define AMD_CPU_ID_RN 0x1630 -#define AMD_CPU_ID_PCO AMD_CPU_ID_RV -#define AMD_CPU_ID_CZN AMD_CPU_ID_RN -#define AMD_CPU_ID_YC 0x14B5 -#define AMD_CPU_ID_CB 0x14D8 -#define AMD_CPU_ID_PS 0x14E8 -#define AMD_CPU_ID_SP 0x14A4 -#define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT 0x1507 #define PMC_MSG_DELAY_MIN_US 50 #define RESPONSE_REGISTER_LOOP_MAX 20000 diff --git a/drivers/platform/x86/amd/pmc/pmc.h b/drivers/platform/x86/amd/pmc/pmc.h index c27bd6a5642f..a85c235247d3 100644 --- a/drivers/platform/x86/amd/pmc/pmc.h +++ b/drivers/platform/x86/amd/pmc/pmc.h @@ -41,4 +41,15 @@ struct amd_pmc_dev { void amd_pmc_process_restore_quirks(struct amd_pmc_dev *dev); void amd_pmc_quirks_init(struct amd_pmc_dev *dev); +/* List of supported CPU ids */ +#define AMD_CPU_ID_RV 0x15D0 +#define AMD_CPU_ID_RN 0x1630 +#define AMD_CPU_ID_PCO AMD_CPU_ID_RV +#define AMD_CPU_ID_CZN AMD_CPU_ID_RN +#define AMD_CPU_ID_YC 0x14B5 +#define AMD_CPU_ID_CB 0x14D8 +#define AMD_CPU_ID_PS 0x14E8 +#define AMD_CPU_ID_SP 0x14A4 +#define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT 0x1507 + #endif /* PMC_H */ From patchwork Tue Dec 12 04:50:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 13489369 X-Patchwork-Delegate: ilpo.jarvinen@linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="Lb+bHd1/" Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2081.outbound.protection.outlook.com [40.107.223.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF298D3 for ; Tue, 12 Dec 2023 07:13:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LKifnZvDA4kpWPJwraPMnNHBeFFmjE4KRgdKtyuMcsbTCsbvKnaqQF5SO53Bnxlh7r2CKmfSEs5Zcta/5RdEmqNHyRPHz3b+gdNfcchbUOSbnL3cB72/pGHD0AyhJ5O5OG4QFhOjMmXNxOy3jl9v2gTS+KntQqqqAkvyhFdJZKZ4q4NywSZwQ5Db2ZbUiFMdNVlmObPFsa7ER0w7TUCnExeR5r3eXb0oVmr6N5SSS5IWNvn1LwvKHmVY1ZUOacTmqZcynUii+hsGBDvbTyT8ke9ASvuUKMDDD6kYuF6Z2v0bzkb+le7P1ytgmN9MmeP2GkmtiO5l4CBx6oc8jF3FnQ== 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=AnVRUqb+PrbfZQbZhLedPTKd4oa6OsUffDwbmHIuOU4=; b=Iu+sJcODFzQS2l2bxkqlx1KATzB8aclLb0x3X4buRFlrz/eHiJVhI1/Y1a6GqT+LCiD5Wzx5furWchbC/nUrPqJ8+qSmkajBSC1PBxFwg743FOjG8aQB6gc/IFDvh+EaswegNPlbEp6cgfT4m0fKXW0lpd8k2ySbtNADEs9HnHqsEMtFhtzeZnLAeHmVWRPHEx0FZjoOB3ex330SZXRstpwleAoNaFP9hI7hZIJvwIMgZv/ttNeW150fYWgF3VMYdMm/TIvlkqWm5kIsTjcKmrH3zwqnt2uz8po9x5W7dLVuim8a4+Qm/MYMzXPxTfLi3d+2aJEkqeXgBaCAo7dhRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 (0) 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=AnVRUqb+PrbfZQbZhLedPTKd4oa6OsUffDwbmHIuOU4=; b=Lb+bHd1/1U5xCnYP1iGZ2cOt11Q/nfKDVuJ487QjSKmDnakf7sc4lgfbRFvY4YSdKifRtPQijrc1JlupR6IFBQV0El9T7X3AgK75t1ASm2t3M+fgeeSXtHdEfZRD9I5vLjNbAmFznSGxvDOqElMLBORaOA32GvRNKg4ukuSJwrY= Received: from DM5PR07CA0109.namprd07.prod.outlook.com (2603:10b6:4:ae::38) by SA3PR12MB8763.namprd12.prod.outlook.com (2603:10b6:806:312::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.26; Tue, 12 Dec 2023 15:13:38 +0000 Received: from DS1PEPF00017093.namprd03.prod.outlook.com (2603:10b6:4:ae:cafe::93) by DM5PR07CA0109.outlook.office365.com (2603:10b6:4:ae::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33 via Frontend Transport; Tue, 12 Dec 2023 15:13:38 +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 DS1PEPF00017093.mail.protection.outlook.com (10.167.17.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7091.26 via Frontend Transport; Tue, 12 Dec 2023 15:13:38 +0000 Received: from AUS-P9-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.2507.34; Tue, 12 Dec 2023 09:13:36 -0600 From: Mario Limonciello To: Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= CC: "open list:X86 PLATFORM DRIVERS" , Shyam Sundar S K , Goswami Sanket , Mario Limonciello Subject: [PATCH 2/4] platform/x86/amd/pmc: Only run IRQ1 firmware version check on Cezanne Date: Mon, 11 Dec 2023 22:50:04 -0600 Message-ID: <20231212045006.97581-3-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231212045006.97581-1-mario.limonciello@amd.com> References: <20231212045006.97581-1-mario.limonciello@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: DS1PEPF00017093:EE_|SA3PR12MB8763:EE_ X-MS-Office365-Filtering-Correlation-Id: a6116ddf-31e2-4ab3-0ed2-08dbfb24eb21 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 49PKtZJFF4LNZXUZcLGePQwg/IyzL4o7BDHMjWV/PJ9nDgb+A6zJ5aNcWfbuJ2c2FVT42aM2nLNcD7EI92W182f9uCn9Lso8yQ5cpTsXvkU7nl2FwkH9TBrf9GMZvUFdqnD4ZeqY5OhdRqAZFQ8Tn7raOCNDfGZBhBGlJt8vPVC0nDpHsrhlzpGtbTtLD8P0sLoFpC5nWQvbS647FYt4k7A+SNJkt2jzfjuq0RXlE8COwbpPC/0CmdMcSATJBEpZ3sbF7uwLYf2WtHnCD9cq+BUnfnIew1pb5K77RNjrU0mjf52p+S3WvhV2NmOXAmCloLY+UNKgUEQU8kHL9Ma/+rJB6L2pGsl2v2UA/JWIqc4d+jbbJgeMM7bqZnOQKwHW+KcdzSBTGzw8jk69zm5ELbneFYbNcXvBcDVGsub0fJb/b1tAQ6RXaY6TB/Dfb1pkc6Ml5ReforShTG5E/k3+2O8NY9XRKzPTcradS+3EryzgvQLVhPt2mF1i1hsoIok8V4vqwoop6Gmi2q65+p9PnNzzWGt1ff7z+5aBU3xXUXBEBSSagFTxjM8irEg0VPAMVvNEPgqFUt3o1JEHbsAgTzAZgCZMvRGaCtmr3upVWF/XzeAzY8guuR5v82Tt7kZpdGKuwYykXFfLMfF+BNYNZBqX3agVNs09G4WwqyUn9vfYDJ1+zcayitDBKyJB21WKfaWni2PZ9Br9uyiYZNwMRV1SfgHjs2gvIv/zN+qJU47aHKF4OgC/YXXv4AjJOIjho06fK7iTZh7p1UXO4dn1nw== 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:(13230031)(4636009)(376002)(346002)(396003)(136003)(39860400002)(230922051799003)(451199024)(1800799012)(82310400011)(64100799003)(186009)(46966006)(36840700001)(40470700004)(40460700003)(110136005)(336012)(16526019)(426003)(26005)(83380400001)(7696005)(2616005)(1076003)(47076005)(36860700001)(44832011)(5660300002)(4326008)(8936002)(8676002)(41300700001)(2906002)(478600001)(6666004)(316002)(54906003)(70206006)(70586007)(36756003)(86362001)(82740400003)(356005)(81166007)(40480700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2023 15:13:38.4482 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a6116ddf-31e2-4ab3-0ed2-08dbfb24eb21 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: DS1PEPF00017093.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8763 amd_pmc_wa_czn_irq1() only runs on Cezanne platforms currently but may be extended to other platforms in the future. Rename the function and only check platform firmware version when it's called for a Cezanne based platform. Signed-off-by: Mario Limonciello --- drivers/platform/x86/amd/pmc/pmc.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c index 666cc6e98267..824673a8673e 100644 --- a/drivers/platform/x86/amd/pmc/pmc.c +++ b/drivers/platform/x86/amd/pmc/pmc.c @@ -756,19 +756,22 @@ static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev) return -EINVAL; } -static int amd_pmc_czn_wa_irq1(struct amd_pmc_dev *pdev) +static int amd_pmc_wa_irq1(struct amd_pmc_dev *pdev) { struct device *d; int rc; - if (!pdev->major) { - rc = amd_pmc_get_smu_version(pdev); - if (rc) - return rc; - } + /* cezanne platform firmware has a fix in 64.66.0 */ + if (pdev->cpu_id == AMD_CPU_ID_CZN) { + if (!pdev->major) { + rc = amd_pmc_get_smu_version(pdev); + if (rc) + return rc; + } - if (pdev->major > 64 || (pdev->major == 64 && pdev->minor > 65)) - return 0; + if (pdev->major > 64 || (pdev->major == 64 && pdev->minor > 65)) + return 0; + } d = bus_find_device_by_name(&serio_bus, NULL, "serio0"); if (!d) @@ -928,7 +931,7 @@ static int amd_pmc_suspend_handler(struct device *dev) struct amd_pmc_dev *pdev = dev_get_drvdata(dev); if (pdev->cpu_id == AMD_CPU_ID_CZN && !disable_workarounds) { - int rc = amd_pmc_czn_wa_irq1(pdev); + int rc = amd_pmc_wa_irq1(pdev); if (rc) { dev_err(pdev->dev, "failed to adjust keyboard wakeup: %d\n", rc); From patchwork Tue Dec 12 04:50:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 13489372 X-Patchwork-Delegate: ilpo.jarvinen@linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="qoAyYLEF" 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 6719FE4 for ; Tue, 12 Dec 2023 07:13:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L0ZpxCwKx7ckr16/UMj6n09FrQmU7QZ5dsWqOTPHZ4iKjKEblOkeGfDi/dSbdLO4BGKsJywGTveYPZ/e499ViDzyZdzncXGkFFL+TGPTzZM5f0SNWRRY5DR+gGuhuO+zOhcbN28gwAL0VJJ/Xzc1TK4DKbZaTZmN8fb409bBZVyE1OKKb2bBCIXQGMUEK09jF+mOCu3fl8K4bCoSWXi8Xf270xYFM1IuxtPkzyd4sijHFWcvkqYlo2R/8HfMsXfkMbyUXhAizs3Wid2v+aJl2hPiJeMFFg/8nJI5Na2b/mLwN57iInSOYceS3RBlhnzezfceSxyi+w7Q++jqqDlc8w== 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=4Vt15iMSlg9b0OaGoukNOy6Xo7Z5e3SBaNbei/5++90=; b=HxBRozkHkPr5bHgWxOzrox5IMNhYxGuoGTcwOtoDIT1pkyUZqEG1gOK2lJszVNaPbKg4Pts8ErTewwrLl3KyRYcJg/1sc53h9Mg2FyGB6GFdT13NaCqbc5yVViCfJi4eZjGygxwYayWpL84AgHlrswQXYt1af3BT9fuO2vaiocESsXC7JDpE4xICcEVt8hwb+E96RipbTYOI79dcnZWn/nK6WHd4gz8jYFRlzEIzE0k3Z7QBI35CHT2VdmcAOH6oArqk2I0RbPqTej3MzeUVcWEe8tLe2MItwNlpsAqmoLemeHE1pk8noKOMOyn2QZcnuOvNKTX4pATPttxcyjRRTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 (0) 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=4Vt15iMSlg9b0OaGoukNOy6Xo7Z5e3SBaNbei/5++90=; b=qoAyYLEFssmTEgb6u9SJJngReOEw+rtDKEDrbwU8H0//IqSv1AXq8WIAJPQclV0HmjX1vMz0SOoT2ebzDD54FBthhFq7jb5XlOOwXPfmasB9zxtvwdWVI33+0Hf8j6v5/qM9JI9sD+hySLMSl98IxRplcPUSwu/9E7Ox3p33Mz4= Received: from DM5PR07CA0099.namprd07.prod.outlook.com (2603:10b6:4:ae::28) by IA1PR12MB8311.namprd12.prod.outlook.com (2603:10b6:208:3fa::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Tue, 12 Dec 2023 15:13:39 +0000 Received: from DS1PEPF00017093.namprd03.prod.outlook.com (2603:10b6:4:ae:cafe::e7) by DM5PR07CA0099.outlook.office365.com (2603:10b6:4:ae::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33 via Frontend Transport; Tue, 12 Dec 2023 15:13:38 +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 DS1PEPF00017093.mail.protection.outlook.com (10.167.17.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7091.26 via Frontend Transport; Tue, 12 Dec 2023 15:13:38 +0000 Received: from AUS-P9-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.2507.34; Tue, 12 Dec 2023 09:13:36 -0600 From: Mario Limonciello To: Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= CC: "open list:X86 PLATFORM DRIVERS" , Shyam Sundar S K , Goswami Sanket , Mario Limonciello Subject: [PATCH 3/4] platform/x86/amd/pmc: Move keyboard wakeup disablement detection to pmc-quirks Date: Mon, 11 Dec 2023 22:50:05 -0600 Message-ID: <20231212045006.97581-4-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231212045006.97581-1-mario.limonciello@amd.com> References: <20231212045006.97581-1-mario.limonciello@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: DS1PEPF00017093:EE_|IA1PR12MB8311:EE_ X-MS-Office365-Filtering-Correlation-Id: 09eef720-1cb4-4f02-d087-08dbfb24eb63 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FYGtrP36VJ501xsMY/vBAxQ0Yx4s1EhecJe/NOm65CCS368gpEQHpj3jCTv6yOEgPQpjEmLOv0hCeDS6j0/T2qeiuIDiK7N36gyN5sraXHthH0SwVJ/9eELwqj8zeYXXNqUNfpD26psGxrot/rEqHFgwACWFCc+Pkk8IUmU85sfPg582UOh629gW2/C4gm+SvA1o1bEf9yXIfdx1pflRk6h8n7QXhuLPYB+uxkuk/1i+pRlE0qtywEv5t9mZWiHXUBCE0TqrJ8iziRU8nNquZM0zNBGhYJ4SlRRvSV2pSfXmQWb4uA4Q6zfverq5SD/hi38xyrjh7wnFdVqrXV1qk6FBNowIgl35H4DEIASXAdM96ZnozVDH4Ic2n7mZuuszHkOlcYuVxL/s6b6h253UVq/AinIe6kO6z/FLmawTkBG2CmK0URPTDLeJ3nItB7epdoagB8Ioi30rwmcqZmq+wKBWrkyRRH4+odxSsKFKJjE/hwD1P2OibfbChYh6VnYBneTFt5WX/+oIwuvGLIe+FteuidoXmg3YpzVErRDdouM8Ae4grvDn1o5IZV1tZaBtYjJRVptR33fFEtT9S3KtL2xU+/JvPo2DKE7BNXR6HlcYF8boZ9aU2kl67JkO1YlcqhYnoc6Lxl+S63pNpyARKK67TzEyLgHNQszGnEuOt/anirevQpibRPtWFiKW0LwsdhJ8hFRy8aXOQNs471TsC4Sv159biiJIwoijtJOwTWSAdg4utD9mRl5EAQ/7AaF1d94ue4pHHDJOrk8a3HEJAw== 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:(13230031)(4636009)(346002)(376002)(39860400002)(396003)(136003)(230922051799003)(1800799012)(186009)(451199024)(64100799003)(82310400011)(40470700004)(36840700001)(46966006)(40460700003)(2906002)(41300700001)(36860700001)(110136005)(36756003)(86362001)(82740400003)(2616005)(81166007)(356005)(1076003)(336012)(426003)(26005)(16526019)(7696005)(83380400001)(47076005)(478600001)(6666004)(44832011)(4326008)(5660300002)(316002)(70586007)(8936002)(70206006)(54906003)(8676002)(40480700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2023 15:13:38.9013 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 09eef720-1cb4-4f02-d087-08dbfb24eb63 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: DS1PEPF00017093.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8311 Other platforms may need to disable keyboard wakeup besides Cezanne, so move the detection into amd_pmc_quirks_init() where it may be applied to multiple platforms. Signed-off-by: Mario Limonciello --- drivers/platform/x86/amd/pmc/pmc-quirks.c | 3 +++ drivers/platform/x86/amd/pmc/pmc.c | 2 +- drivers/platform/x86/amd/pmc/pmc.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/amd/pmc/pmc-quirks.c b/drivers/platform/x86/amd/pmc/pmc-quirks.c index 6bbffb081053..c32046dfa960 100644 --- a/drivers/platform/x86/amd/pmc/pmc-quirks.c +++ b/drivers/platform/x86/amd/pmc/pmc-quirks.c @@ -235,6 +235,9 @@ void amd_pmc_quirks_init(struct amd_pmc_dev *dev) { const struct dmi_system_id *dmi_id; + if (dev->cpu_id == AMD_CPU_ID_CZN) + dev->disable_8042_wakeup = true; + dmi_id = dmi_first_match(fwbug_list); if (!dmi_id) return; diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c index 824673a8673e..864c8cc2f8a3 100644 --- a/drivers/platform/x86/amd/pmc/pmc.c +++ b/drivers/platform/x86/amd/pmc/pmc.c @@ -930,7 +930,7 @@ static int amd_pmc_suspend_handler(struct device *dev) { struct amd_pmc_dev *pdev = dev_get_drvdata(dev); - if (pdev->cpu_id == AMD_CPU_ID_CZN && !disable_workarounds) { + if (pdev->disable_8042_wakeup && !disable_workarounds) { int rc = amd_pmc_wa_irq1(pdev); if (rc) { diff --git a/drivers/platform/x86/amd/pmc/pmc.h b/drivers/platform/x86/amd/pmc/pmc.h index a85c235247d3..b4794f118739 100644 --- a/drivers/platform/x86/amd/pmc/pmc.h +++ b/drivers/platform/x86/amd/pmc/pmc.h @@ -36,6 +36,7 @@ struct amd_pmc_dev { struct mutex lock; /* generic mutex lock */ struct dentry *dbgfs_dir; struct quirk_entry *quirks; + bool disable_8042_wakeup; }; void amd_pmc_process_restore_quirks(struct amd_pmc_dev *dev); From patchwork Tue Dec 12 04:50:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 13489373 X-Patchwork-Delegate: ilpo.jarvinen@linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="dO4DPiby" Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2046.outbound.protection.outlook.com [40.107.223.46]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C929E9 for ; Tue, 12 Dec 2023 07:13:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mYxtvdsBvUyrzMTitjxUYlLPUZZrvlr0OCl69ToLaJScsxmhkHOmBGWS0JrGF+HfqEFqr8tu1nIpDvSxxrIYU8bMJRNpkv4FOPTasYP+8OGC7RcVlzq8r1DleYjHVcoeLM5DUDu2OAYQr1F2zTNb5UvjgGlqzZHzS8JU+uPvg+ETGGmVNLqsPE43lAWuvLCytdU1NPQISiJEOyndhjPKfO4g2PbahveWN/Hgyqn14eT8+wyrpqJ8ziImSW+OQKvtgB4YctNujqRZY02d1aoe66d2qm8UtD6mZvXrP+mUuVeOd4+WMewZp+ZXzT53WSomCq/7lw/iHPcd05gHnj3Yig== 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=BYy/PxmvFUHhK/fgaB/CyiFPJvqs1urUXtZPcjobGww=; b=ME/Or4ng2NSV90IC5M7U98UlBmASq3Spk3kTTLr/nk4O5ovSTsTHkEoapqjgC50s9FMd6feWnbGMiYd+fvaulvD588awI+EfPyHN1eDdnHJhkL/SaB5Id5GKaRssWot8/kKjYuGZ6AnnnAZ4TuIOjOhZAycQnDg1Mc5Eb1DgYK0o1f2m35c8Oec2mRlvYoTyKs9ZdHWC1I74VVCp5tjElj+A0UERXLwEvOs73Qb/U2SRAVcVb9ySs4zQkfrCUXyrQY40aZ8E5e50PktrmOUXv9xSCF/hdQR5s132tSo1key6B/sHo976OKHDHng0O1dOGDsgCrWCsjdzdMvULzaN6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 (0) 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=BYy/PxmvFUHhK/fgaB/CyiFPJvqs1urUXtZPcjobGww=; b=dO4DPibyben7aOQxJvnaiUedFxTfaMmYXVPwt2UI1shv1Ospe0pBO8KhecLb36sgjCa4QS5qU9iJAp7xuMn1pLm7siDuZi+AVy4TdPYph6Tn9UBtI/pFhVC5M7MoLFjvW+/qAs5H9DX3iD4QHv9pk1zNXWU+c8eC4eF+nH9pKMo= Received: from DM5PR07CA0089.namprd07.prod.outlook.com (2603:10b6:4:ae::18) by DM4PR12MB5373.namprd12.prod.outlook.com (2603:10b6:5:39d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.26; Tue, 12 Dec 2023 15:13:39 +0000 Received: from DS1PEPF00017093.namprd03.prod.outlook.com (2603:10b6:4:ae:cafe::6e) by DM5PR07CA0089.outlook.office365.com (2603:10b6:4:ae::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.26 via Frontend Transport; Tue, 12 Dec 2023 15:13:39 +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 DS1PEPF00017093.mail.protection.outlook.com (10.167.17.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7091.26 via Frontend Transport; Tue, 12 Dec 2023 15:13:39 +0000 Received: from AUS-P9-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.2507.34; Tue, 12 Dec 2023 09:13:37 -0600 From: Mario Limonciello To: Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= CC: "open list:X86 PLATFORM DRIVERS" , Shyam Sundar S K , Goswami Sanket , Mario Limonciello , Kieran Levin Subject: [PATCH 4/4] platform/x86/amd/pmc: Disable keyboard wakeup on AMD Framework 13 Date: Mon, 11 Dec 2023 22:50:06 -0600 Message-ID: <20231212045006.97581-5-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231212045006.97581-1-mario.limonciello@amd.com> References: <20231212045006.97581-1-mario.limonciello@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: DS1PEPF00017093:EE_|DM4PR12MB5373:EE_ X-MS-Office365-Filtering-Correlation-Id: 46b5e899-658b-48d9-cc17-08dbfb24ebc0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r6hcsAosmrzQD/xFPpDMNhA814bOuyfmaFPAx/hqx2nGrQfaxZvEm3NRbC1mFDXeuu7wajxT4TmUtp9NctmGQkSzFMJ0IPhKZxfoscvJyoBgVgMx3vZUcfqLCBbyGodmEqe6E9zhJTqNeY5NNPNZwyovxju5Z6bF32aMVthG8iTA0+cfkfFdla7V2aQjkguFAZJEu6jF2g2TvWs470Zcevqd7bw7wS42MT+zDykYFJrj31P/MqJNugljUoaoLEaElZDpi1Yrk0HY6zX4Q0/Nejqhholye+I8P0egmx+IxbyjEwPycg6cde6F0CsJYZqJGAOTJd5jLX4ZQUbYUwrLhl8YeD5AJYsV/4DfPxsmu0lngId/6dkVSLLY3edFxRB/QWgIo23bWvD85LoTftN53ifuYg3sX21JISOhEde6yovlJuBV5R7yqqLa9AAiNDxGiHn/2A/0D1HcGY1CpvX05fd0tmlNCaIVy78NIgNMP37wItqbl6ChjnoCLWpujc0ndFuDNzZNyJBSd9CijlaPM+KsT+7jTZmW7e2j2/uOsqYE11pXpj/s4nlxEhe7oiHbf7EW5tow88W0Jc2HwzBCmpviQS60yg8hxV4oWvUaVZ4uZ6pHEM9ei6kPp1l6Ylm2D0PTw2MWafSWC+y+ZHLWMb/SfUOKxp6kALawF4ACRWl2Vmj0IgwiWLRfeVr96gmd7iGJ9348DgQedvTMaAe2hkqIJZYxPI4YhDMOZzN9c44lMnZYaCmVNilRXmFv+/78 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:(13230031)(4636009)(396003)(346002)(39860400002)(136003)(376002)(230922051799003)(64100799003)(451199024)(82310400011)(186009)(1800799012)(36840700001)(46966006)(40470700004)(54906003)(70586007)(110136005)(70206006)(41300700001)(6666004)(7696005)(1076003)(16526019)(2616005)(336012)(26005)(36756003)(426003)(47076005)(86362001)(82740400003)(356005)(81166007)(83380400001)(36860700001)(966005)(478600001)(40480700001)(44832011)(4326008)(8936002)(8676002)(2906002)(5660300002)(316002)(40460700003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2023 15:13:39.4951 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 46b5e899-658b-48d9-cc17-08dbfb24ebc0 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: DS1PEPF00017093.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5373 X-Spam-Level: ** The Laptop 13 (AMD Ryzen 7040Series) BIOS 03.03 has a workaround included in the EC firmware that will cause the EC to emit a "spurious" keypress during the resume from s0i3 [1]. This series of keypress events can be observed in the kernel log on resume. ``` atkbd serio0: Unknown key pressed (translated set 2, code 0x6b on isa0060/serio0). atkbd serio0: Use 'setkeycodes 6b ' to make it known. atkbd serio0: Unknown key released (translated set 2, code 0x6b on isa0060/serio0). atkbd serio0: Use 'setkeycodes 6b ' to make it known. ``` In some user flows this is harmless, but if a user has specifically suspended the laptop and then closed the lid it will cause the laptop to wakeup. The laptop wakes up because the ACPI SCI triggers when the lid is closed and when the kernel sees that IRQ1 is "also" active. The kernel can't distinguish from a real keyboard keypress and wakes the system. Add the model into the list of quirks to disable keyboard wakeup source. This is intentionally only matching the production BIOS version in hopes that a newer EC firmware included in a newer BIOS can avoid this behavior. Cc: Kieran Levin Link: https://github.com/FrameworkComputer/EmbeddedController/blob/lotus-zephyr/zephyr/program/lotus/azalea/src/power_sequence.c#L313 [1] Link: https://community.frame.work/t/amd-wont-sleep-properly/41755 Link: https://community.frame.work/t/tracking-framework-amd-ryzen-7040-series-lid-wakeup-behavior-feedback/39128 Signed-off-by: Mario Limonciello --- drivers/platform/x86/amd/pmc/pmc-quirks.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/platform/x86/amd/pmc/pmc-quirks.c b/drivers/platform/x86/amd/pmc/pmc-quirks.c index c32046dfa960..b456370166b6 100644 --- a/drivers/platform/x86/amd/pmc/pmc-quirks.c +++ b/drivers/platform/x86/amd/pmc/pmc-quirks.c @@ -16,12 +16,17 @@ struct quirk_entry { u32 s2idle_bug_mmio; + bool spurious_8042; }; static struct quirk_entry quirk_s2idle_bug = { .s2idle_bug_mmio = 0xfed80380, }; +static struct quirk_entry quirk_spurious_8042 = { + .spurious_8042 = true, +}; + static const struct dmi_system_id fwbug_list[] = { { .ident = "L14 Gen2 AMD", @@ -193,6 +198,16 @@ static const struct dmi_system_id fwbug_list[] = { DMI_MATCH(DMI_PRODUCT_NAME, "HP Laptop 15s-eq2xxx"), } }, + /* https://community.frame.work/t/tracking-framework-amd-ryzen-7040-series-lid-wakeup-behavior-feedback/39128 */ + { + .ident = "Framework Laptop 13 (Phoenix)", + .driver_data = &quirk_spurious_8042, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Framework"), + DMI_MATCH(DMI_PRODUCT_NAME, "Laptop 13 (AMD Ryzen 7040Series)"), + DMI_MATCH(DMI_BIOS_VERSION, "03.03"), + } + }, {} }; @@ -245,4 +260,6 @@ void amd_pmc_quirks_init(struct amd_pmc_dev *dev) if (dev->quirks->s2idle_bug_mmio) pr_info("Using s2idle quirk to avoid %s platform firmware bug\n", dmi_id->ident); + if (dev->quirks->spurious_8042) + dev->disable_8042_wakeup = true; }