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

synapticsmst: Fix crasher with MST flashing (#385)

Browse Source 
b6f79556 caused the device ID strings to change, which synaptics
MST plugin was relying upon.

Update to use metadata instead to communicate this information.
This commit is contained in:
Mario Limonciello 2018-02-06 18:35:33 -05:00 committed by Richard Hughes
parent 65a61c7b6f
commit 0ce0558ad7
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/synapticsmst/fu-plugin-synapticsmst.c
View File

@ -79,6 +79,8 @@ fu_plugin_synaptics_add_device (FuPlugin *plugin,
const gchar *guid_str = NULL; const gchar *guid_str = NULL;
g_autofree gchar *name = NULL; g_autofree gchar *name = NULL;
g_autofree gchar *dev_id_str = NULL; g_autofree gchar *dev_id_str = NULL;
g_autofree gchar *layer_str = NULL;
g_autofree gchar *rad_str = NULL;
const gchar *aux_node; const gchar *aux_node;
guint8 layer; guint8 layer;
guint16 rad; guint16 rad;
@ -111,6 +113,8 @@ fu_plugin_synaptics_add_device (FuPlugin *plugin,
kind_str = synapticsmst_device_kind_to_string (synapticsmst_device_get_kind (device)); kind_str = synapticsmst_device_kind_to_string (synapticsmst_device_get_kind (device));
dev_id_str = g_strdup_printf ("MST-%s-%s-%u-%u", dev_id_str = g_strdup_printf ("MST-%s-%s-%u-%u",
kind_str, aux_node, layer, rad); kind_str, aux_node, layer, rad);
layer_str = g_strdup_printf ("%u", layer);
rad_str = g_strdup_printf ("%u", rad);
if (board_str == NULL) { if (board_str == NULL) {
g_debug ("invalid board ID (%x)", synapticsmst_device_get_board_id (device)); g_debug ("invalid board ID (%x)", synapticsmst_device_get_board_id (device));
@ -124,6 +128,10 @@ fu_plugin_synaptics_add_device (FuPlugin *plugin,
/* create the device */ /* create the device */
dev = fu_device_new (); dev = fu_device_new ();
fu_device_set_id (dev, dev_id_str); fu_device_set_id (dev, dev_id_str);
fu_device_set_metadata (dev, "SynapticsMSTKind", kind_str);
fu_device_set_metadata (dev, "SynapticsMSTAuxNode", aux_node);
fu_device_set_metadata (dev, "SynapticsMSTLayer", layer_str);
fu_device_set_metadata (dev, "SynapticsMSTRad", rad_str);
fu_device_add_flag (dev, FWUPD_DEVICE_FLAG_UPDATABLE); fu_device_add_flag (dev, FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_set_name (dev, name); fu_device_set_name (dev, name);
fu_device_set_vendor (dev, "Synaptics"); fu_device_set_vendor (dev, "Synaptics");
@ -298,20 +306,16 @@ fu_plugin_update (FuPlugin *plugin,
{ {
FuPluginData *data = fu_plugin_get_data (plugin); FuPluginData *data = fu_plugin_get_data (plugin);
g_autoptr(SynapticsMSTDevice) device = NULL; g_autoptr(SynapticsMSTDevice) device = NULL;
const gchar *device_id;
SynapticsMSTDeviceKind kind; SynapticsMSTDeviceKind kind;
const gchar *aux_node; const gchar *aux_node;
guint8 layer; guint8 layer;
guint8 rad; guint8 rad;
g_auto (GStrv) split = NULL;
/* extract details to build a new device */ /* extract details to build a new device */
device_id = fu_device_get_id (dev); kind = synapticsmst_device_kind_from_string (fu_device_get_metadata (dev, "SynapticsMSTKind"));
split = g_strsplit (device_id, "-", -1); aux_node = fu_device_get_metadata (dev, "SynapticsMSTAuxNode");
kind = synapticsmst_device_kind_from_string(split[1]); layer = g_ascii_strtoull (fu_device_get_metadata (dev, "SynapticsMSTLayer"), NULL, 0);
aux_node = split[2]; rad = g_ascii_strtoull (fu_device_get_metadata (dev, "SynapticsMSTRad"), NULL, 0);
layer = g_ascii_strtoull (split[3], NULL, 0);
rad = g_ascii_strtoull (split[4], NULL, 0);
/* sleep to allow device wakeup to complete */ /* sleep to allow device wakeup to complete */