Commit 4fb4cf9d authored by Mario Limonciello's avatar Mario Limonciello Committed by Wen Zhiwei
Browse files

thunderbolt: Don't display nvm_version unless upgrade supported 

stable inclusion
from stable-v6.6.70
commit 5422f4321640bb90fbdcd09c2486ee1da06dd443
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBOHV1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5422f4321640bb90fbdcd09c2486ee1da06dd443



--------------------------------

[ Upstream commit e34f1717ef0632fcec5cb827e5e0e9f223d70c9b ]

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.

Cc: stable@vger.kernel.org
Fixes: aef9c693 ("thunderbolt: Move vendor specific NVM handling into nvm.c")
Reported-by: default avatarRichard Hughes <hughsient@gmail.com>
Closes: https://github.com/fwupd/fwupd/issues/8200


Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 8b18cede

drivers/thunderbolt/retimer.c

+15 −2
Original line number Diff line number Diff line
@@ -98,6 +98,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);
@@ -177,8 +178,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);
@@ -331,6 +330,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,
@@ -340,6 +352,7 @@ static struct attribute *retimer_attrs[] = { 
};



static const struct attribute_group retimer_group = {

	.is_visible = retimer_is_visible,

	.attrs = retimer_attrs,

};