From: Mark Pearson <mpearson-lenovo@squebb.ca>
To: mpearson-lenovo@squebb.ca
Cc: hdegoede@redhat.com, markgross@kernel.org,
markpearson@lenovo.com, platform-driver-x86@vger.kernel.org
Subject: [PATCH v3 2/3] platform/x86: think-lmi: Add possible_values for ThinkStation
Date: Fri, 17 Mar 2023 11:46:34 -0400 [thread overview]
Message-ID: <20230317154635.39692-2-mpearson-lenovo@squebb.ca> (raw)
In-Reply-To: <20230317154635.39692-1-mpearson-lenovo@squebb.ca>
ThinkStation platforms don't support the API to return possible_values
but instead embed it in the settings string.
Try and extract this information and set the possible_values attribute
appropriately.
If there aren't any values possible then don't display possible_values.
Signed-off-by: Mark Pearson <mpearson-lenovo@squebb.ca>
---
Changes in V3:
- Use is_visible attribute to determine if possible_values should be
available
- Code got refactored a bit to make compilation cleaner
Changes in V2:
- Move no value for possible_values handling into show function
- use kstrndup for allocating string
drivers/platform/x86/think-lmi.c | 82 ++++++++++++++++++++++----------
1 file changed, 56 insertions(+), 26 deletions(-)
diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
index 5fa5451c4802..d89a1c9bdbf1 100644
--- a/drivers/platform/x86/think-lmi.c
+++ b/drivers/platform/x86/think-lmi.c
@@ -917,6 +917,8 @@ static ssize_t display_name_show(struct kobject *kobj, struct kobj_attribute *at
return sysfs_emit(buf, "%s\n", setting->display_name);
}
+static struct kobj_attribute attr_displ_name = __ATTR_RO(display_name);
+
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);
@@ -937,30 +939,6 @@ static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *a
return ret;
}
-static ssize_t possible_values_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
-{
- struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj);
-
- if (!tlmi_priv.can_get_bios_selections)
- return -EOPNOTSUPP;
-
- return sysfs_emit(buf, "%s\n", setting->possible_values);
-}
-
-static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr,
- char *buf)
-{
- struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj);
-
- if (setting->possible_values) {
- /* Figure out what setting type is as BIOS does not return this */
- if (strchr(setting->possible_values, ','))
- return sysfs_emit(buf, "enumeration\n");
- }
- /* Anything else is going to be a string */
- return sysfs_emit(buf, "string\n");
-}
-
static ssize_t current_value_store(struct kobject *kobj,
struct kobj_attribute *attr,
const char *buf, size_t count)
@@ -1044,14 +1022,46 @@ static ssize_t current_value_store(struct kobject *kobj,
return ret ?: count;
}
-static struct kobj_attribute attr_displ_name = __ATTR_RO(display_name);
+static struct kobj_attribute attr_current_val = __ATTR_RW_MODE(current_value, 0600);
+
+static ssize_t possible_values_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
+{
+ struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj);
+
+ return sysfs_emit(buf, "%s\n", setting->possible_values);
+}
static struct kobj_attribute attr_possible_values = __ATTR_RO(possible_values);
-static struct kobj_attribute attr_current_val = __ATTR_RW_MODE(current_value, 0600);
+static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr,
+ char *buf)
+{
+ struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj);
+
+ if (setting->possible_values) {
+ /* Figure out what setting type is as BIOS does not return this */
+ if (strchr(setting->possible_values, ','))
+ return sysfs_emit(buf, "enumeration\n");
+ }
+ /* Anything else is going to be a string */
+ return sysfs_emit(buf, "string\n");
+}
static struct kobj_attribute attr_type = __ATTR_RO(type);
+static umode_t attr_is_visible(struct kobject *kobj,
+ struct attribute *attr, int n)
+{
+ struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj);
+
+ /* We don't want to display possible_values attributes if not available */
+ if (attr == (struct attribute *)&attr_possible_values)
+ if (!setting->possible_values)
+ return 0;
+
+ return attr->mode;
+}
+
static struct attribute *tlmi_attrs[] = {
&attr_displ_name.attr,
&attr_current_val.attr,
@@ -1061,6 +1071,7 @@ static struct attribute *tlmi_attrs[] = {
};
static const struct attribute_group tlmi_attr_group = {
+ .is_visible = attr_is_visible,
.attrs = tlmi_attrs,
};
@@ -1440,6 +1451,25 @@ static int tlmi_analyze(void)
if (ret || !setting->possible_values)
pr_info("Error retrieving possible values for %d : %s\n",
i, setting->display_name);
+ } else {
+ /*
+ * Older Thinkstations don't support the bios_selections API.
+ * Instead they store this as a [Optional:Option1,Option2] section of the
+ * name string.
+ * Try and pull that out if it's available.
+ */
+ char *item, *optstart, *optend;
+
+ if (!tlmi_setting(setting->index, &item, LENOVO_BIOS_SETTING_GUID)) {
+ optstart = strstr(item, "[Optional:");
+ if (optstart) {
+ optstart += strlen("[Optional:");
+ optend = strstr(optstart, "]");
+ if (optend)
+ setting->possible_values =
+ kstrndup(optstart, optend - optstart, GFP_KERNEL);
+ }
+ }
}
kobject_init(&setting->kobj, &tlmi_attr_setting_ktype);
tlmi_priv.setting[i] = setting;
--
2.39.2
next prev parent reply other threads:[~2023-03-17 15:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-17 15:46 [PATCH v3 1/3] platform/x86: think-lmi: add missing type attribute Mark Pearson
2023-03-17 15:46 ` Mark Pearson [this message]
2023-03-18 16:35 ` [PATCH v3 2/3] platform/x86: think-lmi: Add possible_values for ThinkStation Thomas Weißschuh
2023-03-18 17:53 ` Mark Pearson
2023-03-18 23:52 ` Thomas Weißschuh
2023-03-19 0:08 ` Mark Pearson
2023-03-19 9:34 ` Hans de Goede
2023-03-18 17:59 ` Mark Pearson
2023-03-19 0:01 ` Thomas Weißschuh
2023-03-19 0:04 ` Mark Pearson
2023-03-17 15:46 ` [PATCH v3 3/3] platform/x86: think-lmi: use correct possible_values delimters Mark Pearson
2023-03-18 14:37 ` Barnabás Pőcze
2023-03-18 17:55 ` Mark Pearson
2023-03-18 16:39 ` Thomas Weißschuh
2023-03-18 18:06 ` Mark Pearson
2023-03-19 0:11 ` Thomas Weißschuh
2023-03-19 0:18 ` Mark Pearson
2023-03-20 0:52 ` [PATCH v3 1/3] platform/x86: think-lmi: add missing type attribute Limonciello, Mario
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230317154635.39692-2-mpearson-lenovo@squebb.ca \
--to=mpearson-lenovo@squebb.ca \
--cc=hdegoede@redhat.com \
--cc=markgross@kernel.org \
--cc=markpearson@lenovo.com \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).