proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-06 14:32:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nvme: Do not try to handle integer version numbers

Browse Source 
We've never come across a drive that uses anything other than plain.
This commit is contained in:
Richard Hughes 2020-02-27 08:25:06 +00:00
parent b097603800
commit 1beec89c57
1 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
plugins/nvme/fu-nvme-device.c
View File

@ -183,45 +183,6 @@ fu_nvme_device_parse_cns_maybe_dell (FuNvmeDevice *self, const guint8 *buf)
fu_device_add_guid (FU_DEVICE (self), guid_efi);
}
static gboolean
fu_nvme_device_set_version (FuNvmeDevice *self, const gchar *version, GError **error)
{
FwupdVersionFormat fmt = fu_device_get_version_format (FU_DEVICE (self));
/* unset */
if (fmt == FWUPD_VERSION_FORMAT_UNKNOWN || fmt == FWUPD_VERSION_FORMAT_PLAIN) {
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN);
fu_device_set_version (FU_DEVICE (self), version);
return TRUE;
}
/* AA.BB.CC.DD */
if (fmt == FWUPD_VERSION_FORMAT_QUAD) {
guint64 tmp = g_ascii_strtoull (version, NULL, 16);
g_autofree gchar *version_new = NULL;
if (tmp == 0 || tmp > G_MAXUINT32) {
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_DATA,
"%s is not valid 32 bit number",
version);
return FALSE;
}
version_new = fu_common_version_from_uint32 (tmp, FWUPD_VERSION_FORMAT_QUAD);
fu_device_set_version_format (FU_DEVICE (self), fmt);
fu_device_set_version (FU_DEVICE (self), version_new);
return TRUE;
}
/* invalid, or not supported */
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_DATA,
"version format %s not handled",
fwupd_version_format_to_string (fmt));
return FALSE;
}
static gboolean
fu_nvme_device_parse_cns (FuNvmeDevice *self, const guint8 *buf, gsize sz, GError **error)
{
@ -253,10 +214,8 @@ fu_nvme_device_parse_cns (FuNvmeDevice *self, const guint8 *buf, gsize sz, GErro
if (mn != NULL)
fu_device_set_name (FU_DEVICE (self), mn);
sr = fu_nvme_device_get_string_safe (buf, 64, 71);
if (sr != NULL) {
if (!fu_nvme_device_set_version (self, sr, error))
return FALSE;
}
if (sr != NULL)
fu_device_set_version (FU_DEVICE (self), sr);
/* firmware update granularity (FWUG) */
fwug = buf[319];
@ -431,6 +390,7 @@ fu_nvme_device_init (FuNvmeDevice *self)
{
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_REQUIRE_AC);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_version_format (FU_DEVICE (self), FWUPD_VERSION_FORMAT_PLAIN);
fu_device_set_summary (FU_DEVICE (self), "NVM Express Solid State Drive");
fu_device_add_icon (FU_DEVICE (self), "drive-harddisk");
fu_device_set_protocol (FU_DEVICE (self), "org.nvmexpress");