7:42 p.m.
Hi,
Here is a first version of patches to support LTE with E3372 USB keys.
Huawei has two AT command sets to deal with band and mode (technologies).
Standard AT commands set (AT^SYSCFG, AT^SYSINFO, ^MODE, ...) handle 2G and 3G technologies
only.
Extended AT commands set (AT^SYSCFGEX, AT^SYSINFOEX, ^HSCQ, ...) handle 2G, 3G and 4G
technologies.
Extended commands are described in this document (downloadable on the web):
HUAWEI ME906s LTE Module AT Command Interface Specification-(V100R001_01, 0English).pdf
Huawei driver in Ofono uses standard AT command set. When it says to use any band in any
technology to connect, this disable 4G.
Fix consists in using the other command set to do the same thing when it is supported.
^HCSQ notification is also able to report LTE attachment while ^MODE reports UMTS
attachment when modem is attached in 4G.
Tests have been done only with E3372, with 3G and 4G SIM cards. I don't have any 3G
only huawei modem.
Technology report in network-registration.c works only because notification come in this
order:
1) PCUI: < \r\n^MODE: 5,4\r\n
2) PCUI: < \r\n^HCSQ:"LTE",38,34,101,28\r\n
3) PCUI: < \r\n^SRVST: 2\r\n\r\n+CREG: 1,"C0FA","00107202"\r\n
I have never seen notifications in other order but I don't have a Huawei document
saying it won't happen.
I will be happy to have your comments on these patches.
Best Regards,
Christophe Ronco
Christophe Ronco (2):
huawei: add LTE support
atmodem: correctly report lte bearer for huawei modems
drivers/atmodem/gprs.c | 22 ++++
drivers/atmodem/network-registration.c | 25 ++++
drivers/huaweimodem/radio-settings.c | 213 ++++++++++++++++++++++++++++++---
3 files changed, 244 insertions(+), 16 deletions(-)
--
2.7.4
7:42 p.m.
New subject: [PATCH 1/2] huawei: add LTE support
Huawei LTE modems use AT^SYSCFGEX and AT^SYSINFOEX instead of
AT^SYSCFG and AT^SYSINFO.
If we want to be able to attach on LTE with this modem, we must use
AT^SYSCFGEX to configure rat mode and band. Using AT^SYSCFG, mode any
means UMTS or GSM.
---
drivers/huaweimodem/radio-settings.c | 213 ++++++++++++++++++++++++++++++++---
1 file changed, 197 insertions(+), 16 deletions(-)
diff --git a/drivers/huaweimodem/radio-settings.c b/drivers/huaweimodem/radio-settings.c
index c34653a..5eb93f6 100644
--- a/drivers/huaweimodem/radio-settings.c
+++ b/drivers/huaweimodem/radio-settings.c
@@ -42,11 +42,13 @@
static const char *none_prefix[] = { NULL };
static const char *syscfg_prefix[] = { "^SYSCFG:", NULL };
+static const char *syscfgex_prefix[] = { "^SYSCFGEX:", NULL };
#define HUAWEI_BAND_ANY 0x3FFFFFFF
struct radio_settings_data {
GAtChat *chat;
+ ofono_bool_t syscfgex_cap;
};
static const struct huawei_band_gsm_table {
@@ -176,20 +178,81 @@ error:
CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
}
+static void syscfgex_query_mode_cb(gboolean ok, GAtResult *result,
+ gpointer user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb;
+ enum ofono_radio_access_mode mode;
+ struct ofono_error error;
+ GAtResultIter iter;
+ const char *acqorder;
+
+ decode_at_error(&error, g_at_result_final_response(result));
+
+ if (!ok) {
+ cb(&error, -1, cbd->data);
+ return;
+ }
+
+ g_at_result_iter_init(&iter, result);
+
+ if (g_at_result_iter_next(&iter, "^SYSCFGEX:") == FALSE)
+ goto error;
+
+ if (g_at_result_iter_next_string(&iter, &acqorder) == FALSE)
+ goto error;
+
+ mode = OFONO_RADIO_ACCESS_MODE_ANY;
+ if (strstr(acqorder, "01"))
+ mode |= OFONO_RADIO_ACCESS_MODE_GSM;
+ if (strstr(acqorder, "02"))
+ mode |= OFONO_RADIO_ACCESS_MODE_UMTS;
+ if (strstr(acqorder, "03"))
+ mode |= OFONO_RADIO_ACCESS_MODE_LTE;
+
+ if (mode == OFONO_RADIO_ACCESS_MODE_ANY) {
+ if (strstr(acqorder, "00") == NULL) {
+ DBG("Can't interpret SYSCFGEX mode: %s",
+ acqorder);
+ goto error;
+ }
+ }
+
+ cb(&error, mode, cbd->data);
+
+ return;
+
+error:
+ CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+}
+
static void huawei_query_rat_mode(struct ofono_radio_settings *rs,
ofono_radio_settings_rat_mode_query_cb_t cb, void *data)
{
struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
struct cb_data *cbd = cb_data_new(cb, data);
- if (g_at_chat_send(rsd->chat, "AT^SYSCFG?", syscfg_prefix,
- syscfg_query_mode_cb, cbd, g_free) == 0) {
- CALLBACK_WITH_FAILURE(cb, -1, data);
- g_free(cbd);
+ if (rsd->syscfgex_cap) {
+ if (g_at_chat_send(rsd->chat, "AT^SYSCFGEX?",
+ syscfgex_prefix,
+ syscfgex_query_mode_cb,
+ cbd, g_free) == 0) {
+ CALLBACK_WITH_FAILURE(cb, -1, data);
+ g_free(cbd);
+ }
+ } else {
+ if (g_at_chat_send(rsd->chat, "AT^SYSCFG?",
+ syscfg_prefix,
+ syscfg_query_mode_cb,
+ cbd, g_free) == 0) {
+ CALLBACK_WITH_FAILURE(cb, -1, data);
+ g_free(cbd);
+ }
}
}
-static void syscfg_modify_mode_cb(gboolean ok, GAtResult *result,
+static void syscfgxx_modify_mode_cb(gboolean ok, GAtResult *result,
gpointer user_data)
{
struct cb_data *cbd = user_data;
@@ -200,12 +263,11 @@ static void syscfg_modify_mode_cb(gboolean ok, GAtResult *result,
cb(&error, cbd->data);
}
-static void huawei_set_rat_mode(struct ofono_radio_settings *rs,
+static void syscfg_set_rat_mode(struct radio_settings_data *rsd,
enum ofono_radio_access_mode mode,
ofono_radio_settings_rat_mode_set_cb_t cb,
void *data)
{
- struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
struct cb_data *cbd = cb_data_new(cb, data);
char buf[40];
unsigned int value = 2, acq_order = 0;
@@ -231,7 +293,7 @@ static void huawei_set_rat_mode(struct ofono_radio_settings *rs,
value, acq_order);
if (g_at_chat_send(rsd->chat, buf, none_prefix,
- syscfg_modify_mode_cb, cbd, g_free) > 0)
+ syscfgxx_modify_mode_cb, cbd, g_free) > 0)
return;
error:
@@ -239,7 +301,55 @@ error:
g_free(cbd);
}
-static void syscfg_modify_band_cb(gboolean ok, GAtResult *result,
+static void syscfgex_set_rat_mode(struct radio_settings_data *rsd,
+ enum ofono_radio_access_mode mode,
+ ofono_radio_settings_rat_mode_set_cb_t cb,
+ void *data)
+{
+ struct cb_data *cbd = cb_data_new(cb, data);
+ char buf[50];
+ char *atcmd = "AT^SYSCFGEX=\"%s\",40000000,2,4,40000000,,";
+ char *acqorder = "030201";
+
+ switch (mode) {
+ case OFONO_RADIO_ACCESS_MODE_ANY:
+ acqorder = "00";
+ break;
+ case OFONO_RADIO_ACCESS_MODE_GSM:
+ acqorder = "01";
+ break;
+ case OFONO_RADIO_ACCESS_MODE_UMTS:
+ acqorder = "02";
+ break;
+ case OFONO_RADIO_ACCESS_MODE_LTE:
+ acqorder = "03";
+ break;
+ }
+
+ snprintf(buf, sizeof(buf), atcmd, acqorder);
+
+ if (g_at_chat_send(rsd->chat, buf, none_prefix,
+ syscfgxx_modify_mode_cb, cbd, g_free) > 0)
+ return;
+
+ CALLBACK_WITH_FAILURE(cb, data);
+ g_free(cbd);
+}
+
+static void huawei_set_rat_mode(struct ofono_radio_settings *rs,
+ enum ofono_radio_access_mode mode,
+ ofono_radio_settings_rat_mode_set_cb_t cb,
+ void *data)
+{
+ struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+
+ if (rsd->syscfgex_cap)
+ syscfgex_set_rat_mode(rsd, mode, cb, data);
+ else
+ syscfg_set_rat_mode(rsd, mode, cb, data);
+}
+
+static void syscfgxx_modify_band_cb(gboolean ok, GAtResult *result,
gpointer user_data)
{
struct cb_data *cbd = user_data;
@@ -250,13 +360,54 @@ static void syscfg_modify_band_cb(gboolean ok, GAtResult *result,
cb(&error, cbd->data);
}
-static void huawei_set_band(struct ofono_radio_settings *rs,
+static void syscfgex_set_band(struct radio_settings_data *rsd,
+ enum ofono_radio_band_gsm band_gsm,
+ enum ofono_radio_band_umts band_umts,
+ ofono_radio_settings_band_set_cb_t cb,
+ void *data)
+{
+ struct cb_data *cbd = cb_data_new(cb, data);
+ char buf[50];
+ char *atcmd = "AT^SYSCFGEX=\"99\",%x,2,4,40000000,,";
+ unsigned int huawei_band;
+
+ if (band_gsm == OFONO_RADIO_BAND_GSM_ANY
+ && band_umts == OFONO_RADIO_BAND_UMTS_ANY) {
+ huawei_band = HUAWEI_BAND_ANY;
+ } else {
+ unsigned int huawei_band_gsm;
+ unsigned int huawei_band_umts;
+
+ huawei_band_gsm = band_gsm_to_huawei(band_gsm);
+
+ if (!huawei_band_gsm)
+ goto error;
+
+ huawei_band_umts = band_umts_to_huawei(band_umts);
+
+ if (!huawei_band_umts)
+ goto error;
+
+ huawei_band = huawei_band_gsm | huawei_band_umts;
+ }
+
+ snprintf(buf, sizeof(buf), atcmd, huawei_band);
+
+ if (g_at_chat_send(rsd->chat, buf, none_prefix,
+ syscfgxx_modify_band_cb, cbd, g_free) > 0)
+ return;
+
+error:
+ CALLBACK_WITH_FAILURE(cb, data);
+ g_free(cbd);
+}
+
+static void syscfg_set_band(struct radio_settings_data *rsd,
enum ofono_radio_band_gsm band_gsm,
enum ofono_radio_band_umts band_umts,
ofono_radio_settings_band_set_cb_t cb,
void *data)
{
- struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
struct cb_data *cbd = cb_data_new(cb, data);
char buf[40];
unsigned int huawei_band;
@@ -284,7 +435,7 @@ static void huawei_set_band(struct ofono_radio_settings *rs,
snprintf(buf, sizeof(buf), "AT^SYSCFG=16,3,%x,2,4", huawei_band);
if (g_at_chat_send(rsd->chat, buf, none_prefix,
- syscfg_modify_band_cb, cbd, g_free) > 0)
+ syscfgxx_modify_band_cb, cbd, g_free) > 0)
return;
error:
@@ -292,6 +443,20 @@ error:
g_free(cbd);
}
+static void huawei_set_band(struct ofono_radio_settings *rs,
+ enum ofono_radio_band_gsm band_gsm,
+ enum ofono_radio_band_umts band_umts,
+ ofono_radio_settings_band_set_cb_t cb,
+ void *data)
+{
+ struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+
+ if (rsd->syscfgex_cap)
+ syscfgex_set_band(rsd, band_gsm, band_umts, cb, data);
+ else
+ syscfg_set_band(rsd, band_gsm, band_umts, cb, data);
+}
+
static void syscfg_query_band_cb(gboolean ok, GAtResult *result,
gpointer user_data)
{
@@ -364,6 +529,22 @@ static void syscfg_support_cb(gboolean ok, GAtResult *result,
ofono_radio_settings_register(rs);
}
+static void syscfgex_support_cb(gboolean ok, GAtResult *result,
+ gpointer user_data)
+{
+ struct ofono_radio_settings *rs = user_data;
+ struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+
+ if (!ok) {
+ g_at_chat_send(rsd->chat, "AT^SYSCFG=?", syscfg_prefix,
+ syscfg_support_cb, rs, NULL);
+ return;
+ }
+
+ rsd->syscfgex_cap = 1;
+ ofono_radio_settings_register(rs);
+}
+
static int huawei_radio_settings_probe(struct ofono_radio_settings *rs,
unsigned int vendor, void *data)
{
@@ -378,8 +559,8 @@ static int huawei_radio_settings_probe(struct ofono_radio_settings
*rs,
ofono_radio_settings_set_data(rs, rsd);
- g_at_chat_send(rsd->chat, "AT^SYSCFG=?", syscfg_prefix,
- syscfg_support_cb, rs, NULL);
+ g_at_chat_send(rsd->chat, "AT^SYSCFGEX=?", syscfgex_prefix,
+ syscfgex_support_cb, rs, NULL);
return 0;
}
@@ -400,8 +581,8 @@ static struct ofono_radio_settings_driver driver = {
.remove = huawei_radio_settings_remove,
.query_rat_mode = huawei_query_rat_mode,
.set_rat_mode = huawei_set_rat_mode,
- .query_band = huawei_query_band,
- .set_band = huawei_set_band,
+ .query_band = huawei_query_band,
+ .set_band = huawei_set_band,
};
void huawei_radio_settings_init(void)
--
2.7.4
2:40 a.m.
New subject: [PATCH 1/2] huawei: add LTE support
Hi Christophe,
On 09/06/2017 04:42 AM, Christophe Ronco wrote:
Huawei LTE modems use AT^SYSCFGEX and AT^SYSINFOEX instead of
AT^SYSCFG and AT^SYSINFO.
If we want to be able to attach on LTE with this modem, we must use
AT^SYSCFGEX to configure rat mode and band. Using AT^SYSCFG, mode any
means UMTS or GSM.
---
drivers/huaweimodem/radio-settings.c | 213 ++++++++++++++++++++++++++++++++---
1 file changed, 197 insertions(+), 16 deletions(-)
diff --git a/drivers/huaweimodem/radio-settings.c b/drivers/huaweimodem/radio-settings.c
index c34653a..5eb93f6 100644
--- a/drivers/huaweimodem/radio-settings.c
+++ b/drivers/huaweimodem/radio-settings.c
@@ -42,11 +42,13 @@
static const char *none_prefix[] = { NULL };
static const char *syscfg_prefix[] = { "^SYSCFG:", NULL };
+static const char *syscfgex_prefix[] = { "^SYSCFGEX:", NULL };
#define HUAWEI_BAND_ANY 0x3FFFFFFF
struct radio_settings_data {
GAtChat *chat;
+ ofono_bool_t syscfgex_cap;
};
static const struct huawei_band_gsm_table {
@@ -176,20 +178,81 @@ error:
CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
}
+static void syscfgex_query_mode_cb(gboolean ok, GAtResult *result,
+ gpointer user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb;
+ enum ofono_radio_access_mode mode;
+ struct ofono_error error;
+ GAtResultIter iter;
+ const char *acqorder;
+
+ decode_at_error(&error, g_at_result_final_response(result));
+
+ if (!ok) {
+ cb(&error, -1, cbd->data);
+ return;
+ }
+
+ g_at_result_iter_init(&iter, result);
+
+ if (g_at_result_iter_next(&iter, "^SYSCFGEX:") == FALSE)
+ goto error;
+
+ if (g_at_result_iter_next_string(&iter, &acqorder) == FALSE)
+ goto error;
+
+ mode = OFONO_RADIO_ACCESS_MODE_ANY;
+ if (strstr(acqorder, "01"))
+ mode |= OFONO_RADIO_ACCESS_MODE_GSM;
+ if (strstr(acqorder, "02"))
+ mode |= OFONO_RADIO_ACCESS_MODE_UMTS;
+ if (strstr(acqorder, "03"))
+ mode |= OFONO_RADIO_ACCESS_MODE_LTE;
So what happens if we get back something like "030201" (e.g.
LTE->WCDMA->GSM)? We will get a value of '7' being reported to the
core, which isn't handled by
src/radio-settings.c:radio_access_mode_to_string().
oFono does not support ordered technology preferences. Maybe this is
something we should add in the future, but some firmware doesn't support
this.
+
+ if (mode == OFONO_RADIO_ACCESS_MODE_ANY) {
+ if (strstr(acqorder, "00") == NULL) {
strcmp?
+ DBG("Can't interpret SYSCFGEX mode: %s",
+ acqorder);
+ goto error;
+ }
+ }
+
+ cb(&error, mode, cbd->data);
+
+ return;
+
+error:
+ CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+}
+
static void huawei_query_rat_mode(struct ofono_radio_settings *rs,
ofono_radio_settings_rat_mode_query_cb_t cb, void *data)
{
struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
struct cb_data *cbd = cb_data_new(cb, data);
- if (g_at_chat_send(rsd->chat, "AT^SYSCFG?", syscfg_prefix,
- syscfg_query_mode_cb, cbd, g_free) == 0) {
- CALLBACK_WITH_FAILURE(cb, -1, data);
- g_free(cbd);
+ if (rsd->syscfgex_cap) {
+ if (g_at_chat_send(rsd->chat, "AT^SYSCFGEX?",
+ syscfgex_prefix,
+ syscfgex_query_mode_cb,
+ cbd, g_free) == 0) {
+ CALLBACK_WITH_FAILURE(cb, -1, data);
+ g_free(cbd);
if (rsd->syscfgex_cap && g_at_chat_send(...) > 0)
return;
if (!rsd->syscfgex_cap && g_at_chat_send(...) > 0)
return;
CALLBACK...
g_free()
+ }
+ } else {
+ if (g_at_chat_send(rsd->chat, "AT^SYSCFG?",
+ syscfg_prefix,
+ syscfg_query_mode_cb,
+ cbd, g_free) == 0) {
+ CALLBACK_WITH_FAILURE(cb, -1, data);
+ g_free(cbd);
+ }
}
}
-static void syscfg_modify_mode_cb(gboolean ok, GAtResult *result,
+static void syscfgxx_modify_mode_cb(gboolean ok, GAtResult *result,
gpointer user_data)
{
struct cb_data *cbd = user_data;
@@ -200,12 +263,11 @@ static void syscfg_modify_mode_cb(gboolean ok, GAtResult *result,
cb(&error, cbd->data);
}
-static void huawei_set_rat_mode(struct ofono_radio_settings *rs,
+static void syscfg_set_rat_mode(struct radio_settings_data *rsd,
enum ofono_radio_access_mode mode,
ofono_radio_settings_rat_mode_set_cb_t cb,
void *data)
{
- struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
struct cb_data *cbd = cb_data_new(cb, data);
char buf[40];
unsigned int value = 2, acq_order = 0;
@@ -231,7 +293,7 @@ static void huawei_set_rat_mode(struct ofono_radio_settings *rs,
value, acq_order);
if (g_at_chat_send(rsd->chat, buf, none_prefix,
- syscfg_modify_mode_cb, cbd, g_free) > 0)
+ syscfgxx_modify_mode_cb, cbd, g_free) > 0)
return;
error:
@@ -239,7 +301,55 @@ error:
g_free(cbd);
}
-static void syscfg_modify_band_cb(gboolean ok, GAtResult *result,
+static void syscfgex_set_rat_mode(struct radio_settings_data *rsd,
+ enum ofono_radio_access_mode mode,
+ ofono_radio_settings_rat_mode_set_cb_t cb,
+ void *data)
+{
+ struct cb_data *cbd = cb_data_new(cb, data);
+ char buf[50];
+ char *atcmd = "AT^SYSCFGEX=\"%s\",40000000,2,4,40000000,,";
+ char *acqorder = "030201";
+
+ switch (mode) {
+ case OFONO_RADIO_ACCESS_MODE_ANY:
+ acqorder = "00";
+ break;
+ case OFONO_RADIO_ACCESS_MODE_GSM:
+ acqorder = "01";
+ break;
+ case OFONO_RADIO_ACCESS_MODE_UMTS:
+ acqorder = "02";
+ break;
+ case OFONO_RADIO_ACCESS_MODE_LTE:
+ acqorder = "03";
+ break;
+ }
+
+ snprintf(buf, sizeof(buf), atcmd, acqorder);
+
+ if (g_at_chat_send(rsd->chat, buf, none_prefix,
+ syscfgxx_modify_mode_cb, cbd, g_free) > 0)
+ return;
+
+ CALLBACK_WITH_FAILURE(cb, data);
+ g_free(cbd);
+}
+
+static void huawei_set_rat_mode(struct ofono_radio_settings *rs,
+ enum ofono_radio_access_mode mode,
+ ofono_radio_settings_rat_mode_set_cb_t cb,
+ void *data)
+{
+ struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+
+ if (rsd->syscfgex_cap)
+ syscfgex_set_rat_mode(rsd, mode, cb, data);
+ else
+ syscfg_set_rat_mode(rsd, mode, cb, data);
+}
+
+static void syscfgxx_modify_band_cb(gboolean ok, GAtResult *result,
gpointer user_data)
{
struct cb_data *cbd = user_data;
@@ -250,13 +360,54 @@ static void syscfg_modify_band_cb(gboolean ok, GAtResult *result,
cb(&error, cbd->data);
}
-static void huawei_set_band(struct ofono_radio_settings *rs,
+static void syscfgex_set_band(struct radio_settings_data *rsd,
+ enum ofono_radio_band_gsm band_gsm,
+ enum ofono_radio_band_umts band_umts,
+ ofono_radio_settings_band_set_cb_t cb,
+ void *data)
+{
+ struct cb_data *cbd = cb_data_new(cb, data);
+ char buf[50];
+ char *atcmd = "AT^SYSCFGEX=\"99\",%x,2,4,40000000,,";
+ unsigned int huawei_band;
+
+ if (band_gsm == OFONO_RADIO_BAND_GSM_ANY
+ && band_umts == OFONO_RADIO_BAND_UMTS_ANY) {
+ huawei_band = HUAWEI_BAND_ANY;
+ } else {
+ unsigned int huawei_band_gsm;
+ unsigned int huawei_band_umts;
+
+ huawei_band_gsm = band_gsm_to_huawei(band_gsm);
+
+ if (!huawei_band_gsm)
+ goto error;
+
+ huawei_band_umts = band_umts_to_huawei(band_umts);
+
+ if (!huawei_band_umts)
+ goto error;
+
+ huawei_band = huawei_band_gsm | huawei_band_umts;
+ }
+
+ snprintf(buf, sizeof(buf), atcmd, huawei_band);
+
+ if (g_at_chat_send(rsd->chat, buf, none_prefix,
+ syscfgxx_modify_band_cb, cbd, g_free) > 0)
+ return;
+
+error:
+ CALLBACK_WITH_FAILURE(cb, data);
+ g_free(cbd);
+}
+
+static void syscfg_set_band(struct radio_settings_data *rsd,
enum ofono_radio_band_gsm band_gsm,
enum ofono_radio_band_umts band_umts,
ofono_radio_settings_band_set_cb_t cb,
void *data)
{
- struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
struct cb_data *cbd = cb_data_new(cb, data);
char buf[40];
unsigned int huawei_band;
@@ -284,7 +435,7 @@ static void huawei_set_band(struct ofono_radio_settings *rs,
snprintf(buf, sizeof(buf), "AT^SYSCFG=16,3,%x,2,4", huawei_band);
if (g_at_chat_send(rsd->chat, buf, none_prefix,
- syscfg_modify_band_cb, cbd, g_free) > 0)
+ syscfgxx_modify_band_cb, cbd, g_free) > 0)
Was something wrong with the previous indentation?
return;
error:
@@ -292,6 +443,20 @@ error:
g_free(cbd);
}
+static void huawei_set_band(struct ofono_radio_settings *rs,
+ enum ofono_radio_band_gsm band_gsm,
+ enum ofono_radio_band_umts band_umts,
+ ofono_radio_settings_band_set_cb_t cb,
+ void *data)
+{
+ struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+
+ if (rsd->syscfgex_cap)
+ syscfgex_set_band(rsd, band_gsm, band_umts, cb, data);
+ else
+ syscfg_set_band(rsd, band_gsm, band_umts, cb, data);
+}
+
static void syscfg_query_band_cb(gboolean ok, GAtResult *result,
gpointer user_data)
{
@@ -364,6 +529,22 @@ static void syscfg_support_cb(gboolean ok, GAtResult *result,
ofono_radio_settings_register(rs);
}
+static void syscfgex_support_cb(gboolean ok, GAtResult *result,
+ gpointer user_data)
+{
+ struct ofono_radio_settings *rs = user_data;
+ struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+
+ if (!ok) {
+ g_at_chat_send(rsd->chat, "AT^SYSCFG=?", syscfg_prefix,
+ syscfg_support_cb, rs, NULL);
+ return;
+ }
+
+ rsd->syscfgex_cap = 1;
+ ofono_radio_settings_register(rs);
+}
+
static int huawei_radio_settings_probe(struct ofono_radio_settings *rs,
unsigned int vendor, void *data)
{
@@ -378,8 +559,8 @@ static int huawei_radio_settings_probe(struct ofono_radio_settings
*rs,
ofono_radio_settings_set_data(rs, rsd);
- g_at_chat_send(rsd->chat, "AT^SYSCFG=?", syscfg_prefix,
- syscfg_support_cb, rs, NULL);
+ g_at_chat_send(rsd->chat, "AT^SYSCFGEX=?", syscfgex_prefix,
+ syscfgex_support_cb, rs, NULL);
return 0;
}
@@ -400,8 +581,8 @@ static struct ofono_radio_settings_driver driver = {
.remove = huawei_radio_settings_remove,
.query_rat_mode = huawei_query_rat_mode,
.set_rat_mode = huawei_set_rat_mode,
- .query_band = huawei_query_band,
- .set_band = huawei_set_band,
+ .query_band = huawei_query_band,
+ .set_band = huawei_set_band,
You might also want to support
query_available_rats method now.
};
void huawei_radio_settings_init(void)
Regards,
-Denis
6:18 p.m.
New subject: [PATCH v2] huawei: add LTE support
Hi Denis,
Here is another version of the patch.
I have not added query_available_rats methods. Maybe in another patch.
Christophe
Christophe Ronco (1):
huawei: add LTE support
drivers/huaweimodem/radio-settings.c | 209 ++++++++++++++++++++++++++++++++---
1 file changed, 192 insertions(+), 17 deletions(-)
--
2.7.4
6:18 p.m.
New subject: [PATCH] huawei: add LTE support
Huawei LTE modems use AT^SYSCFGEX and AT^SYSINFOEX instead of
AT^SYSCFG and AT^SYSINFO.
If we want to be able to attach on LTE with this modem, we must use
AT^SYSCFGEX to configure rat mode and band. Using AT^SYSCFG, mode any
means UMTS or GSM.
---
drivers/huaweimodem/radio-settings.c | 209 ++++++++++++++++++++++++++++++++---
1 file changed, 192 insertions(+), 17 deletions(-)
diff --git a/drivers/huaweimodem/radio-settings.c b/drivers/huaweimodem/radio-settings.c
index c34653a..65bae52 100644
--- a/drivers/huaweimodem/radio-settings.c
+++ b/drivers/huaweimodem/radio-settings.c
@@ -42,11 +42,13 @@
static const char *none_prefix[] = { NULL };
static const char *syscfg_prefix[] = { "^SYSCFG:", NULL };
+static const char *syscfgex_prefix[] = { "^SYSCFGEX:", NULL };
#define HUAWEI_BAND_ANY 0x3FFFFFFF
struct radio_settings_data {
GAtChat *chat;
+ ofono_bool_t syscfgex_cap;
};
static const struct huawei_band_gsm_table {
@@ -176,20 +178,76 @@ error:
CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
}
+static void syscfgex_query_mode_cb(gboolean ok, GAtResult *result,
+ gpointer user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb;
+ enum ofono_radio_access_mode mode;
+ struct ofono_error error;
+ GAtResultIter iter;
+ const char *acqorder;
+
+ decode_at_error(&error, g_at_result_final_response(result));
+
+ if (!ok) {
+ cb(&error, -1, cbd->data);
+ return;
+ }
+
+ g_at_result_iter_init(&iter, result);
+
+ if (g_at_result_iter_next(&iter, "^SYSCFGEX:") == FALSE)
+ goto error;
+
+ if (g_at_result_iter_next_string(&iter, &acqorder) == FALSE)
+ goto error;
+
+ if ((strcmp(acqorder, "00") == 0) ||
+ (strstr(acqorder, "01") &&
+ strstr(acqorder, "02") &&
+ strstr(acqorder, "03")))
+ mode = OFONO_RADIO_ACCESS_MODE_ANY;
+ else if (strstr(acqorder, "03"))
+ mode = OFONO_RADIO_ACCESS_MODE_LTE;
+ else if (strstr(acqorder, "02"))
+ mode = OFONO_RADIO_ACCESS_MODE_UMTS;
+ else if (strstr(acqorder, "01"))
+ mode = OFONO_RADIO_ACCESS_MODE_GSM;
+ else
+ goto error;
+
+ cb(&error, mode, cbd->data);
+
+ return;
+
+error:
+ CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+}
+
static void huawei_query_rat_mode(struct ofono_radio_settings *rs,
ofono_radio_settings_rat_mode_query_cb_t cb, void *data)
{
struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
struct cb_data *cbd = cb_data_new(cb, data);
- if (g_at_chat_send(rsd->chat, "AT^SYSCFG?", syscfg_prefix,
- syscfg_query_mode_cb, cbd, g_free) == 0) {
- CALLBACK_WITH_FAILURE(cb, -1, data);
- g_free(cbd);
- }
+ if (rsd->syscfgex_cap && g_at_chat_send(rsd->chat,
"AT^SYSCFGEX?",
+ syscfgex_prefix,
+ syscfgex_query_mode_cb,
+ cbd, g_free) > 0)
+ return;
+
+ if (!rsd->syscfgex_cap && g_at_chat_send(rsd->chat,
"AT^SYSCFG?",
+ syscfg_prefix,
+ syscfg_query_mode_cb,
+ cbd, g_free) > 0)
+ return;
+
+ CALLBACK_WITH_FAILURE(cb, -1, data);
+ g_free(cbd);
}
-static void syscfg_modify_mode_cb(gboolean ok, GAtResult *result,
+static void syscfgxx_modify_mode_cb(gboolean ok, GAtResult *result,
gpointer user_data)
{
struct cb_data *cbd = user_data;
@@ -200,12 +258,11 @@ static void syscfg_modify_mode_cb(gboolean ok, GAtResult *result,
cb(&error, cbd->data);
}
-static void huawei_set_rat_mode(struct ofono_radio_settings *rs,
+static void syscfg_set_rat_mode(struct radio_settings_data *rsd,
enum ofono_radio_access_mode mode,
ofono_radio_settings_rat_mode_set_cb_t cb,
void *data)
{
- struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
struct cb_data *cbd = cb_data_new(cb, data);
char buf[40];
unsigned int value = 2, acq_order = 0;
@@ -231,7 +288,7 @@ static void huawei_set_rat_mode(struct ofono_radio_settings *rs,
value, acq_order);
if (g_at_chat_send(rsd->chat, buf, none_prefix,
- syscfg_modify_mode_cb, cbd, g_free) > 0)
+ syscfgxx_modify_mode_cb, cbd, g_free) > 0)
return;
error:
@@ -239,7 +296,55 @@ error:
g_free(cbd);
}
-static void syscfg_modify_band_cb(gboolean ok, GAtResult *result,
+static void syscfgex_set_rat_mode(struct radio_settings_data *rsd,
+ enum ofono_radio_access_mode mode,
+ ofono_radio_settings_rat_mode_set_cb_t cb,
+ void *data)
+{
+ struct cb_data *cbd = cb_data_new(cb, data);
+ char buf[50];
+ char *atcmd = "AT^SYSCFGEX=\"%s\",40000000,2,4,40000000,,";
+ char *acqorder = "030201";
+
+ switch (mode) {
+ case OFONO_RADIO_ACCESS_MODE_ANY:
+ acqorder = "00";
+ break;
+ case OFONO_RADIO_ACCESS_MODE_GSM:
+ acqorder = "01";
+ break;
+ case OFONO_RADIO_ACCESS_MODE_UMTS:
+ acqorder = "02";
+ break;
+ case OFONO_RADIO_ACCESS_MODE_LTE:
+ acqorder = "03";
+ break;
+ }
+
+ snprintf(buf, sizeof(buf), atcmd, acqorder);
+
+ if (g_at_chat_send(rsd->chat, buf, none_prefix,
+ syscfgxx_modify_mode_cb, cbd, g_free) > 0)
+ return;
+
+ CALLBACK_WITH_FAILURE(cb, data);
+ g_free(cbd);
+}
+
+static void huawei_set_rat_mode(struct ofono_radio_settings *rs,
+ enum ofono_radio_access_mode mode,
+ ofono_radio_settings_rat_mode_set_cb_t cb,
+ void *data)
+{
+ struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+
+ if (rsd->syscfgex_cap)
+ syscfgex_set_rat_mode(rsd, mode, cb, data);
+ else
+ syscfg_set_rat_mode(rsd, mode, cb, data);
+}
+
+static void syscfgxx_modify_band_cb(gboolean ok, GAtResult *result,
gpointer user_data)
{
struct cb_data *cbd = user_data;
@@ -250,13 +355,54 @@ static void syscfg_modify_band_cb(gboolean ok, GAtResult *result,
cb(&error, cbd->data);
}
-static void huawei_set_band(struct ofono_radio_settings *rs,
+static void syscfgex_set_band(struct radio_settings_data *rsd,
+ enum ofono_radio_band_gsm band_gsm,
+ enum ofono_radio_band_umts band_umts,
+ ofono_radio_settings_band_set_cb_t cb,
+ void *data)
+{
+ struct cb_data *cbd = cb_data_new(cb, data);
+ char buf[50];
+ char *atcmd = "AT^SYSCFGEX=\"99\",%x,2,4,40000000,,";
+ unsigned int huawei_band;
+
+ if (band_gsm == OFONO_RADIO_BAND_GSM_ANY
+ && band_umts == OFONO_RADIO_BAND_UMTS_ANY) {
+ huawei_band = HUAWEI_BAND_ANY;
+ } else {
+ unsigned int huawei_band_gsm;
+ unsigned int huawei_band_umts;
+
+ huawei_band_gsm = band_gsm_to_huawei(band_gsm);
+
+ if (!huawei_band_gsm)
+ goto error;
+
+ huawei_band_umts = band_umts_to_huawei(band_umts);
+
+ if (!huawei_band_umts)
+ goto error;
+
+ huawei_band = huawei_band_gsm | huawei_band_umts;
+ }
+
+ snprintf(buf, sizeof(buf), atcmd, huawei_band);
+
+ if (g_at_chat_send(rsd->chat, buf, none_prefix,
+ syscfgxx_modify_band_cb, cbd, g_free) > 0)
+ return;
+
+error:
+ CALLBACK_WITH_FAILURE(cb, data);
+ g_free(cbd);
+}
+
+static void syscfg_set_band(struct radio_settings_data *rsd,
enum ofono_radio_band_gsm band_gsm,
enum ofono_radio_band_umts band_umts,
ofono_radio_settings_band_set_cb_t cb,
void *data)
{
- struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
struct cb_data *cbd = cb_data_new(cb, data);
char buf[40];
unsigned int huawei_band;
@@ -284,7 +430,7 @@ static void huawei_set_band(struct ofono_radio_settings *rs,
snprintf(buf, sizeof(buf), "AT^SYSCFG=16,3,%x,2,4", huawei_band);
if (g_at_chat_send(rsd->chat, buf, none_prefix,
- syscfg_modify_band_cb, cbd, g_free) > 0)
+ syscfgxx_modify_band_cb, cbd, g_free) > 0)
return;
error:
@@ -292,6 +438,20 @@ error:
g_free(cbd);
}
+static void huawei_set_band(struct ofono_radio_settings *rs,
+ enum ofono_radio_band_gsm band_gsm,
+ enum ofono_radio_band_umts band_umts,
+ ofono_radio_settings_band_set_cb_t cb,
+ void *data)
+{
+ struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+
+ if (rsd->syscfgex_cap)
+ syscfgex_set_band(rsd, band_gsm, band_umts, cb, data);
+ else
+ syscfg_set_band(rsd, band_gsm, band_umts, cb, data);
+}
+
static void syscfg_query_band_cb(gboolean ok, GAtResult *result,
gpointer user_data)
{
@@ -364,6 +524,21 @@ static void syscfg_support_cb(gboolean ok, GAtResult *result,
ofono_radio_settings_register(rs);
}
+static void syscfgex_support_cb(gboolean ok, GAtResult *result,
+ gpointer user_data)
+{
+ struct ofono_radio_settings *rs = user_data;
+ struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+
+ if (!ok) {
+ g_at_chat_send(rsd->chat, "AT^SYSCFG=?", syscfg_prefix,
+ syscfg_support_cb, rs, NULL);
+ }
+
+ rsd->syscfgex_cap = 1;
+ ofono_radio_settings_register(rs);
+}
+
static int huawei_radio_settings_probe(struct ofono_radio_settings *rs,
unsigned int vendor, void *data)
{
@@ -378,8 +553,8 @@ static int huawei_radio_settings_probe(struct ofono_radio_settings
*rs,
ofono_radio_settings_set_data(rs, rsd);
- g_at_chat_send(rsd->chat, "AT^SYSCFG=?", syscfg_prefix,
- syscfg_support_cb, rs, NULL);
+ g_at_chat_send(rsd->chat, "AT^SYSCFGEX=?", syscfgex_prefix,
+ syscfgex_support_cb, rs, NULL);
return 0;
}
@@ -400,8 +575,8 @@ static struct ofono_radio_settings_driver driver = {
.remove = huawei_radio_settings_remove,
.query_rat_mode = huawei_query_rat_mode,
.set_rat_mode = huawei_set_rat_mode,
- .query_band = huawei_query_band,
- .set_band = huawei_set_band,
+ .query_band = huawei_query_band,
+ .set_band = huawei_set_band,
};
void huawei_radio_settings_init(void)
--
2.7.4
11:10 a.m.
New subject: [PATCH] huawei: add LTE support
Hi Christophe,
On 09/14/2017 03:18 AM, Christophe Ronco wrote:
Huawei LTE modems use AT^SYSCFGEX and AT^SYSINFOEX instead of
AT^SYSCFG and AT^SYSINFO.
If we want to be able to attach on LTE with this modem, we must use
AT^SYSCFGEX to configure rat mode and band. Using AT^SYSCFG, mode any
means UMTS or GSM.
---
drivers/huaweimodem/radio-settings.c | 209 ++++++++++++++++++++++++++++++++---
1 file changed, 192 insertions(+), 17 deletions(-)
Applied, thanks.
Regards,
-Denis
7:42 p.m.
New subject: [PATCH 2/2] atmodem: correctly report lte bearer for huawei modems
---
drivers/atmodem/gprs.c | 22 ++++++++++++++++++++++
drivers/atmodem/network-registration.c | 25 +++++++++++++++++++++++++
2 files changed, 47 insertions(+)
diff --git a/drivers/atmodem/gprs.c b/drivers/atmodem/gprs.c
index 94c7d05..df37d05 100644
--- a/drivers/atmodem/gprs.c
+++ b/drivers/atmodem/gprs.c
@@ -327,6 +327,26 @@ static void huawei_mode_notify(GAtResult *result, gpointer
user_data)
ofono_gprs_bearer_notify(gprs, bearer);
}
+static void huawei_hcsq_notify(GAtResult *result, gpointer user_data)
+{
+ struct ofono_gprs *gprs = user_data;
+ GAtResultIter iter;
+ const char *mode;
+
+ g_at_result_iter_init(&iter, result);
+
+ if (!g_at_result_iter_next(&iter, "^HCSQ:"))
+ return;
+
+ if (!g_at_result_iter_next_string(&iter, &mode))
+ return;
+
+ if (!strcmp("LTE", mode))
+ ofono_gprs_bearer_notify(gprs, 7); /* LTE */
+
+ /* in other modes, notification ^MODE is used */
+}
+
static void telit_mode_notify(GAtResult *result, gpointer user_data)
{
struct ofono_gprs *gprs = user_data;
@@ -432,6 +452,8 @@ static void gprs_initialized(gboolean ok, GAtResult *result, gpointer
user_data)
case OFONO_VENDOR_HUAWEI:
g_at_chat_register(gd->chat, "^MODE:", huawei_mode_notify,
FALSE, gprs, NULL);
+ g_at_chat_register(gd->chat, "^HCSQ:", huawei_hcsq_notify,
+ FALSE, gprs, NULL);
break;
case OFONO_VENDOR_UBLOX:
case OFONO_VENDOR_UBLOX_TOBY_L2:
diff --git a/drivers/atmodem/network-registration.c
b/drivers/atmodem/network-registration.c
index c2df0ce..a5e2af3 100644
--- a/drivers/atmodem/network-registration.c
+++ b/drivers/atmodem/network-registration.c
@@ -1088,6 +1088,27 @@ static void huawei_mode_notify(GAtResult *result, gpointer
user_data)
}
}
+static void huawei_hcsq_notify(GAtResult *result, gpointer user_data)
+{
+ struct ofono_netreg *netreg = user_data;
+ struct netreg_data *nd = ofono_netreg_get_data(netreg);
+ GAtResultIter iter;
+ const char *mode;
+
+ g_at_result_iter_init(&iter, result);
+
+ if (!g_at_result_iter_next(&iter, "^HCSQ:"))
+ return;
+
+ if (!g_at_result_iter_next_string(&iter, &mode))
+ return;
+
+ if (!strcmp("LTE", mode))
+ nd->tech = ACCESS_TECHNOLOGY_EUTRAN;
+
+ /* for other technologies, notification ^MODE is used */
+}
+
static void huawei_nwtime_notify(GAtResult *result, gpointer user_data)
{
struct ofono_netreg *netreg = user_data;
@@ -1896,6 +1917,10 @@ static void at_creg_set_cb(gboolean ok, GAtResult *result, gpointer
user_data)
g_at_chat_register(nd->chat, "^MODE:", huawei_mode_notify,
FALSE, netreg, NULL);
+ /* Register for 4G system mode reports */
+ g_at_chat_register(nd->chat, "^HCSQ:", huawei_hcsq_notify,
+ FALSE, netreg, NULL);
+
/* Register for network time reports */
g_at_chat_register(nd->chat, "^NWTIME:", huawei_nwtime_notify,
FALSE, netreg, NULL);
--
2.7.4
2:41 a.m.
New subject: [PATCH 2/2] atmodem: correctly report lte bearer for huawei modems
Hi Christophe,
On 09/06/2017 04:42 AM, Christophe Ronco wrote:
---
drivers/atmodem/gprs.c | 22 ++++++++++++++++++++++
drivers/atmodem/network-registration.c | 25 +++++++++++++++++++++++++
2 files changed, 47 insertions(+)
Applied, thanks.
Regards,
-Denis
1829
days inactive
1838
days old
7 comments
2 participants
participants (2)
-
Christophe Ronco -
Denis Kenzior