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

bearer: mbim: Check for multiplex support

Browse Source 
If multiplexing is not supported by the network driver, do not enable
it by default and fail in case it is required.

This is the case for mhi_net driver, that do no implement multi MBIM
session (only session 0 is supported).

Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
This commit is contained in:
Loic Poulain
2021-04-20 12:04:24 +02:00
parent fefbf4d302
commit 05b0059517
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mm-bearer-mbim.c
View File

@@ -1156,6 +1156,8 @@ _connect (MMBaseBearer *self,
GTask *task; GTask *task;
MMBearerMultiplexSupport multiplex; MMBearerMultiplexSupport multiplex;
g_autoptr(MMBaseModem) modem = NULL; g_autoptr(MMBaseModem) modem = NULL;
const gchar *data_port_driver;
gboolean multiplex_supported = TRUE;
if (!peek_ports (self, &mbim, &data, callback, user_data)) if (!peek_ports (self, &mbim, &data, callback, user_data))
return; return;
@@ -1192,16 +1194,26 @@ _connect (MMBaseBearer *self,
MM_BASE_BEARER_CONFIG, &ctx->properties, MM_BASE_BEARER_CONFIG, &ctx->properties,
NULL); NULL);
data_port_driver = mm_kernel_device_get_driver (mm_port_peek_kernel_device (data));
if (!g_strcmp0 (data_port_driver, "mhi_net"))
multiplex_supported = FALSE;
multiplex = mm_bearer_properties_get_multiplex (ctx->properties); multiplex = mm_bearer_properties_get_multiplex (ctx->properties);
/* If no multiplex setting given by the user, assume requested */ /* If no multiplex setting given by the user, assume requested */
if (multiplex == MM_BEARER_MULTIPLEX_SUPPORT_UNKNOWN || if (multiplex_supported &&
multiplex == MM_BEARER_MULTIPLEX_SUPPORT_REQUESTED || (multiplex == MM_BEARER_MULTIPLEX_SUPPORT_UNKNOWN ||
multiplex == MM_BEARER_MULTIPLEX_SUPPORT_REQUIRED) { multiplex == MM_BEARER_MULTIPLEX_SUPPORT_REQUESTED ||
multiplex == MM_BEARER_MULTIPLEX_SUPPORT_REQUIRED)) {
/* the link prefix hint given must be modem-specific */ /* the link prefix hint given must be modem-specific */
ctx->link_prefix_hint = g_strdup_printf ("mbimmux%u.", mm_base_modem_get_dbus_id (MM_BASE_MODEM (modem))); ctx->link_prefix_hint = g_strdup_printf ("mbimmux%u.", mm_base_modem_get_dbus_id (MM_BASE_MODEM (modem)));
} }
if (!multiplex_supported && multiplex == MM_BEARER_MULTIPLEX_SUPPORT_REQUIRED) {
mm_obj_err (self, "Multiplexing required but not supported by %s", data_port_driver);
return;
}
mm_obj_dbg (self, "launching %sconnection with data port (%s/%s)", mm_obj_dbg (self, "launching %sconnection with data port (%s/%s)",
ctx->link_prefix_hint ? "multiplexed " : "", ctx->link_prefix_hint ? "multiplexed " : "",
mm_port_subsys_get_string (mm_port_get_subsys (data)), mm_port_subsys_get_string (mm_port_get_subsys (data)),