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

Add the CFI JEDEC instance ID if using vendor-extended version

Browse Source 
Setting a flash ID of `C84016` would then add `CFI\FLASHID_C84016` and
also `CFI\FLASHID_C840`. This makes it easier to write quirks.
This commit is contained in:
Richard Hughes 2021-12-07 13:22:32 +00:00
parent 95e3a97212
commit c877593803
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libfwupdplugin/fu-cfi-device.c
View File

@ -162,6 +162,18 @@ fu_cfi_device_finalize(GObject *object)
G_OBJECT_CLASS(fu_cfi_device_parent_class)->finalize(object); G_OBJECT_CLASS(fu_cfi_device_parent_class)->finalize(object);
} }
/* returns at most 4 chars from the ID, or %NULL if no different from existing ID */
static gchar *
fu_cfi_device_get_flash_id_jedec(FuCfiDevice *self)
{
FuCfiDevicePrivate *priv = GET_PRIVATE(self);
if (priv->flash_id == NULL)
return NULL;
if (strlen(priv->flash_id) <= 4)
return NULL;
return g_strndup(priv->flash_id, 4);
}
static gboolean static gboolean
fu_cfi_device_probe(FuDevice *device, GError **error) fu_cfi_device_probe(FuDevice *device, GError **error)
{ {
@ -170,9 +182,23 @@ fu_cfi_device_probe(FuDevice *device, GError **error)
/* load the parameters from quirks */ /* load the parameters from quirks */
if (priv->flash_id != NULL) { if (priv->flash_id != NULL) {
g_autofree gchar *instance_id = g_strdup_printf("CFI\\FLASHID_%s", priv->flash_id); g_autofree gchar *flash_id_jedec = NULL;
g_autofree gchar *instance_id0 = NULL;
g_autofree gchar *instance_id1 = NULL;
/* least specific so adding first */
flash_id_jedec = fu_cfi_device_get_flash_id_jedec(self);
if (flash_id_jedec != NULL) {
instance_id1 = g_strdup_printf("CFI\\FLASHID_%s", flash_id_jedec);
fu_device_add_instance_id_full(FU_DEVICE(self),
instance_id1,
FU_DEVICE_INSTANCE_FLAG_ONLY_QUIRKS);
}
/* this is most specific and can override keys of instance_id1 */
instance_id0 = g_strdup_printf("CFI\\FLASHID_%s", priv->flash_id);
fu_device_add_instance_id_full(FU_DEVICE(self), fu_device_add_instance_id_full(FU_DEVICE(self),
instance_id, instance_id0,
FU_DEVICE_INSTANCE_FLAG_ONLY_QUIRKS); FU_DEVICE_INSTANCE_FLAG_ONLY_QUIRKS);
} }