From patchwork Mon Mar 20 00:32:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Pearson X-Patchwork-Id: 71927 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp958589wrt; Sun, 19 Mar 2023 18:33:26 -0700 (PDT) X-Google-Smtp-Source: AK7set+mmqFFVnyjRvsQ8/bTRiMaNd35ryAq0XMHaASpORgDTAXgrePDBQtqi6gCU2Uo8Sa4TnWk X-Received: by 2002:a05:6a20:7f8e:b0:d5:58df:fb94 with SMTP id d14-20020a056a207f8e00b000d558dffb94mr17614116pzj.2.1679276006272; Sun, 19 Mar 2023 18:33:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679276006; cv=none; d=google.com; s=arc-20160816; b=GVLy4w1RiWn3OhgMVXt1HAOZfbMtTjq+R7etVX4sRf/CR1zC7PEf8CQU2Io21A9uyB b8cX3p03lYpxErU3cJCoHYJiPsu1hOdZxao2i4an3CxPpg1FjrMmJ3PbcwpyR23HUZdV 7oZKFRBveq6fGmXYXYLdYVv4V9VQO1gvfhRjkYqegZJiWD5/T2kaK1aj+SvnxdCw/kXo 7atiNaoiFR8tXdW9j9Lgq3Pwa32N8Oj8mAtANUPN7YkEUa/S1pRS6WSbP0byUtUiZ+/l UejZ3IgyFzbiaLX+bBh79S9kf8qia6UCW3TfKsBE8z5qylceyIzDihIAE27w4uTk9jEQ GmpA== 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=jG60LqVl3ygGxpbLQr7OMm+KfrWuJT68jTJtYViPpXc=; b=mX876msxvVgJ8C8p6W0OML7kERxlFMzpwdOHRS6AEiTmIMKy7CpCpU9hBgwjmUoeXe kMuJseNPCihvU4DNr579z6TrARuvXF5TtpAIs6sU5M/p4qFXp/ikadPfTTqRKA9uKp6X gPyT6U2Hk6y/m1D7pPk+nDhe1dor/20JxsAceCcQBWrtkwuGZhCK0HjkkZOFX6B+ia0N sdTGA7WnO4SnL7mR+5ZBq0cS3gtk5ej1aUCcLHsh7yGl0WqzRO3Ud+NnXbbi6q9+SHif 5/rQJT6WsVndOyUWI3hf7DyAoThxofX7dDToSPb7sJBfSXdDZL5PkKoIXupL2ZTufl2n dYAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@squebb.ca header.s=fm3 header.b=EDipKsBX; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=hV6VsYaD; 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 hk12-20020a17090b224c00b0023369af18e2si9519489pjb.72.2023.03.19.18.33.13; Sun, 19 Mar 2023 18:33:26 -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=fm3 header.b=EDipKsBX; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=hV6VsYaD; 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 S229756AbjCTAcs (ORCPT + 99 others); Sun, 19 Mar 2023 20:32:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229622AbjCTAcj (ORCPT ); Sun, 19 Mar 2023 20:32:39 -0400 Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C3E116AD3 for ; Sun, 19 Mar 2023 17:32:36 -0700 (PDT) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 0A45C5C0072; Sun, 19 Mar 2023 20:32:33 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 19 Mar 2023 20:32:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=squebb.ca; h=cc :cc:content-transfer-encoding:content-type: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=fm3; t= 1679272353; x=1679358753; bh=jG60LqVl3ygGxpbLQr7OMm+KfrWuJT68jTJ tYViPpXc=; b=EDipKsBXVfwTCTShST/pxWDRzzDBEMg8pqhAbcOBfujaqExt2Oi US9/5fD4/N9bCdxYGVlxo6aQ/qlTNbS3cjd2kbQncNxce4kUUQQ9kgKI61wE10FI CcSWl7WtbIngYhUhSIE3xf8NUQreCaVpn/tSgXMlIwwhAv7KLjjs0nmUJRKDDIjh HfgKE8Sal+pkr9MDb5T7RmnDftvpjSYWid259aVv3oYyrMGwUcazm3wKlhn3/s/+ 1CzLxbnsgLYJJpTKDYZeLq863whkUA32YzPOzuGv5tTAA17shck9LJhQIiJoZaWP w61rTRsZjCD0+vXFIhPyKgfja7sw5EE59wA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=fm2; t= 1679272353; x=1679358753; bh=jG60LqVl3ygGxpbLQr7OMm+KfrWuJT68jTJ tYViPpXc=; b=hV6VsYaDJkiSLN8iqSkY8VCnPhxGch64tIWrKoZxdrQuWAxXbIt t5Ina0036fXkCHBjpOpPWRcExN6iMyMimkjc/ZCZLaWY+sEf5zdEzwyqeDR5OAK+ njAJAEJ3h5HjTRlTw0UBKIAHJpD+p5Ydc/2IQ+BhdHPRxDe9ufOyghxC6i8pUIwN 6YD0P0IE/5j0GdrNx1QMezAKmH0HHAGiZLkynqgTd8up54fovXovh13sLRUt/t1m e9zCOcMZisry2DudXE8idvS29R+SOYYaVs+kHEUvHQ53FXY2porYV3n1CH8ox9rT iOy+U8LrK7RDoOk4sWpbSdBIsVRzflPdebQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdefjedgvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgoteeftdduqddtudculdduhedmnecujfgurhephf fvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghrkhcurfgvrghr shhonhcuoehmphgvrghrshhonhdqlhgvnhhovhhosehsqhhuvggssgdrtggrqeenucggtf frrghtthgvrhhnpeffffefudeuueduueduhfefkeeiueeihfdukeeuffekfffhheeigfeh veekhefhhfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehmphgvrghrshhonhdqlhgvnhhovhhosehsqhhuvggssgdrtggr X-ME-Proxy: Feedback-ID: ibe194615:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 19 Mar 2023 20:32:32 -0400 (EDT) From: Mark Pearson To: mpearson-lenovo@squebb.ca Cc: hdegoede@redhat.com, markgross@kernel.org, markpearson@lenovo.com, thomas@t-8ch.de, pobrn@protonmail.com, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Subject: [PATCH v4 2/4] platform/x86: think-lmi: use correct possible_values delimiters Date: Sun, 19 Mar 2023 20:32:19 -0400 Message-Id: <20230320003221.561750-2-mpearson-lenovo@squebb.ca> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320003221.561750-1-mpearson-lenovo@squebb.ca> References: <20230320003221.561750-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 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?1760848517409391626?= X-GMAIL-MSGID: =?utf-8?q?1760848517409391626?= firmware-attributes class requires that possible values are delimited using ';' but the Lenovo firmware uses ',' instead. Parse string and replace where appropriate. Suggested-by: Thomas Weißschuh Fixes: a40cd7ef22fb ("platform/x86: think-lmi: Add WMI interface support on Lenovo platforms") Signed-off-by: Mark Pearson Reviewed-by: Thomas Weißschuh --- Changes in v4 - Moved earlier in the series as recommended - used strreplace function as recommended Changes in v3: - New patch added to the series. No v1 & v2. drivers/platform/x86/think-lmi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c index a765bf8c27d8..53f34b1adb8c 100644 --- a/drivers/platform/x86/think-lmi.c +++ b/drivers/platform/x86/think-lmi.c @@ -954,7 +954,7 @@ static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr, if (setting->possible_values) { /* Figure out what setting type is as BIOS does not return this */ - if (strchr(setting->possible_values, ',')) + if (strchr(setting->possible_values, ';')) return sysfs_emit(buf, "enumeration\n"); } /* Anything else is going to be a string */ @@ -1413,6 +1413,13 @@ static int tlmi_analyze(void) pr_info("Error retrieving possible values for %d : %s\n", i, setting->display_name); } + /* + * firmware-attributes requires that possible_values are separated by ';' but + * Lenovo FW uses ','. Replace appropriately. + */ + if (setting->possible_values) + strreplace(setting->possible_values, ',', ';'); + kobject_init(&setting->kobj, &tlmi_attr_setting_ktype); tlmi_priv.setting[i] = setting; kfree(item);