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

broadband-modem-mbim: add 5G support to supported modes loading

Browse Source
This commit is contained in:
Aleksander Morgado
2021-10-17 18:31:35 +02:00
parent 316c91da0a
commit 0fbcf8ddc1
2 changed files with 98 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
src/mm-broadband-modem-mbim.c
View File

@@ -890,24 +890,26 @@ modem_load_device_identifier (MMIfaceModem *self,
/* Supported modes loading (Modem interface) */ /* Supported modes loading (Modem interface) */
static GArray * static GArray *
modem_load_supported_modes_finish (MMIfaceModem *self, modem_load_supported_modes_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
#if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED
if (MM_BROADBAND_MODEM_MBIM (self)->priv->qmi_capability_and_mode_switching)
return mm_shared_qmi_load_supported_modes_finish (self, res, error);
#endif
return g_task_propagate_pointer (G_TASK (res), error); return g_task_propagate_pointer (G_TASK (res), error);
} }
static void static void
load_supported_modes_mbim (GTask *task) load_supported_modes_mbim (GTask *task,
MbimDevice *device)
{ {
MMBroadbandModemMbim *self; MMBroadbandModemMbim *self;
MMModemModeCombination mode; GArray *all;
MMModemMode all; GArray *combinations;
GArray *supported; GArray *filtered;
MMModemMode mask_all;
MMModemModeCombination mode = {
.allowed = MM_MODEM_MODE_NONE,
.preferred = MM_MODEM_MODE_NONE,
};
self = g_task_get_source_object (task); self = g_task_get_source_object (task);
@@ -920,60 +922,98 @@ load_supported_modes_mbim (GTask *task)
return; return;
} }
all = 0; /* Build all */
mask_all = mm_modem_mode_from_mbim_data_class (self->priv->caps_data_class);
/* 3GPP... */ mode.allowed = mask_all;
if (self->priv->caps_data_class & (MBIM_DATA_CLASS_GPRS |
MBIM_DATA_CLASS_EDGE))
all |= MM_MODEM_MODE_2G;
if (self->priv->caps_data_class & (MBIM_DATA_CLASS_UMTS |
MBIM_DATA_CLASS_HSDPA |
MBIM_DATA_CLASS_HSUPA))
all |= MM_MODEM_MODE_3G;
if (self->priv->caps_data_class & MBIM_DATA_CLASS_LTE)
all |= MM_MODEM_MODE_4G;
if (self->priv->caps_data_class & (MBIM_DATA_CLASS_5G_NSA |
MBIM_DATA_CLASS_5G_SA))
all |= MM_MODEM_MODE_5G;
/* 3GPP2... */
if (self->priv->caps_data_class & MBIM_DATA_CLASS_1XRTT)
all |= MM_MODEM_MODE_2G;
if (self->priv->caps_data_class & (MBIM_DATA_CLASS_1XEVDO |
MBIM_DATA_CLASS_1XEVDO_REVA |
MBIM_DATA_CLASS_1XEVDV |
MBIM_DATA_CLASS_3XRTT |
MBIM_DATA_CLASS_1XEVDO_REVB))
all |= MM_MODEM_MODE_3G;
if (self->priv->caps_data_class & MBIM_DATA_CLASS_UMB)
all |= MM_MODEM_MODE_4G;
/* Build a mask with all supported modes */
supported = g_array_sized_new (FALSE, FALSE, sizeof (MMModemModeCombination), 1);
mode.allowed = all;
mode.preferred = MM_MODEM_MODE_NONE; mode.preferred = MM_MODEM_MODE_NONE;
g_array_append_val (supported, mode); all = g_array_sized_new (FALSE, FALSE, sizeof (MMModemModeCombination), 1);
g_array_append_val (all, mode);
g_task_return_pointer (task, supported, (GDestroyNotify) g_array_unref); combinations = g_array_new (FALSE, FALSE, sizeof (MMModemModeCombination));
/* When using MBIMEx we can enable the mode switching operation because
* we'll be able to know if the modes requested are the ones configured
* as preferred after the operation. */
if (mbim_device_check_ms_mbimex_version (device, 2, 0)) {
#define ADD_MODE_PREFERENCE(MODE_MASK) do { \
mode.allowed = MODE_MASK; \
mode.preferred = MM_MODEM_MODE_NONE; \
g_array_append_val (combinations, mode); \
} while (0)
/* 2G, 3G */
ADD_MODE_PREFERENCE (MM_MODEM_MODE_2G);
ADD_MODE_PREFERENCE (MM_MODEM_MODE_3G);
ADD_MODE_PREFERENCE (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G);
/* +4G */
ADD_MODE_PREFERENCE (MM_MODEM_MODE_4G);
ADD_MODE_PREFERENCE (MM_MODEM_MODE_2G | MM_MODEM_MODE_4G);
ADD_MODE_PREFERENCE (MM_MODEM_MODE_3G | MM_MODEM_MODE_4G);
ADD_MODE_PREFERENCE (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G);
/* +5G */
ADD_MODE_PREFERENCE (MM_MODEM_MODE_5G);
ADD_MODE_PREFERENCE (MM_MODEM_MODE_2G | MM_MODEM_MODE_5G);
ADD_MODE_PREFERENCE (MM_MODEM_MODE_3G | MM_MODEM_MODE_5G);
ADD_MODE_PREFERENCE (MM_MODEM_MODE_4G | MM_MODEM_MODE_5G);
ADD_MODE_PREFERENCE (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_5G);
ADD_MODE_PREFERENCE (MM_MODEM_MODE_2G | MM_MODEM_MODE_4G | MM_MODEM_MODE_5G);
ADD_MODE_PREFERENCE (MM_MODEM_MODE_3G | MM_MODEM_MODE_4G | MM_MODEM_MODE_5G);
ADD_MODE_PREFERENCE (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G | MM_MODEM_MODE_5G);
filtered = mm_filter_supported_modes (all, combinations, self);
g_array_unref (combinations);
g_array_unref (all);
#undef ADD_MODE_PREFERENCE
} else
filtered = all;
g_task_return_pointer (task, filtered, (GDestroyNotify)g_array_unref);
g_object_unref (task); g_object_unref (task);
} }
#if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED
static void
shared_qmi_load_supported_modes_ready (MMIfaceModem *self,
GAsyncResult *res,
GTask *task)
{
GArray *combinations;
GError *error = NULL;
combinations = mm_shared_qmi_load_supported_modes_finish (self, res, &error);
if (!combinations)
g_task_return_error (task, error);
else
g_task_return_pointer (task, combinations, (GDestroyNotify)g_array_unref);
g_object_unref (task);
}
#endif
static void static void
modem_load_supported_modes (MMIfaceModem *self, modem_load_supported_modes (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GTask *task; GTask *task;
MbimDevice *device;
if (!peek_device (self, &device, callback, user_data))
return;
task = g_task_new (self, NULL, callback, user_data);
#if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED #if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED
if (MM_BROADBAND_MODEM_MBIM (self)->priv->qmi_capability_and_mode_switching) { if (MM_BROADBAND_MODEM_MBIM (self)->priv->qmi_capability_and_mode_switching) {
mm_shared_qmi_load_supported_modes (self, callback, user_data); mm_shared_qmi_load_supported_modes (self, (GAsyncReadyCallback)shared_qmi_load_supported_modes_ready, task);
return; return;
} }
#endif #endif
task = g_task_new (self, NULL, callback, user_data); load_supported_modes_mbim (task, device);
load_supported_modes_mbim (task);
} }
/*****************************************************************************/ /*****************************************************************************/

20
src/mm-modem-helpers-mbim.c
View File

@@ -143,16 +143,16 @@ mm_modem_mode_from_mbim_data_class (MbimDataClass data_class)
mask |= MM_MODEM_MODE_5G; mask |= MM_MODEM_MODE_5G;
/* 3GPP2... */ /* 3GPP2... */
if (self->priv->caps_data_class & MBIM_DATA_CLASS_1XRTT) if (data_class & MBIM_DATA_CLASS_1XRTT)
all |= MM_MODEM_MODE_2G; mask |= MM_MODEM_MODE_2G;
if (self->priv->caps_data_class & (MBIM_DATA_CLASS_1XEVDO | if (data_class & (MBIM_DATA_CLASS_1XEVDO |
MBIM_DATA_CLASS_1XEVDO_REVA | MBIM_DATA_CLASS_1XEVDO_REVA |
MBIM_DATA_CLASS_1XEVDV | MBIM_DATA_CLASS_1XEVDV |
MBIM_DATA_CLASS_3XRTT | MBIM_DATA_CLASS_3XRTT |
MBIM_DATA_CLASS_1XEVDO_REVB)) MBIM_DATA_CLASS_1XEVDO_REVB))
all |= MM_MODEM_MODE_3G; mask |= MM_MODEM_MODE_3G;
if (self->priv->caps_data_class & MBIM_DATA_CLASS_UMB) if (data_class & MBIM_DATA_CLASS_UMB)
all |= MM_MODEM_MODE_4G; mask |= MM_MODEM_MODE_4G;
return mask; return mask;
} }