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

mtd: Use the correct uSWID child for multiple coSWID children

Browse Source
This commit is contained in:
Richard Hughes 2022-04-17 20:05:46 +01:00
parent 519110b70e
commit 7ec0f11e69
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/mtd/README.md
View File

@ -19,6 +19,10 @@ These devices use custom DeviceInstanceId values built from the device `NAME` an
* `MTD\VENDOR_foo&NAME_baz` * `MTD\VENDOR_foo&NAME_baz`
* `MTD\VENDOR_foo&PRODUCT_bar&NAME_baz` * `MTD\VENDOR_foo&PRODUCT_bar&NAME_baz`
If the `FirmwareGType` quirk is set for the device then the firmware is read back from the device at
daemon startup and parsed for the version number.
In the event the firmware has multiple child images then the device GUIDs are used as firmware IDs.
## Update Behavior ## Update Behavior
The MTD device is erased in chunks, written and then read back to verify. The MTD device is erased in chunks, written and then read back to verify.

23
plugins/mtd/fu-mtd-device.c
View File

@ -30,6 +30,8 @@ fu_mtd_device_to_string(FuDevice *device, guint idt, GString *str)
static gboolean static gboolean
fu_mtd_device_setup(FuDevice *device, GError **error) fu_mtd_device_setup(FuDevice *device, GError **error)
{ {
FuFirmware *firmware_child = NULL;
GPtrArray *instance_ids;
GType firmware_gtype = fu_device_get_firmware_gtype(device); GType firmware_gtype = fu_device_get_firmware_gtype(device);
const gchar *fn; const gchar *fn;
g_autoptr(FuFirmware) firmware = NULL; g_autoptr(FuFirmware) firmware = NULL;
@ -53,11 +55,24 @@ fu_mtd_device_setup(FuDevice *device, GError **error)
if (!fu_firmware_parse_file(firmware, file, FWUPD_INSTALL_FLAG_NONE, error)) if (!fu_firmware_parse_file(firmware, file, FWUPD_INSTALL_FLAG_NONE, error))
return FALSE; return FALSE;
/* find the firmware child that matches any of the device GUID,
* and use the main firmware version if no match */
instance_ids = fu_device_get_instance_ids(device);
for (guint i = 0; i < instance_ids->len; i++) {
const gchar *instance_id = g_ptr_array_index(instance_ids, i);
g_autofree gchar *guid = fwupd_guid_hash_string(instance_id);
firmware_child = fu_firmware_get_image_by_id(firmware, guid, NULL);
if (firmware_child != NULL)
break;
}
if (firmware_child == NULL)
firmware_child = firmware;
/* copy over the version */ /* copy over the version */
if (fu_firmware_get_version(firmware) != NULL) if (fu_firmware_get_version(firmware_child) != NULL)
fu_device_set_version(device, fu_firmware_get_version(firmware)); fu_device_set_version(device, fu_firmware_get_version(firmware_child));
if (fu_firmware_get_version_raw(firmware) != G_MAXUINT64) if (fu_firmware_get_version_raw(firmware_child) != G_MAXUINT64)
fu_device_set_version_raw(device, fu_firmware_get_version_raw(firmware)); fu_device_set_version_raw(device, fu_firmware_get_version_raw(firmware_child));
/* success */ /* success */
return TRUE; return TRUE;