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

broadband-modem-mbim: implement 5GNR registration settings loading

Browse Source
This commit is contained in:
Aleksander Morgado
2021-11-29 00:04:39 +01:00
parent 61675e1555
commit 296cce0bbb
3 changed files with 127 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details:
*
* Copyright (C) 2013 Aleksander Morgado <aleksander@gnu.org>
* Copyright (C) 2013-2021 Aleksander Morgado <aleksander@aleksander.es>
*/
#include <config.h>
@@ -118,6 +118,7 @@ struct _MMBroadbandModemMbimPrivate {
gboolean is_profile_management_supported;
gboolean is_pco_supported;
gboolean is_lte_attach_info_supported;
gboolean is_nr5g_registration_settings_supported;
gboolean is_ussd_supported;
gboolean is_atds_location_supported;
gboolean is_atds_signal_supported;
@@ -2628,6 +2629,9 @@ query_device_services_ready (MbimDevice *device,
} else if (device_services[i]->cids[j] == MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_SLOT_INFO_STATUS) {
mm_obj_dbg (self, "Slot info status is supported");
self->priv->is_slot_info_status_supported = TRUE;
} else if (device_services[i]->cids[j] == MBIM_CID_MS_BASIC_CONNECT_EXTENSIONS_REGISTRATION_PARAMETERS) {
mm_obj_dbg (self, "5GNR registration settings are supported");
self->priv->is_nr5g_registration_settings_supported = TRUE;
}
}
continue;
@@ -3626,6 +3630,84 @@ modem_3gpp_set_initial_eps_bearer_settings (MMIfaceModem3gpp *_self,
mbim_message_unref (message);
}
/*****************************************************************************/
/* 5GNR registration settings loading */
static MMNr5gRegistrationSettings *
modem_3gpp_load_nr5g_registration_settings_finish (MMIfaceModem3gpp *self,
GAsyncResult *res,
GError **error)
{
return g_task_propagate_pointer (G_TASK (res), error);
}
static void
registration_parameters_query_ready (MbimDevice *device,
GAsyncResult *res,
GTask *task)
{
GError *error = NULL;
MMNr5gRegistrationSettings *settings;
MbimMicoMode mico_mode = MBIM_MICO_MODE_DEFAULT;
MbimDrxCycle drx_cycle = MBIM_DRX_CYCLE_NOT_SPECIFIED;
g_autoptr(MbimMessage) response = NULL;
response = mbim_device_command_finish (device, res, &error);
if (!response ||
!mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) ||
!mbim_message_ms_basic_connect_extensions_v3_registration_parameters_response_parse (
response,
&mico_mode,
&drx_cycle,
NULL, /* ladn info */
NULL, /* default pdu activation hint */
NULL, /* reregister if needed */
NULL, /* unnamed ies */
&error)) {
g_task_return_error (task, error);
g_object_unref (task);
return;
}
settings = mm_nr5g_registration_settings_new ();
mm_nr5g_registration_settings_set_mico_mode (settings, mm_modem_3gpp_mico_mode_from_mbim_mico_mode (mico_mode));
mm_nr5g_registration_settings_set_drx_cycle (settings, mm_modem_3gpp_drx_cycle_from_mbim_drx_cycle (drx_cycle));
g_task_return_pointer (task, settings, (GDestroyNotify) g_object_unref);
g_object_unref (task);
}
static void
modem_3gpp_load_nr5g_registration_settings (MMIfaceModem3gpp *_self,
GAsyncReadyCallback callback,
gpointer user_data)
{
MMBroadbandModemMbim *self = MM_BROADBAND_MODEM_MBIM (_self);
GTask *task;
MbimDevice *device;
g_autoptr(MbimMessage) message = NULL;
if (!peek_device (self, &device, callback, user_data))
return;
task = g_task_new (self, NULL, callback, user_data);
if (!self->priv->is_nr5g_registration_settings_supported) {
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED,
"5GNR registration settings are unsupported");
g_object_unref (task);
return;
}
message = mbim_message_ms_basic_connect_extensions_v3_registration_parameters_query_new (NULL);
mbim_device_command (device,
message,
10,
NULL,
(GAsyncReadyCallback)registration_parameters_query_ready,
task);
}
/*****************************************************************************/
/* Common unsolicited events setup and cleanup */
@@ -8247,6 +8329,8 @@ iface_modem_3gpp_init (MMIfaceModem3gpp *iface)
iface->load_initial_eps_bearer_finish = modem_3gpp_load_initial_eps_bearer_finish;
iface->load_initial_eps_bearer_settings = modem_3gpp_load_initial_eps_bearer_settings;
iface->load_initial_eps_bearer_settings_finish = modem_3gpp_load_initial_eps_bearer_settings_finish;
iface->load_nr5g_registration_settings = modem_3gpp_load_nr5g_registration_settings;
iface->load_nr5g_registration_settings_finish = modem_3gpp_load_nr5g_registration_settings_finish;
iface->set_initial_eps_bearer_settings = modem_3gpp_set_initial_eps_bearer_settings;
iface->set_initial_eps_bearer_settings_finish = modem_3gpp_set_initial_eps_bearer_settings_finish;
iface->run_registration_checks = modem_3gpp_run_registration_checks;

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

@@ -690,6 +690,45 @@ mm_signal_snr_from_coded_value (guint coded_value,
/*****************************************************************************/
MMModem3gppMicoMode
mm_modem_3gpp_mico_mode_from_mbim_mico_mode (MbimMicoMode mico_mode)
{
switch (mico_mode) {
case MBIM_MICO_MODE_DISABLED:
return MM_MODEM_3GPP_MICO_MODE_DISABLED;
case MBIM_MICO_MODE_ENABLED:
return MM_MODEM_3GPP_MICO_MODE_ENABLED;
case MBIM_MICO_MODE_UNSUPPORTED:
return MM_MODEM_3GPP_MICO_MODE_UNSUPPORTED;
case MBIM_MICO_MODE_DEFAULT:
/* default expected only in set requests */
default:
return MM_MODEM_3GPP_MICO_MODE_UNKNOWN;
}
}
MMModem3gppDrxCycle
mm_modem_3gpp_drx_cycle_from_mbim_drx_cycle (MbimDrxCycle drx_cycle)
{
switch (drx_cycle) {
case MBIM_DRX_CYCLE_NOT_SUPPORTED:
return MM_MODEM_3GPP_DRX_CYCLE_UNSUPPORTED;
case MBIM_DRX_CYCLE_32:
return MM_MODEM_3GPP_DRX_CYCLE_32;
case MBIM_DRX_CYCLE_64:
return MM_MODEM_3GPP_DRX_CYCLE_64;
case MBIM_DRX_CYCLE_128:
return MM_MODEM_3GPP_DRX_CYCLE_128;
case MBIM_DRX_CYCLE_256:
return MM_MODEM_3GPP_DRX_CYCLE_256;
case MBIM_DRX_CYCLE_NOT_SPECIFIED:
default:
return MM_MODEM_3GPP_DRX_CYCLE_UNKNOWN;
}
}
/*****************************************************************************/
MMSmsState
mm_sms_state_from_mbim_message_status (MbimSmsStatus status)
{

3
src/mm-modem-helpers-mbim.h
View File

@@ -84,6 +84,9 @@ gboolean mm_signal_snr_from_coded_value (guint coded_value,
gdouble *out_snr,
GError **error);
MMModem3gppMicoMode mm_modem_3gpp_mico_mode_from_mbim_mico_mode (MbimMicoMode mico_mode);
MMModem3gppDrxCycle mm_modem_3gpp_drx_cycle_from_mbim_drx_cycle (MbimDrxCycle drx_cycle);
/*****************************************************************************/
/* MBIM/SMS to MM translations */