proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-07 10:27:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

thunderbolt: Handle -EAGAIN from nvm_version elsewhere as well

Browse Source 
There are other places in the plugin where we read nvm_version and it
can return -EAGAIN as well. To make sure it works consistenly accross
the plugin factor reading nvm_version to a helper function and use instead.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Mika Westerberg 2018-08-06 14:30:24 +03:00 committed by Richard Hughes
parent e20a5cb839
commit b9ac0aa179
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
plugins/thunderbolt/fu-plugin-thunderbolt.c
View File

@ -174,6 +174,24 @@ fu_plugin_thunderbolt_find_nvmem (GUdevDevice *udevice,
return NULL; return NULL;
} }
static const gchar *
fu_plugin_thunderbolt_udev_get_version (GUdevDevice *udevice)
{
const gchar *version = NULL;
for (guint i = 0; i < 50; i++) {
version = g_udev_device_get_sysfs_attr (udevice, "nvm_version");
if (version != NULL)
break;
g_debug ("Attempt %u: Failed to read NVM version", i);
if (errno != EAGAIN)
break;
g_usleep (TBT_NVM_RETRY_TIMEOUT * 1000);
}
return version;
}
static gboolean static gboolean
fu_plugin_thunderbolt_is_native (GUdevDevice *udevice, gboolean *is_native, GError **error) fu_plugin_thunderbolt_is_native (GUdevDevice *udevice, gboolean *is_native, GError **error)
{ {
@ -285,15 +303,8 @@ fu_plugin_thunderbolt_add (FuPlugin *plugin, GUdevDevice *device)
dev = fu_device_new (); dev = fu_device_new ();
is_host = fu_plugin_thunderbolt_is_host (device); is_host = fu_plugin_thunderbolt_is_host (device);
for (guint i = 0; i < 50; i++) {
version_raw = g_udev_device_get_sysfs_attr (device, "nvm_version"); version_raw = fu_plugin_thunderbolt_udev_get_version (device);
if (version_raw != NULL)
break;
g_debug ("Attempt %u: Failed to read NVM version", i);
if (errno != EAGAIN)
break;
g_usleep (TBT_NVM_RETRY_TIMEOUT * 1000);
}
/* test for safe mode */ /* test for safe mode */
version = fu_plugin_thunderbolt_parse_version (version_raw); version = fu_plugin_thunderbolt_parse_version (version_raw);
if (is_host && version == NULL) { if (is_host && version == NULL) {
@ -413,7 +424,7 @@ fu_plugin_thunderbolt_change (FuPlugin *plugin, GUdevDevice *device)
return; return;
} }
version = g_udev_device_get_sysfs_attr (device, "nvm_version"); version = fu_plugin_thunderbolt_udev_get_version (device);
fu_device_set_version (dev, version); fu_device_set_version (dev, version);
} }
@ -626,7 +637,7 @@ on_wait_for_device_added (FuPlugin *plugin,
/* make sure the version is correct, might have changed /* make sure the version is correct, might have changed
* after update. */ * after update. */
version = g_udev_device_get_sysfs_attr (device, "nvm_version"); version = fu_plugin_thunderbolt_udev_get_version (device);
fu_device_set_version (dev, version); fu_device_set_version (dev, version);
id = fu_plugin_thunderbolt_gen_id (device); id = fu_plugin_thunderbolt_gen_id (device);