proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-05-28 16:57:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

modem-manager: make sure the correct interface number is used for QMI

Browse Source 
The upgrade process requires that the USB interface layout is not
changed between upgrades, something that we require for AT and we also
require now for QMI. We store the USB interface number of the QMI port
as soon as the device is probed, and we use it to match the interface
number once the Udev based device is created.

squash! modem-manager: make sure the correct interface number is used for QMI
This commit is contained in:
Aleksander Morgado 2020-11-24 09:55:24 +01:00 committed by Richard Hughes
parent da2d6f9c5a
commit fab3ee97c7
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/modem-manager/fu-mm-device.c
View File

@ -43,6 +43,7 @@ struct _FuMmDevice {
MMModemFirmwareUpdateMethod update_methods;
gchar *detach_fastboot_at;
gint port_at_ifnum;
gint port_qmi_ifnum;
/* fastboot detach handling */
gchar *port_at;
@ -102,6 +103,13 @@ fu_mm_device_get_port_at_ifnum (FuMmDevice *device)
return device->port_at_ifnum;
}
gint
fu_mm_device_get_port_qmi_ifnum (FuMmDevice *device)
{
g_return_val_if_fail (FU_IS_MM_DEVICE (device), -1);
return device->port_qmi_ifnum;
}
static gboolean
fu_mm_device_probe_default (FuDevice *device, GError **error)
{
@ -216,13 +224,20 @@ fu_mm_device_probe_default (FuDevice *device, GError **error)
return FALSE;
}
/* if we have the at port reported, get sysfs path and interface number */
if (self->port_at != NULL) {
fu_mm_utils_get_port_info (self->port_at, &device_sysfs_path, &self->port_at_ifnum, NULL);
} else if (self->port_qmi != NULL) {
fu_mm_utils_get_port_info (self->port_qmi, &device_sysfs_path, NULL, NULL);
} else {
g_warn_if_reached ();
}
if (self->port_qmi != NULL) {
g_autofree gchar *qmi_device_sysfs_path = NULL;
fu_mm_utils_get_port_info (self->port_qmi, &qmi_device_sysfs_path, &self->port_qmi_ifnum, NULL);
if (device_sysfs_path == NULL && qmi_device_sysfs_path != NULL) {
device_sysfs_path = g_steal_pointer (&qmi_device_sysfs_path);
} else if (g_strcmp0 (device_sysfs_path, qmi_device_sysfs_path) != 0) {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"mismatched device sysfs path: %s != %s",
device_sysfs_path, qmi_device_sysfs_path);
return FALSE;
}
}
/* if no device sysfs file, error out */
@ -775,6 +790,7 @@ fu_mm_device_new (MMManager *manager, MMObject *omodem)
self->manager = g_object_ref (manager);
self->omodem = g_object_ref (omodem);
self->port_at_ifnum = -1;
self->port_qmi_ifnum = -1;
return self;
}
@ -792,6 +808,7 @@ fu_plugin_mm_inhibited_device_info_new (FuMmDevice *device)
info->update_methods = fu_mm_device_get_update_methods (device);
info->detach_fastboot_at = g_strdup (fu_mm_device_get_detach_fastboot_at (device));
info->port_at_ifnum = fu_mm_device_get_port_at_ifnum (device);
info->port_qmi_ifnum = fu_mm_device_get_port_qmi_ifnum (device);
info->inhibited_uid = g_strdup (fu_mm_device_get_inhibition_uid (device));
return info;
@ -825,6 +842,7 @@ fu_mm_device_udev_new (MMManager *manager,
self->update_methods = info->update_methods;
self->detach_fastboot_at = g_strdup (info->detach_fastboot_at);
self->port_at_ifnum = info->port_at_ifnum;
self->port_qmi_ifnum = info->port_qmi_ifnum;
for (guint i = 0; i < info->guids->len; i++)
fu_device_add_guid (FU_DEVICE (self), g_ptr_array_index (info->guids, i));
@ -840,17 +858,19 @@ fu_mm_device_udev_add_port (FuMmDevice *self,
{
g_return_if_fail (FU_IS_MM_DEVICE (self));
/* cdc-wdm ports always added unless one already set */
if (g_str_equal (subsystem, "usbmisc") &&
(self->port_qmi == NULL)) {
self->port_qmi == NULL &&
ifnum >= 0 &&
ifnum == self->port_qmi_ifnum) {
g_debug ("added QMI port %s (%s)", path, subsystem);
self->port_qmi = g_strdup (path);
return;
}
if (g_str_equal (subsystem, "tty") &&
(self->port_at == NULL) &&
(ifnum >= 0) && (ifnum == self->port_at_ifnum)) {
self->port_at == NULL &&
ifnum >= 0 &&
ifnum == self->port_at_ifnum) {
g_debug ("added AT port %s (%s)", path, subsystem);
self->port_at = g_strdup (path);
return;

2
plugins/modem-manager/fu-mm-device.h
View File

@ -20,6 +20,7 @@ FuMmDevice *fu_mm_device_new (MMManager *manager,
const gchar *fu_mm_device_get_inhibition_uid (FuMmDevice *device);
const gchar *fu_mm_device_get_detach_fastboot_at (FuMmDevice *device);
gint fu_mm_device_get_port_at_ifnum (FuMmDevice *device);
gint fu_mm_device_get_port_qmi_ifnum (FuMmDevice *device);
MMModemFirmwareUpdateMethod fu_mm_device_get_update_methods (FuMmDevice *device);
/* support for udev-based devices */
@ -35,6 +36,7 @@ struct FuPluginMmInhibitedDeviceInfo {
MMModemFirmwareUpdateMethod update_methods;
gchar *detach_fastboot_at;
gint port_at_ifnum;
gint port_qmi_ifnum;
};
FuPluginMmInhibitedDeviceInfo *fu_plugin_mm_inhibited_device_info_new (FuMmDevice *device);
void fu_plugin_mm_inhibited_device_info_free (FuPluginMmInhibitedDeviceInfo *info);