colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plugin: build probing needs based on subsystem

Browse Source 
Don't rely on the QMI or MBIM ports named cdc-wdm, use the device
subsystem instead.
This commit is contained in:
Aleksander Morgado
2020-10-25 07:20:30 +01:00
parent 71f5c97543
commit da77dc7152
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mm-plugin.c
View File

@@ -765,26 +765,16 @@ mm_plugin_supports_port (MMPlugin *self,
return; return;
} }
/* Before launching any probing, check if the port is a net device. */
if (g_str_equal (mm_kernel_device_get_subsystem (port), "net")) {
mm_obj_dbg (self, "probing of port %s deferred until result suggested", mm_kernel_device_get_name (port));
g_task_return_int (task, MM_PLUGIN_SUPPORTS_PORT_DEFER_UNTIL_SUGGESTED);
g_object_unref (task);
return;
}
/* Build flags depending on what probing needed */ /* Build flags depending on what probing needed */
probe_run_flags = MM_PORT_PROBE_NONE; probe_run_flags = MM_PORT_PROBE_NONE;
if (!g_str_has_prefix (mm_kernel_device_get_name (port), "cdc-wdm")) { if (g_str_equal (mm_kernel_device_get_subsystem (port), "tty")) {
/* Serial ports... */
if (self->priv->at) if (self->priv->at)
probe_run_flags |= MM_PORT_PROBE_AT; probe_run_flags |= MM_PORT_PROBE_AT;
else if (self->priv->single_at) else if (self->priv->single_at)
probe_run_flags |= MM_PORT_PROBE_AT; probe_run_flags |= MM_PORT_PROBE_AT;
if (self->priv->qcdm) if (self->priv->qcdm)
probe_run_flags |= MM_PORT_PROBE_QCDM; probe_run_flags |= MM_PORT_PROBE_QCDM;
} else { } else if (g_str_equal (mm_kernel_device_get_subsystem (port), "usbmisc")) {
/* cdc-wdm ports... */
if (self->priv->qmi && !g_strcmp0 (mm_kernel_device_get_driver (port), "qmi_wwan")) if (self->priv->qmi && !g_strcmp0 (mm_kernel_device_get_driver (port), "qmi_wwan"))
probe_run_flags |= MM_PORT_PROBE_QMI; probe_run_flags |= MM_PORT_PROBE_QMI;
else if (self->priv->mbim && !g_strcmp0 (mm_kernel_device_get_driver (port), "cdc_mbim")) else if (self->priv->mbim && !g_strcmp0 (mm_kernel_device_get_driver (port), "cdc_mbim"))
@@ -805,9 +795,11 @@ mm_plugin_supports_port (MMPlugin *self,
probe_run_flags |= MM_PORT_PROBE_AT_XMM; probe_run_flags |= MM_PORT_PROBE_AT_XMM;
} }
/* If no explicit probing was required, just request to grab it without probing anything. /* If no explicit probing was required, just request to grab it without
* This may happen, e.g. with cdc-wdm ports which do not need QMI/MBIM probing. */ * probing anything. This happens for all net ports and e.g. for cdc-wdm
* ports which do not need QMI/MBIM probing. */
if (probe_run_flags == MM_PORT_PROBE_NONE) { if (probe_run_flags == MM_PORT_PROBE_NONE) {
mm_obj_dbg (self, "probing of port %s deferred until result suggested", mm_kernel_device_get_name (port));
g_task_return_int (task, MM_PLUGIN_SUPPORTS_PORT_DEFER_UNTIL_SUGGESTED); g_task_return_int (task, MM_PLUGIN_SUPPORTS_PORT_DEFER_UNTIL_SUGGESTED);
g_object_unref (task); g_object_unref (task);
return; return;