From patchwork Fri May 26 17:16:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Pearson X-Patchwork-Id: 99592 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp647370vqr; Fri, 26 May 2023 10:39:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ51tFCYjVlEJI/qygRwnmnEdFZQh5CdY4Q+7eZ/PWwVLYR5upDMY/XgPmUJGDAyPZnw9FcY X-Received: by 2002:a05:6a21:7899:b0:10c:c9ac:14c6 with SMTP id bf25-20020a056a21789900b0010cc9ac14c6mr61491pzc.39.1685122792343; Fri, 26 May 2023 10:39:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685122792; cv=none; d=google.com; s=arc-20160816; b=kVx9pn7BHOTq67rEJDWTFJDEa7E9ur6oD9PWFZv2RVpkXUAWaU73H8M81Ao2iaN+hY a1EgOUqBvjgKcq1eXLk2wV5HFb9tr1HosWv5BpJByCABhWJN0tviXeY8QbzMRhm8GMRh Q+eYrWl2csLzosQSe47YM8G1TC4inimcgdKvwuTJussPbcYqYwZfLGMpnAkiHTLyx8Bt mbjxKhrknWaWWUaiukQHat2apHeVRFM0qKjDbaa0eojwLLnAZH2k1G0z6ATYnA7gsQaA UyitbIBI3iAV/VUKzyOp84ZpL12GshIFucYwu2YBhlbO3BjXxc6AYEj5lj63bfYUqZAr YQBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :feedback-id:dkim-signature:dkim-signature; bh=6WpOx2gK33A4/xpMNBFpnpPcJvOudjsGpjGgTRy4P64=; b=Sv5S5iv6BePHHZ+AwI/0nZN9f21LWa3U2UMCrMIfsaWbj6UjZks8R4WUP+XisNSXrb sqWEhxrnYyRttSyOCkcgJkLWCS+JoW6HZ/Le++Bf3WyqXkX49MHNoj12zwyR3gfLlGJz JnQaBqxKlZfjCwleOgBTTvGr9L3u8nUJuEk2OF6jxd1YCWIMcHmJxNxziR2n6/Z9BvX1 +RWy7YMIxlPie6uPId/Vjp34hrCMuiPQVVtXAEwMWeUlZSjceQ8qqNvgN9WU+5Zd3wfm JjKVZvhHEFe4nzuK107kesX+2IyhsQLKuswMVnewUE6Ni1jysbwSLaHLcrJ6KEmp9FMP ze6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@squebb.ca header.s=fm2 header.b=rzRmM84N; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=qV2PTC19; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a18-20020a637f12000000b0053f0d8ac4b0si4069601pgd.825.2023.05.26.10.39.37; Fri, 26 May 2023 10:39:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@squebb.ca header.s=fm2 header.b=rzRmM84N; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=qV2PTC19; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237519AbjEZRRW (ORCPT + 99 others); Fri, 26 May 2023 13:17:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233008AbjEZRRR (ORCPT ); Fri, 26 May 2023 13:17:17 -0400 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5798DFB; Fri, 26 May 2023 10:17:15 -0700 (PDT) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id BE9205C0179; Fri, 26 May 2023 13:17:14 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Fri, 26 May 2023 13:17:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=squebb.ca; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1685121434; x= 1685207834; bh=6WpOx2gK33A4/xpMNBFpnpPcJvOudjsGpjGgTRy4P64=; b=r zRmM84NG2q7CQ1nO6rpI6HFyCLaXO4Jw4qXmefCKDcpm008YbduVPk5EMQNwo0kh v4KHlFFHLduzyv3LgQ9IgEGDJQj/G+hASoPvoNVxcf0Y2wlHH7i3qbjpzZQe83TA dmMq7dH/r8ROrb2GIMba++BcfF2nHNFnVVupSw8XjPbl4OaA3lIclJvY8bIVWoHv xyMzcl3rBedQ5VIJoLnSv2GmmFYkjMJotsjT6hBYozCgUXg8k3ALFx1z2GK0ZNIt Z25jyypSQmynW59QI/RQjqUnoJyKVRKu6JHL+e0Yt6bwKwE9o55QvvGR9GLO+eQU 30Z3diNJapJ007Y+KFM4w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1685121434; x= 1685207834; bh=6WpOx2gK33A4/xpMNBFpnpPcJvOudjsGpjGgTRy4P64=; b=q V2PTC19SUOoVYlZZ7pkfwDw+HRKN7WR1TPQcdbYAon4raDZJz564MavPZDMbCxHH 5i1jbFGZHRzW9WZI3gUxR9A+E2tN7hG4rdYHQh9FjvVEGLsElLKfHlFH6i46kL6l 3knRz0OLJ9Mw0I5O1/JRyLCI6K0TEWZILYMtr4kvOsly+rw/2L0j5p0+VXiIdhhw WoT7qNboRizuckXx+J8gh6dBkDE/1fcKm02HJ2PohV9whIb8OPQ0swla4LI+z61I /0NFZPcIx0q7ACygLcD8lO15fBOPZ8PwJV3+gk+V0xgnzfyYy++4/uvaAQCLf4bd FGz93E8kJrGN6byxyW9MQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeejledguddtlecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecuogetfedtuddqtdduucdludehmdenucfjughrpe fhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforghrkhcurfgvrghr shhonhcuoehmphgvrghrshhonhdqlhgvnhhovhhosehsqhhuvggssgdrtggrqeenucggtf frrghtthgvrhhnpeeftddvjeefleffvefhgfejjeehudetteeigeeugfekhffhgeejudeu teehgfdvffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehmphgvrghrshhonhdqlhgvnhhovhhosehsqhhuvggssgdrtggr X-ME-Proxy: Feedback-ID: ibe194615:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 26 May 2023 13:17:14 -0400 (EDT) From: Mark Pearson To: mpearson-lenovo@squebb.ca Cc: hdegoede@redhat.com, markgross@kernel.org, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/5] platform/x86: think-lmi: Correct System password interface Date: Fri, 26 May 2023 13:16:55 -0400 Message-Id: <20230526171658.3886-2-mpearson-lenovo@squebb.ca> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230526171658.3886-1-mpearson-lenovo@squebb.ca> References: <20230526171658.3886-1-mpearson-lenovo@squebb.ca> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766166726793065627?= X-GMAIL-MSGID: =?utf-8?q?1766979317147860988?= The system password identification was incorrect. This means that if the password was enabled it wouldn't be detected correctly; and setting it would not work. Also updated code to use TLMI_SMP_PWD instead of TLMI_SYS_PWD to be in sync with Lenovo documentation. Correct these mistakes. Signed-off-by: Mark Pearson --- Changes in v2: - Updated define name to be SMP_PWD instead of SYS_PWD - Clarified in comments what each password type is. Changes in v3: None. Version bump with rest of series drivers/platform/x86/think-lmi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c index 2745224f62ab..c7e98fbe7c3d 100644 --- a/drivers/platform/x86/think-lmi.c +++ b/drivers/platform/x86/think-lmi.c @@ -168,11 +168,11 @@ MODULE_PARM_DESC(debug_support, "Enable debug command support"); */ #define LENOVO_CERT_THUMBPRINT_GUID "C59119ED-1C0D-4806-A8E9-59AA318176C4" -#define TLMI_POP_PWD (1 << 0) -#define TLMI_PAP_PWD (1 << 1) -#define TLMI_HDD_PWD (1 << 2) -#define TLMI_SYS_PWD (1 << 3) -#define TLMI_CERT (1 << 7) +#define TLMI_POP_PWD (1 << 0) /* Supervisor */ +#define TLMI_PAP_PWD (1 << 1) /* Power-on */ +#define TLMI_HDD_PWD (1 << 2) /* HDD/NVME */ +#define TLMI_SMP_PWD (1 << 6) /* System Management */ +#define TLMI_CERT (1 << 7) /* Certificate Based */ #define to_tlmi_pwd_setting(kobj) container_of(kobj, struct tlmi_pwd_setting, kobj) #define to_tlmi_attr_setting(kobj) container_of(kobj, struct tlmi_attr_setting, kobj) @@ -1509,11 +1509,11 @@ static int tlmi_analyze(void) tlmi_priv.pwd_power->valid = true; if (tlmi_priv.opcode_support) { - tlmi_priv.pwd_system = tlmi_create_auth("sys", "system"); + tlmi_priv.pwd_system = tlmi_create_auth("smp", "system"); if (!tlmi_priv.pwd_system) goto fail_clear_attr; - if (tlmi_priv.pwdcfg.core.password_state & TLMI_SYS_PWD) + if (tlmi_priv.pwdcfg.core.password_state & TLMI_SMP_PWD) tlmi_priv.pwd_system->valid = true; tlmi_priv.pwd_hdd = tlmi_create_auth("hdd", "hdd");