diff mbox series

[v2] thunderbolt: Don't display nvm_version unless upgrade supported

Message ID 20241209162551.888749-1-superm1@kernel.org (mailing list archive)
State Accepted
Commit e34f1717ef0632fcec5cb827e5e0e9f223d70c9b
Headers show
Series [v2] thunderbolt: Don't display nvm_version unless upgrade supported | expand

Commit Message

Mario Limonciello Dec. 9, 2024, 4:25 p.m. UTC 
From: Mario Limonciello <mario.limonciello@amd.com>

The read will never succeed if nvm wasn't initialized due to an
unknown format.

Add a new callback for visibility to only show when supported.

Fixes: aef9c693e7e5 ("thunderbolt: Move vendor specific NVM handling into nvm.c")
Reported-by: Richard Hughes <hughsient@gmail.com>
Closes: https://github.com/fwupd/fwupd/issues/8200
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
v2:
 * Use no_nvm_upgrade instead of changing logic
 * Adjust commit message
---
 drivers/thunderbolt/retimer.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

Comments

Mika Westerberg Dec. 11, 2024, 7:14 a.m. UTC | #1 
On Mon, Dec 09, 2024 at 10:25:51AM -0600, Mario Limonciello wrote:
> From: Mario Limonciello <mario.limonciello@amd.com>
> 
> The read will never succeed if nvm wasn't initialized due to an
> unknown format.
> 
> Add a new callback for visibility to only show when supported.
> 
> Fixes: aef9c693e7e5 ("thunderbolt: Move vendor specific NVM handling into nvm.c")
> Reported-by: Richard Hughes <hughsient@gmail.com>
> Closes: https://github.com/fwupd/fwupd/issues/8200
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>

Applied to thunderbolt.git/fixes, thanks Mario!
diff mbox series

Patch

diff --git a/drivers/thunderbolt/retimer.c b/drivers/thunderbolt/retimer.c
index 89d2919d0193e..eeb64433ebbca 100644
--- a/drivers/thunderbolt/retimer.c
+++ b/drivers/thunderbolt/retimer.c
@@ -103,6 +103,7 @@  static int tb_retimer_nvm_add(struct tb_retimer *rt)
 
 err_nvm:
 	dev_dbg(&rt->dev, "NVM upgrade disabled\n");
+	rt->no_nvm_upgrade = true;
 	if (!IS_ERR(nvm))
 		tb_nvm_free(nvm);
 
@@ -182,8 +183,6 @@  static ssize_t nvm_authenticate_show(struct device *dev,
 
 	if (!rt->nvm)
 		ret = -EAGAIN;
-	else if (rt->no_nvm_upgrade)
-		ret = -EOPNOTSUPP;
 	else
 		ret = sysfs_emit(buf, "%#x\n", rt->auth_status);
 
@@ -323,8 +322,6 @@  static ssize_t nvm_version_show(struct device *dev,
 
 	if (!rt->nvm)
 		ret = -EAGAIN;
-	else if (rt->no_nvm_upgrade)
-		ret = -EOPNOTSUPP;
 	else
 		ret = sysfs_emit(buf, "%x.%x\n", rt->nvm->major, rt->nvm->minor);
 
@@ -342,6 +339,19 @@  static ssize_t vendor_show(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR_RO(vendor);
 
+static umode_t retimer_is_visible(struct kobject *kobj, struct attribute *attr,
+				  int n)
+{
+	struct device *dev = kobj_to_dev(kobj);
+	struct tb_retimer *rt = tb_to_retimer(dev);
+
+	if (attr == &dev_attr_nvm_authenticate.attr ||
+	    attr == &dev_attr_nvm_version.attr)
+		return rt->no_nvm_upgrade ? 0 : attr->mode;
+
+	return attr->mode;
+}
+
 static struct attribute *retimer_attrs[] = {
 	&dev_attr_device.attr,
 	&dev_attr_nvm_authenticate.attr,
@@ -351,6 +361,7 @@  static struct attribute *retimer_attrs[] = {
 };
 
 static const struct attribute_group retimer_group = {
+	.is_visible = retimer_is_visible,
 	.attrs = retimer_attrs,
 };