From: Mark Pearson <mpearson-lenovo@squebb.ca>

Date: Sun, 2 Apr 2023 21:31:20 -0400

Subject: [PATCH] platform/x86: think-lmi: Clean up display of current_value on

 Thinkstation

References: bsc#1012628

Patch-mainline: 6.2.11

Git-commit: 7065655216d4d034d71164641f3bec0b189ad6fa

[ Upstream commit 7065655216d4d034d71164641f3bec0b189ad6fa ]

On ThinkStations on retrieving the attribute value the BIOS appends the

possible values to the string.

Clean up the display in the current_value_show function so the options

part is not displayed.

Fixes: a40cd7ef22fb ("platform/x86: think-lmi: Add WMI interface support on Lenovo platforms")

Reported by Mario Limoncello <Mario.Limonciello@amd.com>

Link: https://github.com/fwupd/fwupd/issues/5077#issuecomment-1488730526

Signed-off-by: Mark Pearson <mpearson-lenovo@squebb.ca>

Link: https://lore.kernel.org/r/20230403013120.2105-2-mpearson-lenovo@squebb.ca

Tested-by: Mario Limonciello <mario.limonciello@amd.com>

Tested-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/platform/x86/think-lmi.c | 9 ++++++---

 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c

index 70c4ee25..336b9029 100644

--- a/drivers/platform/x86/think-lmi.c

+++ b/drivers/platform/x86/think-lmi.c

@@ -920,7 +920,7 @@ static ssize_t display_name_show(struct kobject *kobj, struct kobj_attribute *at

 static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)

 {

 	struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj);

-	char *item, *value;

+	char *item, *value, *p;

 	int ret;

 	ret = tlmi_setting(setting->index, &item, LENOVO_BIOS_SETTING_GUID);

@@ -931,9 +931,12 @@ static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *a

 	value = strpbrk(item, ",");

 	if (!value || value == item || !strlen(value + 1))

 		ret = -EINVAL;

-	else

+	else {

+		/* On Workstations remove the Options part after the value */

+		p = strchrnul(value, ';');

+		*p = '\0';

 		ret = sysfs_emit(buf, "%s\n", value + 1);

-

+	}

 	kfree(item);

 	return ret;

-- 

2.35.3