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

port-qmi: fix rmnet setup when QMAP is configured in the modem at MM startup

Browse Source 
It could happen that when MM starts the aggregation protocol is already
configured on the modem side (e.g. if MM is stopped and restarted): this
prevents the links to be properly configured, resulting in using the qmimux
multiplex implementation even if rmnet is available.

Fix the issue by always performing the first time the links reset procedure,
even if the data format on the modem side is the expected one.
This commit is contained in:
Daniele Palmas
2023-07-14 09:47:15 +02:00
parent 16f9ff68fb
commit 3082d5d37b
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mm-port-qmi.c
View File

@@ -81,6 +81,8 @@ struct _MMPortQmiPrivate {
MMPort *preallocated_links_main; MMPort *preallocated_links_main;
GArray *preallocated_links; GArray *preallocated_links;
GList *preallocated_links_setup_pending; GList *preallocated_links_setup_pending;
/* first multiplex setup */
gboolean first_multiplex_setup;
}; };
/*****************************************************************************/ /*****************************************************************************/
@@ -2052,8 +2054,10 @@ internal_setup_data_format_ready (MMPortQmi *self,
NULL, /* not expected to update */ NULL, /* not expected to update */
&error)) &error))
g_task_return_error (task, error); g_task_return_error (task, error);
else else {
self->priv->first_multiplex_setup = FALSE;
g_task_return_boolean (task, TRUE); g_task_return_boolean (task, TRUE);
}
g_object_unref (task); g_object_unref (task);
} }
@@ -2146,9 +2150,12 @@ mm_port_qmi_setup_data_format (MMPortQmi *self,
(self->priv->kernel_data_modes & (MM_PORT_QMI_KERNEL_DATA_MODE_MUX_RMNET | MM_PORT_QMI_KERNEL_DATA_MODE_MUX_QMIWWAN)) && (self->priv->kernel_data_modes & (MM_PORT_QMI_KERNEL_DATA_MODE_MUX_RMNET | MM_PORT_QMI_KERNEL_DATA_MODE_MUX_QMIWWAN)) &&
MM_PORT_QMI_DAP_IS_SUPPORTED_QMAP (self->priv->dap)) { MM_PORT_QMI_DAP_IS_SUPPORTED_QMAP (self->priv->dap)) {
mm_obj_dbg (self, "multiplex support already available when setting up data format"); mm_obj_dbg (self, "multiplex support already available when setting up data format");
g_task_return_boolean (task, TRUE); /* If this is the first time that multiplex is used, perform anyway the internal reset operation, so that the links are properly managed */
g_object_unref (task); if (!self->priv->first_multiplex_setup) {
return; g_task_return_boolean (task, TRUE);
g_object_unref (task);
return;
}
} }
if ((action == MM_PORT_QMI_SETUP_DATA_FORMAT_ACTION_SET_DEFAULT) && if ((action == MM_PORT_QMI_SETUP_DATA_FORMAT_ACTION_SET_DEFAULT) &&
@@ -2409,6 +2416,7 @@ port_open_step (GTask *task)
switch (ctx->step) { switch (ctx->step) {
case PORT_OPEN_STEP_FIRST: case PORT_OPEN_STEP_FIRST:
mm_obj_dbg (self, "Opening QMI device..."); mm_obj_dbg (self, "Opening QMI device...");
self->priv->first_multiplex_setup = TRUE;
ctx->step++; ctx->step++;
/* Fall through */ /* Fall through */