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

trivial: dell-dock: make passive dependency include Hub2 1.42

Browse Source 
An extra race condition bug exists due to the MCU firmware on Hub2.
Require to already be on 1.42 or later to use passive flow.
This commit is contained in:
Mario Limonciello 2019-02-18 08:03:49 -06:00
parent 49448a99d4
commit e59bee1f45
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/dell-dock/fu-dell-dock-i2c-ec.c
View File

@ -312,6 +312,7 @@ fu_dell_dock_ec_get_dock_info (FuDevice *device,
const FuDellDockDockInfoHeader *header = NULL; const FuDellDockDockInfoHeader *header = NULL;
const FuDellDockEcQueryEntry *device_entry = NULL; const FuDellDockEcQueryEntry *device_entry = NULL;
const FuDellDockEcAddrMap *map = NULL; const FuDellDockEcAddrMap *map = NULL;
const gchar *hub_version;
guint32 oldest_base_pd = 0; guint32 oldest_base_pd = 0;
g_autoptr(GBytes) data = NULL; g_autoptr(GBytes) data = NULL;
@ -447,13 +448,18 @@ fu_dell_dock_ec_get_dock_info (FuDevice *device,
fu_device_set_version_lowest (device, self->ec_minimum_version); fu_device_set_version_lowest (device, self->ec_minimum_version);
/* TODO: Drop if minimum EC is set to 25+ /* TODO: Drop part of clause if minimum EC is set to 26+
* Determine if the passive flow should be used when flashing * Determine if the passive flow should be used when flashing
*/ */
if (fu_common_vercmp (self->ec_version, "00.00.00.25") >= 0) { hub_version = fu_device_get_version (self->symbiote);
if (fu_common_vercmp (self->ec_version, "00.00.00.26") >= 0 &&
fu_common_vercmp (hub_version, "1.42") >= 0) {
g_debug ("using passive flow"); g_debug ("using passive flow");
self->passive_flow = PASSIVE_REBOOT_MASK; self->passive_flow = PASSIVE_REBOOT_MASK;
fu_device_set_custom_flags (device, "skip-restart"); fu_device_set_custom_flags (device, "skip-restart");
} else {
g_debug ("not using passive flow (EC: %s Hub2: %s)",
self->ec_version, hub_version);
} }
/* TODO: drop if minimum board is to 5+ and minimum EC to 24+ */ /* TODO: drop if minimum board is to 5+ and minimum EC to 24+ */
if (self->data->board_id == 4 && oldest_base_pd >= 0x18) { if (self->data->board_id == 4 && oldest_base_pd >= 0x18) {
@ -580,6 +586,8 @@ fu_dell_dock_ec_to_string (FuDevice *device, GString *str)
self->ec_minimum_version); self->ec_minimum_version);
g_string_append_printf (str, "\tblacklist pd: %d\n", g_string_append_printf (str, "\tblacklist pd: %d\n",
self->pd_blacklist); self->pd_blacklist);
g_string_append_printf (str, "\tpassive flow: %d\n",
self->passive_flow);
} }
gboolean gboolean