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

Allow a plugin to only use the RemoveDelay when waiting for replug

Browse Source 
Only opt-in plugins that have been tested -- unconditionally enabling
this may cause regressions on devices like docks.

Fixes https://github.com/fwupd/fwupd/issues/4378
This commit is contained in:
Richard Hughes 2022-03-14 20:29:07 +00:00
parent 0ad49b444e
commit 2319f19306
5 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libfwupdplugin/fu-device.c
View File

@ -233,6 +233,8 @@ fu_device_internal_flag_to_string(FuDeviceInternalFlags flag)
return "md-set-signed";
if (flag == FU_DEVICE_INTERNAL_AUTO_PAUSE_POLLING)
return "auto-pause-polling";
if (flag == FU_DEVICE_INTERNAL_FLAG_ONLY_WAIT_FOR_REPLUG)
return "only-wait-for-replug";
return NULL;
}
@ -299,6 +301,8 @@ fu_device_internal_flag_from_string(const gchar *flag)
return FU_DEVICE_INTERNAL_FLAG_MD_SET_SIGNED;
if (g_strcmp0(flag, "auto-pause-polling") == 0)
return FU_DEVICE_INTERNAL_AUTO_PAUSE_POLLING;
if (g_strcmp0(flag, "only-wait-for-replug") == 0)
return FU_DEVICE_INTERNAL_FLAG_ONLY_WAIT_FOR_REPLUG;
return FU_DEVICE_INTERNAL_FLAG_UNKNOWN;
}

10
libfwupdplugin/fu-device.h
View File

@ -458,6 +458,16 @@ typedef guint64 FuDeviceInternalFlags;
*/
#define FU_DEVICE_INTERNAL_AUTO_PAUSE_POLLING (1ull << 24)
/**
* FU_DEVICE_INTERNAL_FLAG_ONLY_WAIT_FOR_REPLUG:
*
* Only use the device removal delay when explicitly waiting for a replug, rather than every time
* the device is removed.
*
* Since: 1.8.1
*/
#define FU_DEVICE_INTERNAL_FLAG_ONLY_WAIT_FOR_REPLUG (1ull << 25)
/* accessors */
gchar *
fu_device_to_string(FuDevice *self);

1
plugins/ccgx/fu-ccgx-dmc-device.c
View File

@ -748,6 +748,7 @@ fu_ccgx_dmc_device_init(FuCcgxDmcDevice *self)
fu_device_add_flag(FU_DEVICE(self), FWUPD_DEVICE_FLAG_DUAL_IMAGE);
fu_device_add_flag(FU_DEVICE(self), FWUPD_DEVICE_FLAG_SELF_RECOVERY);
fu_device_add_internal_flag(FU_DEVICE(self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID);
fu_device_add_internal_flag(FU_DEVICE(self), FU_DEVICE_INTERNAL_FLAG_ONLY_WAIT_FOR_REPLUG);
fu_device_register_private_flag(FU_DEVICE(self),
FU_CCGX_DMC_DEVICE_FLAG_HAS_MANUAL_REPLUG,
"has-manual-replug");

1
plugins/colorhug/fu-colorhug-device.c
View File

@ -592,6 +592,7 @@ fu_colorhug_device_init(FuColorhugDevice *self)
fu_device_add_flag(FU_DEVICE(self), FWUPD_DEVICE_FLAG_ADD_COUNTERPART_GUIDS);
fu_device_add_flag(FU_DEVICE(self), FWUPD_DEVICE_FLAG_UNSIGNED_PAYLOAD);
fu_device_add_internal_flag(FU_DEVICE(self), FU_DEVICE_INTERNAL_FLAG_REPLUG_MATCH_GUID);
fu_device_add_internal_flag(FU_DEVICE(self), FU_DEVICE_INTERNAL_FLAG_ONLY_WAIT_FOR_REPLUG);
fu_device_register_private_flag(FU_DEVICE(self),
FU_COLORHUG_DEVICE_FLAG_HALFSIZE,
"halfsize");

13
src/fu-device-list.c
View File

@ -446,6 +446,17 @@ fu_device_list_remove_with_delay(FuDeviceItem *item)
item);
}
static gboolean
fu_device_list_should_remove_with_delay(FuDevice *device)
{
if (fu_device_get_remove_delay(device) == 0)
return FALSE;
if (fu_device_has_internal_flag(device, FU_DEVICE_INTERNAL_FLAG_ONLY_WAIT_FOR_REPLUG) &&
!fu_device_has_flag(device, FWUPD_DEVICE_FLAG_WAIT_FOR_REPLUG))
return FALSE;
return TRUE;
}
/**
* fu_device_list_remove:
* @self: a device list
@ -487,7 +498,7 @@ fu_device_list_remove(FuDeviceList *self, FuDevice *device)
}
/* delay the removal and check for replug */
if (fu_device_get_remove_delay(item->device) > 0) {
if (fu_device_list_should_remove_with_delay(item->device)) {
fu_device_list_remove_with_delay(item);
return;
}