Request for comments on attempt to integrate new kernel-space MUX driver with oFono, for Infineon modem --- drivers/ifxmodem/gprs-context.c | 82 +++++++++++++++++++++++++++++++++++- plugins/ifx.c | 88 +++++++++++++++++++++++++++++++++------ 2 files changed, 155 insertions(+), 15 deletions(-) diff --git a/drivers/ifxmodem/gprs-context.c b/drivers/ifxmodem/gprs-context.c index 2c68b44..d5ad46e 100644 --- a/drivers/ifxmodem/gprs-context.c +++ b/drivers/ifxmodem/gprs-context.c @@ -27,8 +27,14 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <string.h> #include <errno.h> #include <sys/stat.h> +#include <sys/ioctl.h> +#include <net/if.h> +#include <linux/types.h> +#include <arpa/inet.h> +#include <linux/if_ether.h> #include <glib.h> @@ -63,7 +69,9 @@ struct gprs_context_data { char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1]; char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1]; GAtRawIP *rawip; + gboolean use_ofono_mux; enum state state; + char if_name[IF_NAMESIZE]; char address[32]; char dns1[32]; char dns2[32]; @@ -74,12 +82,56 @@ struct gprs_context_data { void *cb_data; /* Callback data */ }; +struct gsm_netconfig { + unsigned int adaption; + unsigned short protocol; + unsigned short unused2; + __u8 unused[28]; /* future use */ +}; + +#define GSMIOC_ENABLE_NET _IOW('G', 2, struct gsm_netconfig) +#define GSMIOC_DISABLE_NET _IO('G', 3) + static void rawip_debug(const char *str, void *data) { ofono_info("%s: %s", (const char *) data, str); } -static const char *setup_rawip(struct ofono_gprs_context *gc) +static const char *setup_rawip_kmux(struct ofono_gprs_context *gc) +{ + struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + struct gsm_netconfig netconfig; + int fd; + int n; + char *interface = NULL; + + DBG(""); + + fd = g_io_channel_unix_get_fd(g_at_chat_get_channel(gcd->chat)); + ofono_info("Got file descriptor: %d", fd); + + g_at_chat_suspend(gcd->chat); + + netconfig.adaption = 3; + netconfig.protocol = htons(ETH_P_IP); + n = ioctl(fd, GSMIOC_ENABLE_NET, &netconfig); + if (n < 0) { + ofono_error("Cannot enable network on the mux: %d", n); + return NULL; + } + ofono_info("Net index: %d", n); + + interface = if_indextoname(n, gcd->if_name); + if (interface == NULL) { + ofono_error("Interface index %d error %d error msg %s", n, errno, strerror(errno)); + return NULL; + } + ofono_info("Interface name: %s", interface); + + return interface; +} + +static const char *setup_rawip_internal(struct ofono_gprs_context *gc) { struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); GAtIO *io; @@ -153,7 +205,14 @@ static void session_cb(gboolean ok, GAtResult *result, gpointer user_data) dns[1] = gcd->dns2; dns[2] = 0; - interface = setup_rawip(gc); + if (gcd->use_ofono_mux == FALSE) { + ofono_info("Calling setup_rawip_kmux()"); + interface = setup_rawip_kmux(gc); + } + else { + ofono_info("Calling setup_rawip_internal()"); + interface = setup_rawip_internal(gc); + } if (interface == NULL) interface = "invalid"; @@ -436,7 +495,9 @@ static int ifx_gprs_context_probe(struct ofono_gprs_context *gc, unsigned int vendor, void *data) { GAtChat *chat = data; + const char *ldisc; struct gprs_context_data *gcd; + struct ofono_modem *modem; struct stat st; DBG(""); @@ -455,6 +516,19 @@ static int ifx_gprs_context_probe(struct ofono_gprs_context *gc, gcd->chat = g_at_chat_clone(chat); + modem = ofono_gprs_context_get_modem(gc); + ldisc = ofono_modem_get_string(modem, "LineDiscipline"); + + ofono_info("Got LineDiscipline variable from udev: %s", ldisc); + if (ldisc != NULL) { + ofono_info("setting up to use kernel mux for data"); + gcd->use_ofono_mux = FALSE; + } + else { + ofono_info("setting up to use user space mux for data"); + gcd->use_ofono_mux = TRUE; + } + ofono_gprs_context_set_data(gc, gcd); chat = g_at_chat_get_slave(gcd->chat); @@ -475,6 +549,10 @@ static void ifx_gprs_context_remove(struct ofono_gprs_context *gc) g_at_chat_resume(gcd->chat); } + if (gcd->state != STATE_IDLE && gcd->use_ofono_mux == FALSE) { + g_at_chat_resume(gcd->chat); + } + ofono_gprs_context_set_data(gc, NULL); g_at_chat_unref(gcd->chat); diff --git a/plugins/ifx.c b/plugins/ifx.c index 411c012..9e7c910 100644 --- a/plugins/ifx.c +++ b/plugins/ifx.c @@ -26,8 +26,10 @@ #include <stdio.h> #include <errno.h> #include <stdlib.h> +#include <string.h> #include <sys/stat.h> #include <sys/ioctl.h> +#include <linux/types.h> #include <glib.h> #include <gatchat.h> @@ -75,13 +77,31 @@ static char *dlc_prefixes[NUM_DLC] = { "Voice: ", "Net: ", "GPRS1: ", "GPRS2: ", "GPRS3: ", "Aux: " }; -static const char *dlc_nodes[NUM_DLC] = { "/dev/ttyGSM1", "/dev/ttyGSM2", - "/dev/ttyGSM3", "/dev/ttyGSM4", - "/dev/ttyGSM5", "/dev/ttyGSM6" }; +static const char *dlc_nodes[NUM_DLC] = { "/dev/gsmtty1", "/dev/gsmtty2", + "/dev/gsmtty3", "/dev/gsmtty4", + "/dev/gsmtty5", "/dev/gsmtty6" }; static const char *none_prefix[] = { NULL }; static const char *xdrv_prefix[] = { "+XDRV:", NULL }; +struct gsm_config { + unsigned int adaption; + unsigned int encapsulation; + unsigned int initiator; + unsigned int t1; + unsigned int t2; + unsigned int t3; + unsigned int n2; + unsigned int mru; + unsigned int mtu; + unsigned int k; + unsigned int i; + unsigned int unused[8]; /* padding */ +}; + +#define GSMIOC_GETCONF _IOR('G', 0, struct gsm_config) +#define GSMIOC_SETCONF _IOW('G', 1, struct gsm_config) + struct ifx_data { GIOChannel *device; GAtMux *mux; @@ -471,6 +491,8 @@ static void mux_setup_cb(gboolean ok, GAtResult *result, gpointer user_data) { struct ofono_modem *modem = user_data; struct ifx_data *data = ofono_modem_get_data(modem); + int ret; + struct gsm_config cfg; int fd; DBG(""); @@ -504,6 +526,34 @@ static void mux_setup_cb(gboolean ok, GAtResult *result, gpointer user_data) goto error; } + memset(&cfg, 0, sizeof(struct gsm_config)); + + if ((ret = ioctl(fd, GSMIOC_GETCONF, &cfg)) < 0) { + ofono_error("Failed to get configuration on n_gsm multiplexer: %d", ret); + goto error; + } + + ofono_info("Got default configuration..."); + ofono_info("adaption = %d", cfg.adaption); + ofono_info("encapsulation = %d", cfg.encapsulation); + ofono_info("initiator = %d", cfg.initiator); + ofono_info("t1 = %d", cfg.t1); + ofono_info("t2 = %d", cfg.t2); + ofono_info("t3 = %d", cfg.t3); + ofono_info("n2 = %d", cfg.n2); + ofono_info("mru = %d", cfg.mru); + ofono_info("mtu = %d", cfg.mtu); + ofono_info("k = %d", cfg.k); + + cfg.encapsulation = 0; /* encoding - set to basic */ + cfg.initiator = 1; /* we are starting side */ + cfg.mru = 1509; + cfg.mtu = 1509; + if ((ret = ioctl(fd, GSMIOC_SETCONF, &cfg)) < 0) { + ofono_error("Failed to configure n_gsm multiplexer: %d", ret); + goto error; + } + data->dlc_poll_count = 0; data->dlc_poll_source = g_timeout_add_seconds(1, dlc_ready_check, modem); @@ -661,10 +711,14 @@ static void ifx_set_online(struct ofono_modem *modem, ofono_bool_t online, DBG("%p %s", modem, online ? "online" : "offline"); + if (cbd == NULL) + goto error; + if (g_at_chat_send(data->dlcs[AUX_DLC], command, NULL, set_online_cb, cbd, g_free) > 0) return; +error: g_free(cbd); CALLBACK_WITH_FAILURE(cb, cbd->data); @@ -726,26 +780,34 @@ static void ifx_post_online(struct ofono_modem *modem) if (mw) ofono_message_waiting_register(mw); + ofono_warn("Creating GPRS"); gprs = ofono_gprs_create(modem, OFONO_VENDOR_IFX, "atmodem", data->dlcs[NETREG_DLC]); if (gprs == NULL) return; - if (data->mux_ldisc < 0) { - gc = ofono_gprs_context_create(modem, 0, + ofono_warn("Creating GPRS context"); + gc = ofono_gprs_context_create(modem, 0, "ifxmodem", data->dlcs[GPRS1_DLC]); - if (gc) - ofono_gprs_add_context(gprs, gc); + if (gc) { + ofono_warn("Adding GPRS context"); + ofono_gprs_add_context(gprs, gc); + } - gc = ofono_gprs_context_create(modem, 0, + ofono_warn("Creaing 2nd GPRS context"); + gc = ofono_gprs_context_create(modem, 0, "ifxmodem", data->dlcs[GPRS2_DLC]); - if (gc) - ofono_gprs_add_context(gprs, gc); + if (gc) { + ofono_warn("Adding 2nd GPRS context"); + ofono_gprs_add_context(gprs, gc); + } - gc = ofono_gprs_context_create(modem, 0, + ofono_warn("Creaing 3nd GPRS context"); + gc = ofono_gprs_context_create(modem, 0, "ifxmodem", data->dlcs[GPRS3_DLC]); - if (gc) - ofono_gprs_add_context(gprs, gc); + if (gc) { + ofono_warn("Adding 3nd GPRS context"); + ofono_gprs_add_context(gprs, gc); } } -- 1.7.1