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

broadband-modem-mbim: fix detection of SIM hot swap

Browse Source 
Previous patch for hotswap detection caused the modem to be reprobed
after unlocking or changing PIN for SIM card lock (commit 7b878765c6).
This change allows to differentiate between hotswap and PIN lock events.
This commit is contained in:
Michal Mazur
2023-11-30 13:36:48 +00:00
committed by Aleksander Morgado
parent 3ccf847284
commit dc4b1ec0f3
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem-mbim.c
+16 -13
View File
@@ -1633,14 +1633,13 @@ unlock_required_subscriber_ready_state_ready (MbimDevice *device,
mm_obj_dbg (self, "processed subscriber ready status response");
}
if (g_error_matches (error, MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_NOT_INITIALIZED)) {
g_clear_error (&error);
ready_state = MBIM_SUBSCRIBER_READY_STATE_NOT_INITIALIZED;
}
if (!error) {
/* Store last valid status loaded */
self->priv->enabled_cache.last_ready_state = ready_state;
/* Store last valid ready state until it is NOT_INITIALIZED which is temporary */
if (ready_state != MBIM_SUBSCRIBER_READY_STATE_NOT_INITIALIZED) {
self->priv->enabled_cache.last_ready_state = ready_state;
} else {
self->priv->enabled_cache.last_ready_state = prev_ready_state;
}
switch (ready_state) {
case MBIM_SUBSCRIBER_READY_STATE_NOT_INITIALIZED:
@@ -1664,6 +1663,11 @@ unlock_required_subscriber_ready_state_ready (MbimDevice *device,
}
}
if (g_error_matches (error, MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_NOT_INITIALIZED)) {
g_clear_error (&error);
ready_state = MBIM_SUBSCRIBER_READY_STATE_NOT_INITIALIZED;
}
/* Fatal errors are reported right away */
if (error) {
g_task_return_error (task, error);
@@ -5152,18 +5156,17 @@ basic_connect_notification_subscriber_ready_status (MMBroadbandModemMbim *self,
if ((self->priv->enabled_cache.last_ready_state != MBIM_SUBSCRIBER_READY_STATE_SIM_NOT_INSERTED &&
ready_state == MBIM_SUBSCRIBER_READY_STATE_SIM_NOT_INSERTED) ||
(self->priv->enabled_cache.last_ready_state == MBIM_SUBSCRIBER_READY_STATE_SIM_NOT_INSERTED &&
ready_state != MBIM_SUBSCRIBER_READY_STATE_SIM_NOT_INSERTED) ||
/*SIM state becomes "not initialized" when queried shortly after being inserted. Its state
* transitions are: "not inserted" --> "not initialized" --> "initialized". To detect SIM
* hotswap event from this sequence, we need the check condition below*/
(self->priv->enabled_cache.last_ready_state == MBIM_SUBSCRIBER_READY_STATE_NOT_INITIALIZED &&
ready_state != MBIM_SUBSCRIBER_READY_STATE_SIM_NOT_INSERTED)) {
/* SIM has been removed or reinserted, re-probe to ensure correct interfaces are exposed */
mm_obj_dbg (self, "SIM hot swap detected");
active_sim_event = TRUE;
}
self->priv->enabled_cache.last_ready_state = ready_state;
/* Ignore NOT_INITIALIZED state when setting the last_ready_state as it is
* reported regardless of whether SIM was inserted or unlocked */
if (ready_state != MBIM_SUBSCRIBER_READY_STATE_NOT_INITIALIZED) {
self->priv->enabled_cache.last_ready_state = ready_state;
}
if (active_sim_event) {
mm_iface_modem_process_sim_event (MM_IFACE_MODEM (self));