Merge lp:~binli/ubuntu/wily/modemmanager/lp1441095 into lp:ubuntu/wily/modemmanager

[Bin Li]

Support the MBIM for Dell.

Cherry picked some patches from git master branch to 1.4.

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine. I don't have any of these devices, so I can only defer to the testing that was done by Bin Li and upstream developers.

review: Approve

[Bin Li (binli)]

Mathieu,

 Thanks for your review, I just tested it on trusty with EM7305, we need Taipei team which had the 3G device by hand to verify it, and they found the patches did not work for another new device(EM7455), so please postpone the release for wily.

 And Shih-Yuan Lee <email address hidden> and I will continue to work on it.

Thanks!

review: Needs Fixing

[Mathieu Trudel-Lapierre (cyphermox)]

This has been merged into wily already.

=== removed file '.pc/applied-patches'
=== modified file 'debian/changelog'
--- debian/changelog	2015-07-26 20:43:23 +0000
+++ debian/changelog	2015-09-15 09:59:59 +0000
@@ -1,3 +1,9 @@
+modemmanager (1.4.10-2) UNRELEASED; urgency=medium
+
+  * Support the MBIM for Dell. (LP: #1441943)
+
+ -- Bin Li <[e-mail]>  Tue, 15 Sep 2015 17:39:10 +0800
+
 modemmanager (1.4.10-1) unstable; urgency=medium
 
   * New upstream release.

=== added file 'debian/patches/dell-mbim-plugin.patch'
--- debian/patches/dell-mbim-plugin.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/dell-mbim-plugin.patch	2015-09-15 09:59:59 +0000
@@ -0,0 +1,569 @@
+commit 93d6e4f102da51e72ecd2fbfcfa096cd2fd2e02e
+Author: Aleksander Morgado <[e-mail]>
+Date:   Fri Feb 6 16:35:52 2015 +0100
+
+    dell: new Dell plugin
+    
+    For Dell-branded Novatel, Sierra and Ericsson modems.
+    
+    The Novatel plugin will no longer accept every Dell-branded modem, which was
+    the current situation. Instead, a new Dell plugin will take care of probing for
+    the correct vendor string, and based on the results create a specific Novatel,
+    Sierra or Ericsson modem.
+    
+    In order to properly support this, the Novatel, Sierra and MBM plugins now
+    export their implementations into non-inst libraries that the Dell plugin will
+    import.
+    
+    Also, for now, the Dell plugin doesn't make any difference between e.g. Sierra
+    or Ericsson MBIM implementations, just a generic MBIM modem is created in both
+    cases, as that is anyway what the Ericsson MBM and Sierra plugins do already.
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=86713
+
+Index: modemmanager/plugins/Makefile.am
+===================================================================
+--- modemmanager.orig/plugins/Makefile.am
++++ modemmanager/plugins/Makefile.am
+@@ -128,6 +128,7 @@ pkglib_LTLIBRARIES = \
+ 	libmm-plugin-motorola.la \
+ 	libmm-plugin-novatel.la \
+ 	libmm-plugin-novatel-lte.la \
++	libmm-plugin-dell.la \
+ 	libmm-plugin-altair-lte.la \
+ 	libmm-plugin-samsung.la \
+ 	libmm-plugin-option.la \
+@@ -504,6 +505,14 @@ libmm_plugin_novatel_la_CPPFLAGS = $(PLU
+ libmm_plugin_novatel_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+ libmm_plugin_novatel_la_LIBADD = $(NOVATEL_COMMON_LIBADD_FLAGS)
+ 
++# Dell (e.g. Novatel or Sierra) modem
++libmm_plugin_dell_la_SOURCES = \
++	dell/mm-plugin-dell.c \
++	dell/mm-plugin-dell.h
++libmm_plugin_dell_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(NOVATEL_COMMON_COMPILER_FLAGS) $(SIERRA_COMMON_COMPILER_FLAGS) $(MBM_COMMON_COMPILER_FLAGS)
++libmm_plugin_dell_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
++libmm_plugin_dell_la_LIBADD = $(NOVATEL_COMMON_LIBADD_FLAGS) $(SIERRA_COMMON_LIBADD_FLAGS) $(MBM_COMMON_LIBADD_FLAGS)
++
+ # Altair LTE modem
+ libmm_plugin_altair_lte_la_SOURCES = \
+ 	altair/mm-modem-helpers-altair-lte.c \
+Index: modemmanager/plugins/dell/mm-plugin-dell.c
+===================================================================
+--- /dev/null
++++ modemmanager/plugins/dell/mm-plugin-dell.c
+@@ -0,0 +1,448 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++
++/*
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this program; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ *
++ * Copyright (C) 2015 Aleksander Morgado <[e-mail]>
++ */
++
++#include <string.h>
++#include <gmodule.h>
++
++#define _LIBMM_INSIDE_MM
++#include <libmm-glib.h>
++
++#include "mm-plugin-dell.h"
++#include "mm-common-novatel.h"
++#include "mm-private-boxed-types.h"
++#include "mm-broadband-modem.h"
++#include "mm-broadband-modem-novatel.h"
++#include "mm-common-novatel.h"
++#include "mm-broadband-modem-sierra.h"
++#include "mm-common-sierra.h"
++#include "mm-log.h"
++
++#if defined WITH_QMI
++#include "mm-broadband-modem-qmi.h"
++#endif
++
++#if defined WITH_MBIM
++#include "mm-broadband-modem-mbim.h"
++#endif
++
++G_DEFINE_TYPE (MMPluginDell, mm_plugin_dell, MM_TYPE_PLUGIN)
++
++int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
++int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
++
++#define TAG_DELL_MANUFACTURER   "dell-manufacturer"
++typedef enum {
++    DELL_MANUFACTURER_UNKNOWN  = 0,
++    DELL_MANUFACTURER_NOVATEL  = 1,
++    DELL_MANUFACTURER_SIERRA   = 2,
++    DELL_MANUFACTURER_ERICSSON = 3
++} DellManufacturer;
++
++/*****************************************************************************/
++/* Custom init */
++
++typedef struct {
++    MMPortProbe *probe;
++    MMPortSerialAt *port;
++    GCancellable *cancellable;
++    GSimpleAsyncResult *result;
++    guint gmi_retries;
++    guint cgmi_retries;
++    guint ati_retries;
++} CustomInitContext;
++
++static void
++custom_init_context_complete_and_free (CustomInitContext *ctx)
++{
++    g_simple_async_result_complete_in_idle (ctx->result);
++
++    if (ctx->cancellable)
++        g_object_unref (ctx->cancellable);
++    g_object_unref (ctx->port);
++    g_object_unref (ctx->probe);
++    g_object_unref (ctx->result);
++    g_slice_free (CustomInitContext, ctx);
++}
++
++static gboolean
++dell_custom_init_finish (MMPortProbe *probe,
++                         GAsyncResult *result,
++                         GError **error)
++{
++    return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error);
++}
++
++static void
++novatel_custom_init_ready (MMPortProbe       *probe,
++                           GAsyncResult      *res,
++                           CustomInitContext *ctx)
++{
++    GError *error = NULL;
++
++    if (!mm_common_novatel_custom_init_finish (probe, res, &error))
++        g_simple_async_result_take_error (ctx->result, error);
++    else
++        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++    custom_init_context_complete_and_free (ctx);
++}
++
++static void
++sierra_custom_init_ready (MMPortProbe       *probe,
++                          GAsyncResult      *res,
++                          CustomInitContext *ctx)
++{
++    GError *error = NULL;
++
++    if (!mm_common_sierra_custom_init_finish (probe, res, &error))
++        g_simple_async_result_take_error (ctx->result, error);
++    else
++        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++    custom_init_context_complete_and_free (ctx);
++}
++
++static void custom_init_step (CustomInitContext *ctx);
++
++static void
++custom_init_step_next_command (CustomInitContext *ctx)
++{
++    if (ctx->gmi_retries > 0)
++        ctx->gmi_retries = 0;
++    else if (ctx->cgmi_retries > 0)
++        ctx->cgmi_retries = 0;
++    else if (ctx->ati_retries > 0)
++        ctx->ati_retries = 0;
++    custom_init_step (ctx);
++}
++
++static void
++response_ready (MMPortSerialAt *port,
++                GAsyncResult *res,
++                CustomInitContext *ctx)
++{
++    const gchar *response;
++    GError *error = NULL;
++    gchar *lower;
++    DellManufacturer manufacturer;
++
++    response = mm_port_serial_at_command_finish (port, res, &error);
++    if (error) {
++        /* Non-timeout error, jump to next command */
++        if (!g_error_matches (error, MM_SERIAL_ERROR, MM_SERIAL_ERROR_RESPONSE_TIMEOUT)) {
++            mm_dbg ("(Dell) Error probing AT port: %s", error->message);
++            g_error_free (error);
++            custom_init_step_next_command (ctx);
++            return;
++        }
++        /* Directly retry same command on timeout */
++        custom_init_step (ctx);
++        g_error_free (error);
++        return;
++    }
++
++    /* Guess manufacturer from response */
++    lower = g_ascii_strdown (response, -1);
++    if (strstr (lower, "novatel"))
++        manufacturer = DELL_MANUFACTURER_NOVATEL;
++    else if (strstr (lower, "sierra"))
++        manufacturer = DELL_MANUFACTURER_SIERRA;
++    else if (strstr (lower, "ericsson"))
++        manufacturer = DELL_MANUFACTURER_ERICSSON;
++    else
++        manufacturer = DELL_MANUFACTURER_UNKNOWN;
++    g_free (lower);
++
++    /* Tag based on manufacturer */
++    if (manufacturer != DELL_MANUFACTURER_UNKNOWN) {
++        g_object_set_data (G_OBJECT (ctx->probe), TAG_DELL_MANUFACTURER, GUINT_TO_POINTER (manufacturer));
++
++        /* Run additional custom init, if needed */
++
++        if (manufacturer == DELL_MANUFACTURER_NOVATEL) {
++            mm_common_novatel_custom_init (ctx->probe,
++                                           ctx->port,
++                                           ctx->cancellable,
++                                           (GAsyncReadyCallback) novatel_custom_init_ready,
++                                           ctx);
++            return;
++        }
++
++        if (manufacturer == DELL_MANUFACTURER_SIERRA) {
++            mm_common_sierra_custom_init (ctx->probe,
++                                          ctx->port,
++                                          ctx->cancellable,
++                                          (GAsyncReadyCallback) sierra_custom_init_ready,
++                                          ctx);
++            return;
++        }
++
++        /* Finish custom_init */
++        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++        custom_init_context_complete_and_free (ctx);
++        return;
++    }
++
++    /* If we got a response, but we didn't get an expected string, try with next command */
++    custom_init_step_next_command (ctx);
++}
++
++static void
++custom_init_step (CustomInitContext *ctx)
++{
++    /* If cancelled, end */
++    if (g_cancellable_is_cancelled (ctx->cancellable)) {
++        mm_dbg ("(Dell) no need to keep on running custom init in (%s)",
++                mm_port_get_device (MM_PORT (ctx->port)));
++        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++        custom_init_context_complete_and_free (ctx);
++        return;
++    }
++
++#if defined WITH_QMI
++    /* If device has a QMI port, don't run anything else, as we don't care */
++    if (mm_port_probe_list_has_qmi_port (mm_device_peek_port_probe_list (mm_port_probe_peek_device (ctx->probe)))) {
++        mm_dbg ("(Dell) no need to run custom init in (%s): device has QMI port",
++                mm_port_get_device (MM_PORT (ctx->port)));
++        mm_port_probe_set_result_at (ctx->probe, FALSE);
++        mm_port_probe_set_result_qcdm (ctx->probe, FALSE);
++        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++        custom_init_context_complete_and_free (ctx);
++        return;
++    }
++#endif
++
++#if defined WITH_MBIM
++    /* If device has a MBIM port, don't run anything else, as we don't care */
++    if (mm_port_probe_list_has_mbim_port (mm_device_peek_port_probe_list (mm_port_probe_peek_device (ctx->probe)))) {
++        mm_dbg ("(Dell) no need to run custom init in (%s): device has MBIM port",
++                mm_port_get_device (MM_PORT (ctx->port)));
++        mm_port_probe_set_result_at (ctx->probe, FALSE);
++        mm_port_probe_set_result_qcdm (ctx->probe, FALSE);
++        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++        custom_init_context_complete_and_free (ctx);
++        return;
++    }
++#endif
++
++    if (ctx->gmi_retries > 0) {
++        ctx->gmi_retries--;
++        mm_port_serial_at_command (ctx->port,
++                                   "AT+GMI",
++                                   3,
++                                   FALSE, /* raw */
++                                   FALSE, /* allow_cached */
++                                   ctx->cancellable,
++                                   (GAsyncReadyCallback)response_ready,
++                                   ctx);
++        return;
++    }
++
++    if (ctx->cgmi_retries > 0) {
++        ctx->cgmi_retries--;
++        mm_port_serial_at_command (ctx->port,
++                                   "AT+CGMI",
++                                   3,
++                                   FALSE, /* raw */
++                                   FALSE, /* allow_cached */
++                                   ctx->cancellable,
++                                   (GAsyncReadyCallback)response_ready,
++                                   ctx);
++        return;
++    }
++
++    if (ctx->ati_retries > 0) {
++        ctx->ati_retries--;
++        /* Note: in Ericsson devices, ATI3 seems to reply the vendor string */
++        mm_port_serial_at_command (ctx->port,
++                                   "ATI1I2I3",
++                                   3,
++                                   FALSE, /* raw */
++                                   FALSE, /* allow_cached */
++                                   ctx->cancellable,
++                                   (GAsyncReadyCallback)response_ready,
++                                   ctx);
++        return;
++    }
++
++    /* Finish custom_init */
++    mm_dbg ("(Dell) couldn't flip secondary port to AT in (%s): all retries consumed",
++            mm_port_get_device (MM_PORT (ctx->port)));
++    g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++    custom_init_context_complete_and_free (ctx);
++}
++
++static void
++dell_custom_init (MMPortProbe *probe,
++                  MMPortSerialAt *port,
++                  GCancellable *cancellable,
++                  GAsyncReadyCallback callback,
++                  gpointer user_data)
++{
++    CustomInitContext *ctx;
++
++    ctx = g_slice_new (CustomInitContext);
++    ctx->result = g_simple_async_result_new (G_OBJECT (probe),
++                                             callback,
++                                             user_data,
++                                             dell_custom_init);
++    ctx->probe = g_object_ref (probe);
++    ctx->port = g_object_ref (port);
++    ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
++    ctx->gmi_retries = 3;
++    ctx->ati_retries = 3;
++
++    custom_init_step (ctx);
++}
++
++/*****************************************************************************/
++
++static gboolean
++port_probe_list_has_manufacturer_port (GList *probes,
++                                       DellManufacturer manufacturer)
++{
++    GList *l;
++
++    for (l = probes; l; l = g_list_next (l)) {
++        if (GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (l->data), TAG_DELL_MANUFACTURER)) == manufacturer)
++            return TRUE;
++    }
++    return FALSE;
++}
++
++static MMBaseModem *
++create_modem (MMPlugin *self,
++              const gchar *sysfs_path,
++              const gchar **drivers,
++              guint16 vendor,
++              guint16 product,
++              GList *probes,
++              GError **error)
++{
++    /* Note: at this point we don't make any difference between different
++     * Dell-branded QMI or MBIM modems; they may come from Novatel, Ericsson or
++     * Sierra. */
++
++#if defined WITH_QMI
++    if (mm_port_probe_list_has_qmi_port (probes)) {
++        mm_dbg ("QMI-powered Dell-branded modem found...");
++        return MM_BASE_MODEM (mm_broadband_modem_qmi_new (sysfs_path,
++                                                          drivers,
++                                                          mm_plugin_get_name (self),
++                                                          vendor,
++                                                          product));
++    }
++#endif
++
++#if defined WITH_MBIM
++    if (mm_port_probe_list_has_mbim_port (probes)) {
++        mm_dbg ("MBIM-powered Dell-branded modem found...");
++        return MM_BASE_MODEM (mm_broadband_modem_mbim_new (sysfs_path,
++                                                           drivers,
++                                                           mm_plugin_get_name (self),
++                                                           vendor,
++                                                           product));
++    }
++#endif
++
++    if (port_probe_list_has_manufacturer_port (probes, DELL_MANUFACTURER_NOVATEL)) {
++        mm_dbg ("Novatel-powered Dell-branded modem found...");
++        return MM_BASE_MODEM (mm_broadband_modem_novatel_new (sysfs_path,
++                                                              drivers,
++                                                              mm_plugin_get_name (self),
++                                                              vendor,
++                                                              product));
++    }
++
++    if (port_probe_list_has_manufacturer_port (probes, DELL_MANUFACTURER_SIERRA)) {
++        mm_dbg ("Sierra-powered Dell-branded modem found...");
++        return MM_BASE_MODEM (mm_broadband_modem_sierra_new (sysfs_path,
++                                                             drivers,
++                                                             mm_plugin_get_name (self),
++                                                             vendor,
++                                                             product));
++    }
++
++    mm_dbg ("Dell-branded generic modem found...");
++    return MM_BASE_MODEM (mm_broadband_modem_new (sysfs_path,
++                                                  drivers,
++                                                  mm_plugin_get_name (self),
++                                                  vendor,
++                                                  product));
++}
++
++/*****************************************************************************/
++
++static gboolean
++grab_port (MMPlugin *self,
++           MMBaseModem *modem,
++           MMPortProbe *probe,
++           GError **error)
++{
++    /* Only Sierra needs custom grab port, due to the port type hints */
++    if (MM_IS_BROADBAND_MODEM_SIERRA (modem))
++        return mm_common_sierra_grab_port (self, modem, probe, error);
++
++    return mm_base_modem_grab_port (modem,
++                                    mm_port_probe_get_port_subsys (probe),
++                                    mm_port_probe_get_port_name (probe),
++                                    mm_port_probe_get_parent_path (probe),
++                                    mm_port_probe_get_port_type (probe),
++                                    MM_PORT_SERIAL_AT_FLAG_NONE,
++                                    error);
++}
++
++/*****************************************************************************/
++
++G_MODULE_EXPORT MMPlugin *
++mm_plugin_create (void)
++{
++    static const gchar *subsystems[] = { "tty", "net", "usb", NULL };
++    static const guint16 vendors[] = { 0x413c, 0 };
++    static const MMAsyncMethod custom_init = {
++        .async  = G_CALLBACK (dell_custom_init),
++        .finish = G_CALLBACK (dell_custom_init_finish),
++    };
++
++    return MM_PLUGIN (
++        g_object_new (MM_TYPE_PLUGIN_DELL,
++                      MM_PLUGIN_NAME,                  "Dell",
++                      MM_PLUGIN_ALLOWED_SUBSYSTEMS,    subsystems,
++                      MM_PLUGIN_ALLOWED_VENDOR_IDS,    vendors,
++                      MM_PLUGIN_ALLOWED_AT,            TRUE,
++                      MM_PLUGIN_CUSTOM_INIT,           &custom_init,
++                      MM_PLUGIN_ALLOWED_QCDM,          TRUE,
++                      MM_PLUGIN_ALLOWED_QMI,           TRUE,
++                      MM_PLUGIN_ALLOWED_MBIM,          TRUE,
++                      NULL));
++}
++
++static void
++mm_plugin_dell_init (MMPluginDell *self)
++{
++}
++
++static void
++mm_plugin_dell_class_init (MMPluginDellClass *klass)
++{
++    MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
++
++    plugin_class->create_modem = create_modem;
++    plugin_class->grab_port    = grab_port;
++}
+Index: modemmanager/plugins/dell/mm-plugin-dell.h
+===================================================================
+--- /dev/null
++++ modemmanager/plugins/dell/mm-plugin-dell.h
+@@ -0,0 +1,46 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++
++/*
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this program; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ *
++ * Copyright (C) 2015 Aleksander Morgado <[e-mail]>
++ */
++
++#ifndef MM_PLUGIN_DELL_H
++#define MM_PLUGIN_DELL_H
++
++#include "mm-plugin.h"
++
++#define MM_TYPE_PLUGIN_DELL            (mm_plugin_dell_get_type ())
++#define MM_PLUGIN_DELL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_DELL, MMPluginDell))
++#define MM_PLUGIN_DELL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_PLUGIN_DELL, MMPluginDellClass))
++#define MM_IS_PLUGIN_DELL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_DELL))
++#define MM_IS_PLUGIN_DELL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_PLUGIN_DELL))
++#define MM_PLUGIN_DELL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_PLUGIN_DELL, MMPluginDellClass))
++
++typedef struct {
++    MMPlugin parent;
++} MMPluginDell;
++
++typedef struct {
++    MMPluginClass parent;
++} MMPluginDellClass;
++
++GType mm_plugin_dell_get_type (void);
++
++G_MODULE_EXPORT MMPlugin *mm_plugin_create (void);
++
++#endif /* MM_PLUGIN_DELL_H */
+Index: modemmanager/plugins/novatel/mm-plugin-novatel.c
+===================================================================
+--- modemmanager.orig/plugins/novatel/mm-plugin-novatel.c
++++ modemmanager/plugins/novatel/mm-plugin-novatel.c
+@@ -90,9 +90,7 @@ G_MODULE_EXPORT MMPlugin *
+ mm_plugin_create (void)
+ {
+     static const gchar *subsystems[] = { "tty", "net", "usb", NULL };
+-    static const guint16 vendors[] = { 0x1410, /* Novatel */
+-                                       0x413c, /* Dell */
+-                                       0 };
++    static const guint16 vendors[] = { 0x1410, 0 };
+     static const mm_uint16_pair forbidden_products[] = { { 0x1410, 0x9010 }, /* Novatel E362 */
+                                                          { 0, 0 } };
+     static const MMAsyncMethod custom_init = {

=== added file 'debian/patches/mbm-common-library.patch'
--- debian/patches/mbm-common-library.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/mbm-common-library.patch	2015-09-15 09:59:59 +0000
@@ -0,0 +1,46 @@
+commit 5a268430c4c89e21d977403ec764c59b86498af8
+Author: Aleksander Morgado <[e-mail]>
+Date:   Fri Feb 6 17:11:52 2015 +0100
+
+    mbm: build a common non-inst library with the core Ericsson modem support
+
+Index: modemmanager/plugins/Makefile.am
+===================================================================
+--- modemmanager.orig/plugins/Makefile.am
++++ modemmanager/plugins/Makefile.am
+@@ -212,10 +212,9 @@ test_modem_helpers_huawei_LDADD = \
+        $(top_builddir)/src/libmodem-helpers.la
+ test_modem_helpers_huawei_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+ 
+-# MBM
+-libmm_plugin_mbm_la_SOURCES = \
+-	mbm/mm-plugin-mbm.c \
+-	mbm/mm-plugin-mbm.h \
++# Common Mbm modem support library
++noinst_LTLIBRARIES += libmm-utils-mbm.la
++libmm_utils_mbm_la_SOURCES = \
+ 	mbm/mm-broadband-modem-mbm.c \
+ 	mbm/mm-broadband-modem-mbm.h \
+ 	mbm/mm-broadband-bearer-mbm.c \
+@@ -224,8 +223,20 @@ libmm_plugin_mbm_la_SOURCES = \
+ 	mbm/mm-modem-helpers-mbm.h \
+ 	mbm/mm-sim-mbm.c \
+ 	mbm/mm-sim-mbm.h
+-libmm_plugin_mbm_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
++libmm_utils_mbm_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
++libmm_utils_mbm_la_LIBADD = $(GUDEV_LIBS) $(MM_LIBS)
++
++MBM_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/mbm
++MBM_COMMON_LIBADD_FLAGS = $(builddir)/libmm-utils-mbm.la
++
++# MBM
++libmm_plugin_mbm_la_SOURCES = \
++	mbm/mm-plugin-mbm.c \
++	mbm/mm-plugin-mbm.h
++libmm_plugin_mbm_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(MBM_COMMON_COMPILER_FLAGS)
+ libmm_plugin_mbm_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
++libmm_plugin_mbm_la_LIBADD = $(MBM_COMMON_LIBADD_FLAGS)
++
+ udevrules_DATA += mbm/77-mm-ericsson-mbm.rules
+ 
+ noinst_PROGRAMS += test-modem-helpers-mbm

=== added file 'debian/patches/new-sierra-legacy-plugin.patch'
--- debian/patches/new-sierra-legacy-plugin.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/new-sierra-legacy-plugin.patch	2015-09-15 09:59:59 +0000
@@ -0,0 +1,291 @@
+commit 6bbc4c1746c9e7c48e12dcb1e1986f1e16327161
+Author: Aleksander Morgado <[e-mail]>
+Date:   Fri Feb 6 20:02:20 2015 +0100
+
+    sierra: move all the legacy Sierra support to a new 'sierra-legacy' plugin
+    
+    In short:
+    
+      * The 'sierra-legacy' plugin will handle all the old AT based modems,
+        including the DirectIP ones. This plugin is filtered by driver ('sierra' or
+        'sierra_net') and forbidden-drivers ('qmi_wwan' and 'cdc_mbim'). This plugin
+        should also grab HP and AT&T branded models if they are handled by the
+        proper kernel driver.
+    
+      * The 'sierra' plugin will only handle QMI or MBIM based Sierra modems, which
+        are really all the new ones. This plugin is filtered by VID (0x1199) and
+        driver (qmi_wwan and cdc_mbim).
+    
+    For this separation to work, the 'sierra' and 'sierra_net' plugins need to be
+    complementary to each other.
+
+Index: modemmanager/plugins/Makefile.am
+===================================================================
+--- modemmanager.orig/plugins/Makefile.am
++++ modemmanager/plugins/Makefile.am
+@@ -142,6 +142,7 @@ pkglib_LTLIBRARIES = \
+ 	libmm-plugin-pantech.la \
+ 	libmm-plugin-zte.la \
+ 	libmm-plugin-sierra.la \
++	libmm-plugin-sierra-legacy.la \
+ 	libmm-plugin-mbm.la \
+ 	libmm-plugin-via.la \
+ 	libmm-plugin-telit.la \
+@@ -291,15 +292,22 @@ libmm_utils_sierra_la_LIBADD = $(GUDEV_L
+ SIERRA_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/sierra
+ SIERRA_COMMON_LIBADD_FLAGS = $(builddir)/libmm-utils-sierra.la
+ 
+-# Sierra
++# Sierra (new QMI or MBIM modems)
+ libmm_plugin_sierra_la_SOURCES = \
+ 	sierra/mm-plugin-sierra.c \
+-	sierra/mm-plugin-sierra.h \
++	sierra/mm-plugin-sierra.h
++libmm_plugin_sierra_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
++libmm_plugin_sierra_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
++
++# Sierra (legacy)
++libmm_plugin_sierra_legacy_la_SOURCES = \
++	sierra/mm-plugin-sierra-legacy.c \
++	sierra/mm-plugin-sierra-legacy.h \
+ 	sierra/mm-broadband-modem-sierra-icera.c \
+ 	sierra/mm-broadband-modem-sierra-icera.h
+-libmm_plugin_sierra_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS) $(SIERRA_COMMON_COMPILER_FLAGS)
+-libmm_plugin_sierra_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+-libmm_plugin_sierra_la_LIBADD = $(ICERA_COMMON_LIBADD_FLAGS) $(SIERRA_COMMON_LIBADD_FLAGS)
++libmm_plugin_sierra_legacy_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS) $(SIERRA_COMMON_COMPILER_FLAGS)
++libmm_plugin_sierra_legacy_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
++libmm_plugin_sierra_legacy_la_LIBADD = $(ICERA_COMMON_LIBADD_FLAGS) $(SIERRA_COMMON_LIBADD_FLAGS)
+ 
+ # Wavecom (Sierra Airlink)
+ libmm_plugin_wavecom_la_SOURCES = \
+Index: modemmanager/plugins/sierra/mm-plugin-sierra-legacy.c
+===================================================================
+--- /dev/null
++++ modemmanager/plugins/sierra/mm-plugin-sierra-legacy.c
+@@ -0,0 +1,99 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details:
++ *
++ * Copyright (C) 2008 - 2009 Novell, Inc.
++ * Copyright (C) 2009 - 2012 Red Hat, Inc.
++ * Copyright (C) 2012 Lanedo GmbH
++ * Copyright (C) 2015 Aleksander Morgado <[e-mail]>
++ */
++
++#include <stdlib.h>
++#include <gmodule.h>
++
++#define _LIBMM_INSIDE_MM
++#include <libmm-glib.h>
++
++#include "mm-log.h"
++#include "mm-plugin-sierra-legacy.h"
++#include "mm-common-sierra.h"
++#include "mm-broadband-modem-sierra.h"
++#include "mm-broadband-modem-sierra-icera.h"
++
++G_DEFINE_TYPE (MMPluginSierraLegacy, mm_plugin_sierra_legacy, MM_TYPE_PLUGIN)
++
++int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
++int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
++
++/*****************************************************************************/
++
++static MMBaseModem *
++create_modem (MMPlugin *self,
++              const gchar *sysfs_path,
++              const gchar **drivers,
++              guint16 vendor,
++              guint16 product,
++              GList *probes,
++              GError **error)
++{
++    if (mm_common_sierra_port_probe_list_is_icera (probes))
++        return MM_BASE_MODEM (mm_broadband_modem_sierra_icera_new (sysfs_path,
++                                                                   drivers,
++                                                                   mm_plugin_get_name (self),
++                                                                   vendor,
++                                                                   product));
++
++    return MM_BASE_MODEM (mm_broadband_modem_sierra_new (sysfs_path,
++                                                         drivers,
++                                                         mm_plugin_get_name (self),
++                                                         vendor,
++                                                         product));
++}
++
++/*****************************************************************************/
++
++G_MODULE_EXPORT MMPlugin *
++mm_plugin_create (void)
++{
++    static const gchar *subsystems[] = { "tty", "net", NULL };
++    static const gchar *drivers[] = { "sierra", "sierra_net", NULL };
++    static const gchar *forbidden_drivers[] = { "qmi_wwan", "cdc_mbim", NULL };
++    static const MMAsyncMethod custom_init = {
++        .async  = G_CALLBACK (mm_common_sierra_custom_init),
++        .finish = G_CALLBACK (mm_common_sierra_custom_init_finish),
++    };
++
++    return MM_PLUGIN (
++        g_object_new (MM_TYPE_PLUGIN_SIERRA_LEGACY,
++                      MM_PLUGIN_NAME,                "Sierra (legacy)",
++                      MM_PLUGIN_ALLOWED_SUBSYSTEMS,  subsystems,
++                      MM_PLUGIN_ALLOWED_DRIVERS,     drivers,
++                      MM_PLUGIN_FORBIDDEN_DRIVERS,   forbidden_drivers,
++                      MM_PLUGIN_ALLOWED_AT,          TRUE,
++                      MM_PLUGIN_CUSTOM_INIT,         &custom_init,
++                      MM_PLUGIN_ICERA_PROBE,         TRUE,
++                      MM_PLUGIN_REMOVE_ECHO,         FALSE,
++                      NULL));
++}
++
++static void
++mm_plugin_sierra_legacy_init (MMPluginSierraLegacy *self)
++{
++}
++
++static void
++mm_plugin_sierra_legacy_class_init (MMPluginSierraLegacyClass *klass)
++{
++    MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
++
++    plugin_class->create_modem = create_modem;
++    plugin_class->grab_port = mm_common_sierra_grab_port;
++}
+Index: modemmanager/plugins/sierra/mm-plugin-sierra-legacy.h
+===================================================================
+--- /dev/null
++++ modemmanager/plugins/sierra/mm-plugin-sierra-legacy.h
+@@ -0,0 +1,40 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details:
++ *
++ * Copyright (C) 2015 Aleksander Morgado <[e-mail]>
++ */
++
++#ifndef MM_PLUGIN_SIERRA_LEGACY_H
++#define MM_PLUGIN_SIERRA_LEGACY_H
++
++#include "mm-plugin.h"
++
++#define MM_TYPE_PLUGIN_SIERRA_LEGACY            (mm_plugin_sierra_legacy_get_type ())
++#define MM_PLUGIN_SIERRA_LEGACY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_SIERRA_LEGACY, MMPluginSierraLegacy))
++#define MM_PLUGIN_SIERRA_LEGACY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_PLUGIN_SIERRA_LEGACY, MMPluginSierraLegacyClass))
++#define MM_IS_PLUGIN_SIERRA_LEGACY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_SIERRA_LEGACY))
++#define MM_IS_PLUGIN_SIERRA_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_PLUGIN_SIERRA_LEGACY))
++#define MM_PLUGIN_SIERRA_LEGACY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_PLUGIN_SIERRA_LEGACY, MMPluginSierraLegacyClass))
++
++typedef struct {
++    MMPlugin parent;
++} MMPluginSierraLegacy;
++
++typedef struct {
++    MMPluginClass parent;
++} MMPluginSierraLegacyClass;
++
++GType mm_plugin_sierra_legacy_get_type (void);
++
++G_MODULE_EXPORT MMPlugin *mm_plugin_create (void);
++
++#endif /* MM_PLUGIN_SIERRA_LEGACY_H */
+Index: modemmanager/plugins/sierra/mm-plugin-sierra.c
+===================================================================
+--- modemmanager.orig/plugins/sierra/mm-plugin-sierra.c
++++ modemmanager/plugins/sierra/mm-plugin-sierra.c
+@@ -13,6 +13,7 @@
+  * Copyright (C) 2008 - 2009 Novell, Inc.
+  * Copyright (C) 2009 - 2012 Red Hat, Inc.
+  * Copyright (C) 2012 Lanedo GmbH
++ * Copyright (C) 2015 Aleksander Morgado <[e-mail]>
+  */
+ 
+ #include <stdlib.h>
+@@ -23,9 +24,6 @@
+ 
+ #include "mm-log.h"
+ #include "mm-plugin-sierra.h"
+-#include "mm-common-sierra.h"
+-#include "mm-broadband-modem-sierra.h"
+-#include "mm-broadband-modem-sierra-icera.h"
+ 
+ #if defined WITH_QMI
+ #include "mm-broadband-modem-qmi.h"
+@@ -73,18 +71,12 @@ create_modem (MMPlugin *self,
+     }
+ #endif
+ 
+-    if (mm_common_sierra_port_probe_list_is_icera (probes))
+-        return MM_BASE_MODEM (mm_broadband_modem_sierra_icera_new (sysfs_path,
+-                                                                   drivers,
+-                                                                   mm_plugin_get_name (self),
+-                                                                   vendor,
+-                                                                   product));
+-
+-    return MM_BASE_MODEM (mm_broadband_modem_sierra_new (sysfs_path,
+-                                                         drivers,
+-                                                         mm_plugin_get_name (self),
+-                                                         vendor,
+-                                                         product));
++    /* Fallback to default modem in the worst case */
++    return MM_BASE_MODEM (mm_broadband_modem_new (sysfs_path,
++                                                  drivers,
++                                                  mm_plugin_get_name (self),
++                                                  vendor,
++                                                  product));
+ }
+ 
+ /*****************************************************************************/
+@@ -93,24 +85,19 @@ G_MODULE_EXPORT MMPlugin *
+ mm_plugin_create (void)
+ {
+     static const gchar *subsystems[] = { "tty", "net", "usb", NULL };
+-    static const gchar *drivers[] = { "sierra", "sierra_net", NULL };
+-    static const MMAsyncMethod custom_init = {
+-        .async  = G_CALLBACK (mm_common_sierra_custom_init),
+-        .finish = G_CALLBACK (mm_common_sierra_custom_init_finish),
+-    };
++    static const guint16 vendor_ids[] = { 0x1199, 0 };
++    static const gchar *drivers[] = { "qmi_wwan", "cdc_mbim", NULL };
+ 
+     return MM_PLUGIN (
+         g_object_new (MM_TYPE_PLUGIN_SIERRA,
+                       MM_PLUGIN_NAME,               "Sierra",
+                       MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems,
++                      MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids,
+                       MM_PLUGIN_ALLOWED_DRIVERS,    drivers,
+                       MM_PLUGIN_ALLOWED_AT,         TRUE,
+                       MM_PLUGIN_ALLOWED_QCDM,       TRUE,
+                       MM_PLUGIN_ALLOWED_QMI,        TRUE,
+                       MM_PLUGIN_ALLOWED_MBIM,       TRUE,
+-                      MM_PLUGIN_CUSTOM_INIT,        &custom_init,
+-                      MM_PLUGIN_ICERA_PROBE,        TRUE,
+-                      MM_PLUGIN_REMOVE_ECHO,        FALSE,
+                       NULL));
+ }
+ 
+@@ -125,5 +112,4 @@ mm_plugin_sierra_class_init (MMPluginSie
+     MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
+ 
+     plugin_class->create_modem = create_modem;
+-    plugin_class->grab_port = mm_common_sierra_grab_port;
+ }

=== added file 'debian/patches/novatel-common-library.patch'
--- debian/patches/novatel-common-library.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/novatel-common-library.patch	2015-09-15 09:59:59 +0000
@@ -0,0 +1,47 @@
+commit 60a17df4c78d7bd9f27ca1425dba6c53298fd3d3
+Author: Aleksander Morgado <[e-mail]>
+Date:   Fri Feb 6 15:55:18 2015 +0100
+
+    novatel: build a common non-inst library with the core Novatel modem support
+
+Index: modemmanager/plugins/Makefile.am
+===================================================================
+--- modemmanager.orig/plugins/Makefile.am
++++ modemmanager/plugins/Makefile.am
+@@ -442,6 +442,19 @@ libmm_plugin_iridium_la_SOURCES = \
+ libmm_plugin_iridium_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+ libmm_plugin_iridium_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+ 
++# Common Novatel modem support library
++noinst_LTLIBRARIES += libmm-utils-novatel.la
++libmm_utils_novatel_la_SOURCES = \
++	novatel/mm-common-novatel.c \
++	novatel/mm-common-novatel.h \
++	novatel/mm-broadband-modem-novatel.c \
++	novatel/mm-broadband-modem-novatel.h
++libmm_utils_novatel_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
++libmm_utils_novatel_la_LIBADD = $(GUDEV_LIBS) $(MM_LIBS)
++
++NOVATEL_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/novatel
++NOVATEL_COMMON_LIBADD_FLAGS = $(builddir)/libmm-utils-novatel.la
++
+ # Novatel LTE modem
+ libmm_plugin_novatel_lte_la_SOURCES = \
+ 	novatel/mm-plugin-novatel-lte.c \
+@@ -458,13 +471,10 @@ libmm_plugin_novatel_lte_la_LDFLAGS = $(
+ # Novatel non-LTE modem
+ libmm_plugin_novatel_la_SOURCES = \
+ 	novatel/mm-plugin-novatel.c \
+-	novatel/mm-plugin-novatel.h \
+-	novatel/mm-common-novatel.c \
+-	novatel/mm-common-novatel.h \
+-	novatel/mm-broadband-modem-novatel.c \
+-	novatel/mm-broadband-modem-novatel.h
+-libmm_plugin_novatel_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
++	novatel/mm-plugin-novatel.h
++libmm_plugin_novatel_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(NOVATEL_COMMON_COMPILER_FLAGS)
+ libmm_plugin_novatel_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
++libmm_plugin_novatel_la_LIBADD = $(NOVATEL_COMMON_LIBADD_FLAGS)
+ 
+ # Altair LTE modem
+ libmm_plugin_altair_lte_la_SOURCES = \

=== added file 'debian/patches/novatel-custom-init.patch'
--- debian/patches/novatel-custom-init.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/novatel-custom-init.patch	2015-09-15 09:59:59 +0000
@@ -0,0 +1,389 @@
+commit 7c929b5cf19ca6fd3ed8c5667efc026df13046a1
+Author: Aleksander Morgado <[e-mail]>
+Date:   Fri Feb 6 15:30:50 2015 +0100
+
+    novatel: move custom init method to separate source files
+
+Index: modemmanager/plugins/Makefile.am
+===================================================================
+--- modemmanager.orig/plugins/Makefile.am
++++ modemmanager/plugins/Makefile.am
+@@ -459,6 +459,8 @@ libmm_plugin_novatel_lte_la_LDFLAGS = $(
+ libmm_plugin_novatel_la_SOURCES = \
+ 	novatel/mm-plugin-novatel.c \
+ 	novatel/mm-plugin-novatel.h \
++	novatel/mm-common-novatel.c \
++	novatel/mm-common-novatel.h \
+ 	novatel/mm-broadband-modem-novatel.c \
+ 	novatel/mm-broadband-modem-novatel.h
+ libmm_plugin_novatel_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+Index: modemmanager/plugins/novatel/mm-common-novatel.c
+===================================================================
+--- /dev/null
++++ modemmanager/plugins/novatel/mm-common-novatel.c
+@@ -0,0 +1,158 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details:
++ *
++ * Copyright (C) 2015 Aleksander Morgado <[e-mail]>
++ */
++
++#include "mm-common-novatel.h"
++#include "mm-log.h"
++
++/*****************************************************************************/
++/* Custom init */
++
++typedef struct {
++    MMPortProbe *probe;
++    MMPortSerialAt *port;
++    GCancellable *cancellable;
++    GSimpleAsyncResult *result;
++    guint nwdmat_retries;
++    guint wait_time;
++} CustomInitContext;
++
++static void
++custom_init_context_complete_and_free (CustomInitContext *ctx)
++{
++    g_simple_async_result_complete_in_idle (ctx->result);
++
++    if (ctx->cancellable)
++        g_object_unref (ctx->cancellable);
++    g_object_unref (ctx->port);
++    g_object_unref (ctx->probe);
++    g_object_unref (ctx->result);
++    g_slice_free (CustomInitContext, ctx);
++}
++
++gboolean
++mm_common_novatel_custom_init_finish (MMPortProbe *probe,
++                                      GAsyncResult *result,
++                                      GError **error)
++{
++    return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error);
++}
++
++static void custom_init_step (CustomInitContext *ctx);
++
++static void
++nwdmat_ready (MMPortSerialAt *port,
++              GAsyncResult *res,
++              CustomInitContext *ctx)
++{
++    const gchar *response;
++    GError *error = NULL;
++
++    response = mm_port_serial_at_command_finish (port, res, &error);
++    if (error) {
++        if (g_error_matches (error,
++                             MM_SERIAL_ERROR,
++                             MM_SERIAL_ERROR_RESPONSE_TIMEOUT)) {
++            custom_init_step (ctx);
++            goto out;
++        }
++
++        mm_dbg ("(Novatel) Error flipping secondary ports to AT mode: %s", error->message);
++    }
++
++    /* Finish custom_init */
++    g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++    custom_init_context_complete_and_free (ctx);
++
++out:
++    if (error)
++        g_error_free (error);
++}
++
++static gboolean
++custom_init_wait_cb (CustomInitContext *ctx)
++{
++    custom_init_step (ctx);
++    return FALSE;
++}
++
++static void
++custom_init_step (CustomInitContext *ctx)
++{
++    /* If cancelled, end */
++    if (g_cancellable_is_cancelled (ctx->cancellable)) {
++        mm_dbg ("(Novatel) no need to keep on running custom init in (%s)",
++                mm_port_get_device (MM_PORT (ctx->port)));
++        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++        custom_init_context_complete_and_free (ctx);
++        return;
++    }
++
++    /* If device has a QMI port, don't run $NWDMAT */
++    if (mm_port_probe_list_has_qmi_port (mm_device_peek_port_probe_list (mm_port_probe_peek_device (ctx->probe)))) {
++        mm_dbg ("(Novatel) no need to run custom init in (%s): device has QMI port",
++                mm_port_get_device (MM_PORT (ctx->port)));
++        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++        custom_init_context_complete_and_free (ctx);
++        return;
++    }
++
++    if (ctx->wait_time > 0) {
++        ctx->wait_time--;
++        g_timeout_add_seconds (1, (GSourceFunc)custom_init_wait_cb, ctx);
++        return;
++    }
++
++    if (ctx->nwdmat_retries > 0) {
++        ctx->nwdmat_retries--;
++        mm_port_serial_at_command (ctx->port,
++                                   "$NWDMAT=1",
++                                   3,
++                                   FALSE, /* raw */
++                                   FALSE, /* allow_cached */
++                                   ctx->cancellable,
++                                   (GAsyncReadyCallback)nwdmat_ready,
++                                   ctx);
++        return;
++    }
++
++    /* Finish custom_init */
++    mm_dbg ("(Novatel) couldn't flip secondary port to AT in (%s): all retries consumed",
++            mm_port_get_device (MM_PORT (ctx->port)));
++    g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++    custom_init_context_complete_and_free (ctx);
++}
++
++void
++mm_common_novatel_custom_init (MMPortProbe *probe,
++                               MMPortSerialAt *port,
++                               GCancellable *cancellable,
++                               GAsyncReadyCallback callback,
++                               gpointer user_data)
++{
++    CustomInitContext *ctx;
++
++    ctx = g_slice_new (CustomInitContext);
++    ctx->result = g_simple_async_result_new (G_OBJECT (probe),
++                                             callback,
++                                             user_data,
++                                             mm_common_novatel_custom_init);
++    ctx->probe = g_object_ref (probe);
++    ctx->port = g_object_ref (port);
++    ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
++    ctx->nwdmat_retries = 3;
++    ctx->wait_time = 2;
++
++    custom_init_step (ctx);
++}
+Index: modemmanager/plugins/novatel/mm-common-novatel.h
+===================================================================
+--- /dev/null
++++ modemmanager/plugins/novatel/mm-common-novatel.h
+@@ -0,0 +1,31 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details:
++ *
++ * Copyright (C) 2015 Aleksander Morgado <[e-mail]>
++ */
++
++#ifndef MM_COMMON_NOVATEL_H
++#define MM_COMMON_NOVATEL_H
++
++#include "glib.h"
++#include "mm-plugin.h"
++
++void     mm_common_novatel_custom_init        (MMPortProbe *probe,
++                                               MMPortSerialAt *port,
++                                               GCancellable *cancellable,
++                                               GAsyncReadyCallback callback,
++                                               gpointer user_data);
++gboolean mm_common_novatel_custom_init_finish (MMPortProbe *probe,
++                                               GAsyncResult *result,
++                                               GError **error);
++
++#endif  /* MM_COMMON_NOVATEL_H */
+Index: modemmanager/plugins/novatel/mm-plugin-novatel.c
+===================================================================
+--- modemmanager.orig/plugins/novatel/mm-plugin-novatel.c
++++ modemmanager/plugins/novatel/mm-plugin-novatel.c
+@@ -28,6 +28,7 @@
+ #include <libmm-glib.h>
+ 
+ #include "mm-plugin-novatel.h"
++#include "mm-common-novatel.h"
+ #include "mm-private-boxed-types.h"
+ #include "mm-broadband-modem-novatel.h"
+ #include "mm-log.h"
+@@ -55,147 +56,6 @@ static const MMPortProbeAtCommand custom
+ };
+ 
+ /*****************************************************************************/
+-/* Custom init */
+-
+-typedef struct {
+-    MMPortProbe *probe;
+-    MMPortSerialAt *port;
+-    GCancellable *cancellable;
+-    GSimpleAsyncResult *result;
+-    guint nwdmat_retries;
+-    guint wait_time;
+-} CustomInitContext;
+-
+-static void
+-custom_init_context_complete_and_free (CustomInitContext *ctx)
+-{
+-    g_simple_async_result_complete_in_idle (ctx->result);
+-
+-    if (ctx->cancellable)
+-        g_object_unref (ctx->cancellable);
+-    g_object_unref (ctx->port);
+-    g_object_unref (ctx->probe);
+-    g_object_unref (ctx->result);
+-    g_slice_free (CustomInitContext, ctx);
+-}
+-
+-static gboolean
+-novatel_custom_init_finish (MMPortProbe *probe,
+-                            GAsyncResult *result,
+-                            GError **error)
+-{
+-    return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error);
+-}
+-
+-static void custom_init_step (CustomInitContext *ctx);
+-
+-static void
+-nwdmat_ready (MMPortSerialAt *port,
+-              GAsyncResult *res,
+-              CustomInitContext *ctx)
+-{
+-    const gchar *response;
+-    GError *error = NULL;
+-
+-    response = mm_port_serial_at_command_finish (port, res, &error);
+-    if (error) {
+-        if (g_error_matches (error,
+-                             MM_SERIAL_ERROR,
+-                             MM_SERIAL_ERROR_RESPONSE_TIMEOUT)) {
+-            custom_init_step (ctx);
+-            goto out;
+-        }
+-
+-        mm_dbg ("(Novatel) Error flipping secondary ports to AT mode: %s", error->message);
+-    }
+-
+-    /* Finish custom_init */
+-    g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
+-    custom_init_context_complete_and_free (ctx);
+-
+-out:
+-    if (error)
+-        g_error_free (error);
+-}
+-
+-static gboolean
+-custom_init_wait_cb (CustomInitContext *ctx)
+-{
+-    custom_init_step (ctx);
+-    return FALSE;
+-}
+-
+-static void
+-custom_init_step (CustomInitContext *ctx)
+-{
+-    /* If cancelled, end */
+-    if (g_cancellable_is_cancelled (ctx->cancellable)) {
+-        mm_dbg ("(Novatel) no need to keep on running custom init in (%s)",
+-                mm_port_get_device (MM_PORT (ctx->port)));
+-        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
+-        custom_init_context_complete_and_free (ctx);
+-        return;
+-    }
+-
+-    /* If device has a QMI port, don't run $NWDMAT */
+-    if (mm_port_probe_list_has_qmi_port (mm_device_peek_port_probe_list (mm_port_probe_peek_device (ctx->probe)))) {
+-        mm_dbg ("(Novatel) no need to run custom init in (%s): device has QMI port",
+-                mm_port_get_device (MM_PORT (ctx->port)));
+-        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
+-        custom_init_context_complete_and_free (ctx);
+-        return;
+-    }
+-
+-    if (ctx->wait_time > 0) {
+-        ctx->wait_time--;
+-        g_timeout_add_seconds (1, (GSourceFunc)custom_init_wait_cb, ctx);
+-        return;
+-    }
+-
+-    if (ctx->nwdmat_retries > 0) {
+-        ctx->nwdmat_retries--;
+-        mm_port_serial_at_command (ctx->port,
+-                                   "$NWDMAT=1",
+-                                   3,
+-                                   FALSE, /* raw */
+-                                   FALSE, /* allow_cached */
+-                                   ctx->cancellable,
+-                                   (GAsyncReadyCallback)nwdmat_ready,
+-                                   ctx);
+-        return;
+-    }
+-
+-    /* Finish custom_init */
+-    mm_dbg ("(Novatel) couldn't flip secondary port to AT in (%s): all retries consumed",
+-            mm_port_get_device (MM_PORT (ctx->port)));
+-    g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
+-    custom_init_context_complete_and_free (ctx);
+-}
+-
+-static void
+-novatel_custom_init (MMPortProbe *probe,
+-                     MMPortSerialAt *port,
+-                     GCancellable *cancellable,
+-                     GAsyncReadyCallback callback,
+-                     gpointer user_data)
+-{
+-    CustomInitContext *ctx;
+-
+-    ctx = g_slice_new (CustomInitContext);
+-    ctx->result = g_simple_async_result_new (G_OBJECT (probe),
+-                                             callback,
+-                                             user_data,
+-                                             novatel_custom_init);
+-    ctx->probe = g_object_ref (probe);
+-    ctx->port = g_object_ref (port);
+-    ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
+-    ctx->nwdmat_retries = 3;
+-    ctx->wait_time = 2;
+-
+-    custom_init_step (ctx);
+-}
+-
+-/*****************************************************************************/
+ 
+ static MMBaseModem *
+ create_modem (MMPlugin *self,
+@@ -236,8 +96,8 @@ mm_plugin_create (void)
+     static const mm_uint16_pair forbidden_products[] = { { 0x1410, 0x9010 }, /* Novatel E362 */
+                                                          { 0, 0 } };
+     static const MMAsyncMethod custom_init = {
+-        .async  = G_CALLBACK (novatel_custom_init),
+-        .finish = G_CALLBACK (novatel_custom_init_finish),
++        .async  = G_CALLBACK (mm_common_novatel_custom_init),
++        .finish = G_CALLBACK (mm_common_novatel_custom_init_finish),
+     };
+ 
+     return MM_PLUGIN (

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-05-08 01:44:53 +0000
+++ debian/patches/series	2015-09-15 09:59:59 +0000
@@ -0,0 +1,7 @@
+novatel-custom-init.patch
+novatel-common-library.patch
+sierra-common-library.patch
+mbm-common-library.patch
+sierra-custom-init.patch
+new-sierra-legacy-plugin.patch
+dell-mbim-plugin.patch

=== added file 'debian/patches/sierra-common-library.patch'
--- debian/patches/sierra-common-library.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/sierra-common-library.patch	2015-09-15 09:59:59 +0000
@@ -0,0 +1,50 @@
+commit 299280166301d00c2b0e2b8868a96013388b2a3f
+Author: Aleksander Morgado <[e-mail]>
+Date:   Fri Feb 6 16:51:13 2015 +0100
+
+    sierra: build a common non-inst library with the core Sierra modem support
+
+Index: modemmanager/plugins/Makefile.am
+===================================================================
+--- modemmanager.orig/plugins/Makefile.am
++++ modemmanager/plugins/Makefile.am
+@@ -263,10 +263,9 @@ libmm_plugin_hso_la_SOURCES = \
+ libmm_plugin_hso_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+ libmm_plugin_hso_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+ 
+-# Sierra
+-libmm_plugin_sierra_la_SOURCES = \
+-	sierra/mm-plugin-sierra.c \
+-	sierra/mm-plugin-sierra.h \
++# Common Sierra modem support library
++noinst_LTLIBRARIES += libmm-utils-sierra.la
++libmm_utils_sierra_la_SOURCES = \
+ 	sierra/mm-common-sierra.c \
+ 	sierra/mm-common-sierra.h \
+ 	sierra/mm-sim-sierra.c \
+@@ -274,12 +273,22 @@ libmm_plugin_sierra_la_SOURCES = \
+ 	sierra/mm-broadband-bearer-sierra.c \
+ 	sierra/mm-broadband-bearer-sierra.h \
+ 	sierra/mm-broadband-modem-sierra.c \
+-	sierra/mm-broadband-modem-sierra.h \
++	sierra/mm-broadband-modem-sierra.h
++libmm_utils_sierra_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
++libmm_utils_sierra_la_LIBADD = $(GUDEV_LIBS) $(MM_LIBS)
++
++SIERRA_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/sierra
++SIERRA_COMMON_LIBADD_FLAGS = $(builddir)/libmm-utils-sierra.la
++
++# Sierra
++libmm_plugin_sierra_la_SOURCES = \
++	sierra/mm-plugin-sierra.c \
++	sierra/mm-plugin-sierra.h \
+ 	sierra/mm-broadband-modem-sierra-icera.c \
+ 	sierra/mm-broadband-modem-sierra-icera.h
+-libmm_plugin_sierra_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS)
++libmm_plugin_sierra_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS) $(SIERRA_COMMON_COMPILER_FLAGS)
+ libmm_plugin_sierra_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+-libmm_plugin_sierra_la_LIBADD = $(ICERA_COMMON_LIBADD_FLAGS)
++libmm_plugin_sierra_la_LIBADD = $(ICERA_COMMON_LIBADD_FLAGS) $(SIERRA_COMMON_LIBADD_FLAGS)
+ 
+ # Wavecom (Sierra Airlink)
+ libmm_plugin_wavecom_la_SOURCES = \

=== added file 'debian/patches/sierra-custom-init.patch'
--- debian/patches/sierra-custom-init.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/sierra-custom-init.patch	2015-09-15 09:59:59 +0000
@@ -0,0 +1,548 @@
+commit b1159453998e6dc89ba31a803c4c3886c8da0605
+Author: Aleksander Morgado <[e-mail]>
+Date:   Fri Feb 6 17:29:56 2015 +0100
+
+    sierra: move custom init and port grabbing methods to separate source files
+
+diff --git a/plugins/sierra/mm-common-sierra.c b/plugins/sierra/mm-common-sierra.c
+index 82a5d7b..e712093 100644
+--- a/plugins/sierra/mm-common-sierra.c
++++ b/plugins/sierra/mm-common-sierra.c
+@@ -15,6 +15,9 @@
+  * Copyright (C) 2012 Lanedo GmbH
+  */
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #include "mm-common-sierra.h"
+ #include "mm-base-modem-at.h"
+ #include "mm-log.h"
+@@ -24,6 +27,220 @@
+ static MMIfaceModem *iface_modem_parent;
+ 
+ /*****************************************************************************/
++/* Custom init and port type hints */
++
++#define TAG_SIERRA_APP_PORT       "sierra-app-port"
++#define TAG_SIERRA_APP1_PPP_OK    "sierra-app1-ppp-ok"
++
++gboolean
++mm_common_sierra_grab_port (MMPlugin *self,
++                            MMBaseModem *modem,
++                            MMPortProbe *probe,
++                            GError **error)
++{
++    MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
++    MMPortType ptype;
++
++    ptype = mm_port_probe_get_port_type (probe);
++
++    /* Is it a GSM secondary port? */
++    if (g_object_get_data (G_OBJECT (probe), TAG_SIERRA_APP_PORT)) {
++        if (g_object_get_data (G_OBJECT (probe), TAG_SIERRA_APP1_PPP_OK))
++            pflags = MM_PORT_SERIAL_AT_FLAG_PPP;
++        else
++            pflags = MM_PORT_SERIAL_AT_FLAG_SECONDARY;
++    } else if (ptype == MM_PORT_TYPE_AT)
++        pflags = MM_PORT_SERIAL_AT_FLAG_PRIMARY;
++
++    return mm_base_modem_grab_port (modem,
++                                    mm_port_probe_get_port_subsys (probe),
++                                    mm_port_probe_get_port_name (probe),
++                                    mm_port_probe_get_parent_path (probe),
++                                    ptype,
++                                    pflags,
++                                    error);
++}
++
++gboolean
++mm_common_sierra_port_probe_list_is_icera (GList *probes)
++{
++    GList *l;
++
++    for (l = probes; l; l = g_list_next (l)) {
++        /* Only assume the Icera probing check is valid IF the port is not
++         * secondary. This will skip the stupid ports which reply OK to every
++         * AT command, even the one we use to check for Icera support */
++        if (mm_port_probe_is_icera (MM_PORT_PROBE (l->data)) &&
++            !g_object_get_data (G_OBJECT (l->data), TAG_SIERRA_APP_PORT))
++            return TRUE;
++    }
++
++    return FALSE;
++}
++
++typedef struct {
++    MMPortProbe *probe;
++    MMPortSerialAt *port;
++    GCancellable *cancellable;
++    GSimpleAsyncResult *result;
++    guint retries;
++} SierraCustomInitContext;
++
++static void
++sierra_custom_init_context_complete_and_free (SierraCustomInitContext *ctx)
++{
++    g_simple_async_result_complete_in_idle (ctx->result);
++
++    if (ctx->cancellable)
++        g_object_unref (ctx->cancellable);
++    g_object_unref (ctx->port);
++    g_object_unref (ctx->probe);
++    g_object_unref (ctx->result);
++    g_slice_free (SierraCustomInitContext, ctx);
++}
++
++gboolean
++mm_common_sierra_custom_init_finish (MMPortProbe *probe,
++                                     GAsyncResult *result,
++                                     GError **error)
++{
++    return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error);
++}
++
++static void sierra_custom_init_step (SierraCustomInitContext *ctx);
++
++static void
++gcap_ready (MMPortSerialAt *port,
++            GAsyncResult *res,
++            SierraCustomInitContext *ctx)
++{
++    const gchar *response;
++    GError *error = NULL;
++
++    response = mm_port_serial_at_command_finish (port, res, &error);
++    if (error) {
++        /* If consumed all tries and the last error was a timeout, assume the
++         * port is not AT */
++        if (ctx->retries == 0 &&
++            g_error_matches (error, MM_SERIAL_ERROR, MM_SERIAL_ERROR_RESPONSE_TIMEOUT)) {
++            mm_port_probe_set_result_at (ctx->probe, FALSE);
++        }
++        /* If reported a hard parse error, this port is definitely not an AT
++         * port, skip trying. */
++        else if (g_error_matches (error, MM_SERIAL_ERROR, MM_SERIAL_ERROR_PARSE_FAILED)) {
++            mm_port_probe_set_result_at (ctx->probe, FALSE);
++            ctx->retries = 0;
++        }
++        /* Some Icera-based devices (eg, USB305) have an AT-style port that
++         * replies to everything with ERROR, so tag as unsupported; sometimes
++         * the real AT ports do this too, so let a retry tag the port as
++         * supported if it responds correctly later. */
++        else if (g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN)) {
++            mm_port_probe_set_result_at (ctx->probe, FALSE);
++        }
++
++        /* Just retry... */
++        sierra_custom_init_step (ctx);
++        goto out;
++    }
++
++    /* A valid reply to ATI tells us this is an AT port already */
++    mm_port_probe_set_result_at (ctx->probe, TRUE);
++
++    /* Sierra APPx ports have limited AT command parsers that just reply with
++     * "OK" to most commands.  These can sometimes be used for PPP while the
++     * main port is used for status and control, but older modems tend to crash
++     * or fail PPP.  So we whitelist modems that are known to allow PPP on the
++     * secondary APP ports.
++     */
++    if (strstr (response, "APP1")) {
++        g_object_set_data (G_OBJECT (ctx->probe), TAG_SIERRA_APP_PORT, GUINT_TO_POINTER (TRUE));
++
++        /* PPP-on-APP1-port whitelist */
++        if (strstr (response, "C885") ||
++            strstr (response, "USB 306") ||
++            strstr (response, "MC8790"))
++            g_object_set_data (G_OBJECT (ctx->probe), TAG_SIERRA_APP1_PPP_OK, GUINT_TO_POINTER (TRUE));
++
++        /* For debugging: let users figure out if their device supports PPP
++         * on the APP1 port or not.
++         */
++        if (getenv ("MM_SIERRA_APP1_PPP_OK")) {
++            mm_dbg ("Sierra: APP1 PPP OK '%s'", response);
++            g_object_set_data (G_OBJECT (ctx->probe), TAG_SIERRA_APP1_PPP_OK, GUINT_TO_POINTER (TRUE));
++        }
++    } else if (strstr (response, "APP2") ||
++               strstr (response, "APP3") ||
++               strstr (response, "APP4")) {
++        /* Additional APP ports don't support most AT commands, so they cannot
++         * be used as the primary port.
++         */
++        g_object_set_data (G_OBJECT (ctx->probe), TAG_SIERRA_APP_PORT, GUINT_TO_POINTER (TRUE));
++    }
++
++    g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++    sierra_custom_init_context_complete_and_free (ctx);
++
++out:
++    if (error)
++        g_error_free (error);
++}
++
++static void
++sierra_custom_init_step (SierraCustomInitContext *ctx)
++{
++    /* If cancelled, end */
++    if (g_cancellable_is_cancelled (ctx->cancellable)) {
++        mm_dbg ("(Sierra) no need to keep on running custom init in '%s'",
++                mm_port_get_device (MM_PORT (ctx->port)));
++        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++        sierra_custom_init_context_complete_and_free (ctx);
++        return;
++    }
++
++    if (ctx->retries == 0) {
++        mm_dbg ("(Sierra) Couldn't get port type hints from '%s'",
++                mm_port_get_device (MM_PORT (ctx->port)));
++        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
++        sierra_custom_init_context_complete_and_free (ctx);
++        return;
++    }
++
++    ctx->retries--;
++    mm_port_serial_at_command (
++        ctx->port,
++        "ATI",
++        3,
++        FALSE, /* raw */
++        FALSE, /* allow_cached */
++        ctx->cancellable,
++        (GAsyncReadyCallback)gcap_ready,
++        ctx);
++}
++
++void
++mm_common_sierra_custom_init (MMPortProbe *probe,
++                              MMPortSerialAt *port,
++                              GCancellable *cancellable,
++                              GAsyncReadyCallback callback,
++                              gpointer user_data)
++{
++    SierraCustomInitContext *ctx;
++
++    ctx = g_slice_new (SierraCustomInitContext);
++    ctx->result = g_simple_async_result_new (G_OBJECT (probe),
++                                             callback,
++                                             user_data,
++                                             mm_common_sierra_custom_init);
++    ctx->probe = g_object_ref (probe);
++    ctx->port = g_object_ref (port);
++    ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
++    ctx->retries = 3;
++
++    sierra_custom_init_step (ctx);
++}
++
++/*****************************************************************************/
+ /* Modem power up (Modem interface) */
+ 
+ gboolean
+diff --git a/plugins/sierra/mm-common-sierra.h b/plugins/sierra/mm-common-sierra.h
+index ec206d2..22471c0 100644
+--- a/plugins/sierra/mm-common-sierra.h
++++ b/plugins/sierra/mm-common-sierra.h
+@@ -18,10 +18,27 @@
+ #ifndef MM_COMMON_SIERRA_H
+ #define MM_COMMON_SIERRA_H
+ 
++#include "mm-plugin.h"
+ #include "mm-broadband-modem.h"
+ #include "mm-iface-modem.h"
+ #include "mm-base-sim.h"
+ 
++gboolean mm_common_sierra_grab_port (MMPlugin *self,
++                                     MMBaseModem *modem,
++                                     MMPortProbe *probe,
++                                     GError **error);
++
++gboolean mm_common_sierra_port_probe_list_is_icera (GList *probes);
++
++void     mm_common_sierra_custom_init        (MMPortProbe *probe,
++                                              MMPortSerialAt *port,
++                                              GCancellable *cancellable,
++                                              GAsyncReadyCallback callback,
++                                              gpointer user_data);
++gboolean mm_common_sierra_custom_init_finish (MMPortProbe *probe,
++                                              GAsyncResult *result,
++                                              GError **error);
++
+ void              mm_common_sierra_load_power_state        (MMIfaceModem *self,
+                                                             GAsyncReadyCallback callback,
+                                                             gpointer user_data);
+diff --git a/plugins/sierra/mm-plugin-sierra.c b/plugins/sierra/mm-plugin-sierra.c
+index 96f657a..665b61c 100644
+--- a/plugins/sierra/mm-plugin-sierra.c
++++ b/plugins/sierra/mm-plugin-sierra.c
+@@ -15,7 +15,6 @@
+  * Copyright (C) 2012 Lanedo GmbH
+  */
+ 
+-#include <string.h>
+ #include <stdlib.h>
+ #include <gmodule.h>
+ 
+@@ -24,6 +23,7 @@
+ 
+ #include "mm-log.h"
+ #include "mm-plugin-sierra.h"
++#include "mm-common-sierra.h"
+ #include "mm-broadband-modem-sierra.h"
+ #include "mm-broadband-modem-sierra-icera.h"
+ 
+@@ -41,191 +41,6 @@ int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
+ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
+ 
+ /*****************************************************************************/
+-/* Custom init */
+-
+-#define TAG_SIERRA_APP_PORT       "sierra-app-port"
+-#define TAG_SIERRA_APP1_PPP_OK    "sierra-app1-ppp-ok"
+-
+-typedef struct {
+-    MMPortProbe *probe;
+-    MMPortSerialAt *port;
+-    GCancellable *cancellable;
+-    GSimpleAsyncResult *result;
+-    guint retries;
+-} SierraCustomInitContext;
+-
+-static void
+-sierra_custom_init_context_complete_and_free (SierraCustomInitContext *ctx)
+-{
+-    g_simple_async_result_complete_in_idle (ctx->result);
+-
+-    if (ctx->cancellable)
+-        g_object_unref (ctx->cancellable);
+-    g_object_unref (ctx->port);
+-    g_object_unref (ctx->probe);
+-    g_object_unref (ctx->result);
+-    g_slice_free (SierraCustomInitContext, ctx);
+-}
+-
+-static gboolean
+-sierra_custom_init_finish (MMPortProbe *probe,
+-                           GAsyncResult *result,
+-                           GError **error)
+-{
+-    return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error);
+-}
+-
+-static void sierra_custom_init_step (SierraCustomInitContext *ctx);
+-
+-static void
+-gcap_ready (MMPortSerialAt *port,
+-            GAsyncResult *res,
+-            SierraCustomInitContext *ctx)
+-{
+-    const gchar *response;
+-    GError *error = NULL;
+-
+-    response = mm_port_serial_at_command_finish (port, res, &error);
+-    if (error) {
+-        /* If consumed all tries and the last error was a timeout, assume the
+-         * port is not AT */
+-        if (ctx->retries == 0 &&
+-            g_error_matches (error, MM_SERIAL_ERROR, MM_SERIAL_ERROR_RESPONSE_TIMEOUT)) {
+-            mm_port_probe_set_result_at (ctx->probe, FALSE);
+-        }
+-        /* If reported a hard parse error, this port is definitely not an AT
+-         * port, skip trying. */
+-        else if (g_error_matches (error, MM_SERIAL_ERROR, MM_SERIAL_ERROR_PARSE_FAILED)) {
+-            mm_port_probe_set_result_at (ctx->probe, FALSE);
+-            ctx->retries = 0;
+-        }
+-        /* Some Icera-based devices (eg, USB305) have an AT-style port that
+-         * replies to everything with ERROR, so tag as unsupported; sometimes
+-         * the real AT ports do this too, so let a retry tag the port as
+-         * supported if it responds correctly later. */
+-        else if (g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN)) {
+-            mm_port_probe_set_result_at (ctx->probe, FALSE);
+-        }
+-
+-        /* Just retry... */
+-        sierra_custom_init_step (ctx);
+-        goto out;
+-    }
+-
+-    /* A valid reply to ATI tells us this is an AT port already */
+-    mm_port_probe_set_result_at (ctx->probe, TRUE);
+-
+-    /* Sierra APPx ports have limited AT command parsers that just reply with
+-     * "OK" to most commands.  These can sometimes be used for PPP while the
+-     * main port is used for status and control, but older modems tend to crash
+-     * or fail PPP.  So we whitelist modems that are known to allow PPP on the
+-     * secondary APP ports.
+-     */
+-    if (strstr (response, "APP1")) {
+-        g_object_set_data (G_OBJECT (ctx->probe), TAG_SIERRA_APP_PORT, GUINT_TO_POINTER (TRUE));
+-
+-        /* PPP-on-APP1-port whitelist */
+-        if (strstr (response, "C885") ||
+-            strstr (response, "USB 306") ||
+-            strstr (response, "MC8790"))
+-            g_object_set_data (G_OBJECT (ctx->probe), TAG_SIERRA_APP1_PPP_OK, GUINT_TO_POINTER (TRUE));
+-
+-        /* For debugging: let users figure out if their device supports PPP
+-         * on the APP1 port or not.
+-         */
+-        if (getenv ("MM_SIERRA_APP1_PPP_OK")) {
+-            mm_dbg ("Sierra: APP1 PPP OK '%s'", response);
+-            g_object_set_data (G_OBJECT (ctx->probe), TAG_SIERRA_APP1_PPP_OK, GUINT_TO_POINTER (TRUE));
+-        }
+-    } else if (strstr (response, "APP2") ||
+-               strstr (response, "APP3") ||
+-               strstr (response, "APP4")) {
+-        /* Additional APP ports don't support most AT commands, so they cannot
+-         * be used as the primary port.
+-         */
+-        g_object_set_data (G_OBJECT (ctx->probe), TAG_SIERRA_APP_PORT, GUINT_TO_POINTER (TRUE));
+-    }
+-
+-    g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
+-    sierra_custom_init_context_complete_and_free (ctx);
+-
+-out:
+-    if (error)
+-        g_error_free (error);
+-}
+-
+-static void
+-sierra_custom_init_step (SierraCustomInitContext *ctx)
+-{
+-    /* If cancelled, end */
+-    if (g_cancellable_is_cancelled (ctx->cancellable)) {
+-        mm_dbg ("(Sierra) no need to keep on running custom init in '%s'",
+-                mm_port_get_device (MM_PORT (ctx->port)));
+-        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
+-        sierra_custom_init_context_complete_and_free (ctx);
+-        return;
+-    }
+-
+-    if (ctx->retries == 0) {
+-        mm_dbg ("(Sierra) Couldn't get port type hints from '%s'",
+-                mm_port_get_device (MM_PORT (ctx->port)));
+-        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
+-        sierra_custom_init_context_complete_and_free (ctx);
+-        return;
+-    }
+-
+-    ctx->retries--;
+-    mm_port_serial_at_command (
+-        ctx->port,
+-        "ATI",
+-        3,
+-        FALSE, /* raw */
+-        FALSE, /* allow_cached */
+-        ctx->cancellable,
+-        (GAsyncReadyCallback)gcap_ready,
+-        ctx);
+-}
+-
+-static void
+-sierra_custom_init (MMPortProbe *probe,
+-                    MMPortSerialAt *port,
+-                    GCancellable *cancellable,
+-                    GAsyncReadyCallback callback,
+-                    gpointer user_data)
+-{
+-    SierraCustomInitContext *ctx;
+-
+-    ctx = g_slice_new (SierraCustomInitContext);
+-    ctx->result = g_simple_async_result_new (G_OBJECT (probe),
+-                                             callback,
+-                                             user_data,
+-                                             sierra_custom_init);
+-    ctx->probe = g_object_ref (probe);
+-    ctx->port = g_object_ref (port);
+-    ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
+-    ctx->retries = 3;
+-
+-    sierra_custom_init_step (ctx);
+-}
+-
+-/*****************************************************************************/
+-
+-static gboolean
+-sierra_port_probe_list_is_icera (GList *probes)
+-{
+-    GList *l;
+-
+-    for (l = probes; l; l = g_list_next (l)) {
+-        /* Only assume the Icera probing check is valid IF the port is not
+-         * secondary. This will skip the stupid ports which reply OK to every
+-         * AT command, even the one we use to check for Icera support */
+-        if (mm_port_probe_is_icera (MM_PORT_PROBE (l->data)) &&
+-            !g_object_get_data (G_OBJECT (l->data), TAG_SIERRA_APP_PORT))
+-            return TRUE;
+-    }
+-
+-    return FALSE;
+-}
+ 
+ static MMBaseModem *
+ create_modem (MMPlugin *self,
+@@ -258,7 +73,7 @@ create_modem (MMPlugin *self,
+     }
+ #endif
+ 
+-    if (sierra_port_probe_list_is_icera (probes))
++    if (mm_common_sierra_port_probe_list_is_icera (probes))
+         return MM_BASE_MODEM (mm_broadband_modem_sierra_icera_new (sysfs_path,
+                                                                    drivers,
+                                                                    mm_plugin_get_name (self),
+@@ -272,35 +87,6 @@ create_modem (MMPlugin *self,
+                                                          product));
+ }
+ 
+-static gboolean
+-grab_port (MMPlugin *self,
+-           MMBaseModem *modem,
+-           MMPortProbe *probe,
+-           GError **error)
+-{
+-    MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
+-    MMPortType ptype;
+-
+-    ptype = mm_port_probe_get_port_type (probe);
+-
+-    /* Is it a GSM secondary port? */
+-    if (g_object_get_data (G_OBJECT (probe), TAG_SIERRA_APP_PORT)) {
+-        if (g_object_get_data (G_OBJECT (probe), TAG_SIERRA_APP1_PPP_OK))
+-            pflags = MM_PORT_SERIAL_AT_FLAG_PPP;
+-        else
+-            pflags = MM_PORT_SERIAL_AT_FLAG_SECONDARY;
+-    } else if (ptype == MM_PORT_TYPE_AT)
+-        pflags = MM_PORT_SERIAL_AT_FLAG_PRIMARY;
+-
+-    return mm_base_modem_grab_port (modem,
+-                                    mm_port_probe_get_port_subsys (probe),
+-                                    mm_port_probe_get_port_name (probe),
+-                                    mm_port_probe_get_parent_path (probe),
+-                                    ptype,
+-                                    pflags,
+-                                    error);
+-}
+-
+ /*****************************************************************************/
+ 
+ G_MODULE_EXPORT MMPlugin *
+@@ -309,8 +95,8 @@ mm_plugin_create (void)
+     static const gchar *subsystems[] = { "tty", "net", "usb", NULL };
+     static const gchar *drivers[] = { "sierra", "sierra_net", NULL };
+     static const MMAsyncMethod custom_init = {
+-        .async  = G_CALLBACK (sierra_custom_init),
+-        .finish = G_CALLBACK (sierra_custom_init_finish),
++        .async  = G_CALLBACK (mm_common_sierra_custom_init),
++        .finish = G_CALLBACK (mm_common_sierra_custom_init_finish),
+     };
+ 
+     return MM_PLUGIN (
+@@ -339,5 +125,5 @@ mm_plugin_sierra_class_init (MMPluginSierraClass *klass)
+     MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
+ 
+     plugin_class->create_modem = create_modem;
+-    plugin_class->grab_port = grab_port;
++    plugin_class->grab_port = mm_common_sierra_grab_port;
+ }