Re: [PATCHv2 2/2] mbm: retry modem init

If the first initialization command results are catastrophic. Retry it 10 times and refuse to enable modem if it still fails. --- plugins/mbm.c | 75 ++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 58 insertions(+), 17 deletions(-) diff --git a/plugins/mbm.c b/plugins/mbm.c index 8541aaf..753a4f1 100644 --- a/plugins/mbm.c +++ b/plugins/mbm.c @@ -55,8 +55,8 @@ static const char *none_prefix[] = { NULL }; struct mbm_data { GAtChat *modem_port; GAtChat *data_port; - guint cpin_poll_source; - guint cpin_poll_count; + guint poll_source; + guint poll_count; gboolean have_sim; }; @@ -86,8 +86,8 @@ static void mbm_remove(struct ofono_modem *modem) g_at_chat_unref(data->data_port); g_at_chat_unref(data->modem_port); - if (data->cpin_poll_source > 0) - g_source_remove(data->cpin_poll_source); + if (data->poll_source > 0) + g_source_remove(data->poll_source); g_free(data); } @@ -109,13 +109,13 @@ static void simpin_check(gboolean ok, GAtResult *result, gpointer user_data) DBG(""); /* Modem returns an error if SIM is not ready. */ - if (!ok && data->cpin_poll_count++ < 5) { - data->cpin_poll_source = + if (!ok && data->poll_count++ < 5) { + data->poll_source = g_timeout_add_seconds(1, init_simpin_check, modem); return; } - data->cpin_poll_count = 0; + data->poll_count = 0; /* There is probably no SIM if SIM is not ready after 5 seconds. */ data->have_sim = ok; @@ -128,7 +128,7 @@ static gboolean init_simpin_check(gpointer user_data) struct ofono_modem *modem = user_data; struct mbm_data *data = ofono_modem_get_data(modem); - data->cpin_poll_source = 0; + data->poll_source = 0; g_at_chat_send(data->modem_port, "AT+CPIN?", cpin_prefix, simpin_check, modem, NULL); @@ -220,6 +220,55 @@ static void emrdy_query(gboolean ok, GAtResult *result, gpointer user_data) cfun_query, modem, NULL); }; +static gboolean init_check(gpointer user_data); + +static void init_result(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + struct mbm_data *data = ofono_modem_get_data(modem); + + DBG(""); + + if (!ok && data->poll_count++ < 10) { + data->poll_source = g_timeout_add_seconds(1, init_check, modem); + return; + } + + data->poll_count = 0; + + if (!ok) { + g_at_chat_unref(data->modem_port); + data->modem_port = NULL; + + g_at_chat_unref(data->data_port); + data->data_port = NULL; + + ofono_modem_set_powered(modem, FALSE); + return; + } + + g_at_chat_register(data->modem_port, "*EMRDY:", emrdy_notifier, + FALSE, modem, NULL); + + g_at_chat_send(data->modem_port, "AT*E2CFUN=1", none_prefix, + NULL, NULL, NULL); + g_at_chat_send(data->modem_port, "AT*EMRDY?", none_prefix, + emrdy_query, modem, NULL); +} + +static gboolean init_check(gpointer user_data) +{ + struct ofono_modem *modem = user_data; + struct mbm_data *data = ofono_modem_get_data(modem); + + data->poll_source = 0; + + g_at_chat_send(data->modem_port, "AT&F E0 V1 X4 &C1 +CMEE=1", NULL, + init_result, modem, NULL); + + return FALSE; +} + static GAtChat *create_port(const char *device) { GAtSyntax *syntax; @@ -277,15 +326,7 @@ static int mbm_enable(struct ofono_modem *modem) if (getenv("OFONO_AT_DEBUG")) g_at_chat_set_debug(data->data_port, mbm_debug, "Data:"); - g_at_chat_register(data->modem_port, "*EMRDY:", emrdy_notifier, - FALSE, modem, NULL); - - g_at_chat_send(data->modem_port, "AT&F E0 V1 X4 &C1 +CMEE=1", NULL, - NULL, NULL, NULL); - g_at_chat_send(data->modem_port, "AT*E2CFUN=1", none_prefix, - NULL, NULL, NULL); - g_at_chat_send(data->modem_port, "AT*EMRDY?", none_prefix, - emrdy_query, modem, NULL); + init_check(modem);