Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager:hl7588-dell-workaround-v2 into ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:modem-manager/xenial/1.6.2

[Alfonso Sanchez-Beato]

Run HL7588 workarounds for Dell VID/PID

The workarounds for Sierra HL7588 were executed only for Sierra VID/PID.
Make sure to apply them also for rebranded Dell modem with VID=0x1519
and PID=0x0443. An additional twist is needed, as Dell reused same
VID/PID for a Telit modem, so we additionally check the output of
AT+CGMM.

[Simon Fels (morphis)]

LGTM

review: Approve

[Roberto Mier Escandon (rmescandon)]

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:d5a5d0362c828d018484dff652655b4d7a10c87e
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/42/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/94/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/94
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/94
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/94/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/888
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/636
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/656/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/42/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:9de722a00d27d845ee1dd70e357bf7b13abbc9d8
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/73/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/123
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/123
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/123
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/123
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/919
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/666
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/686/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/73/rebuild

review: Approve (continuous-integration)

diff --git a/src/mm-bearer-mbim.c b/src/mm-bearer-mbim.c
index af5dd20..4298349 100644
--- a/src/mm-bearer-mbim.c
+++ b/src/mm-bearer-mbim.c
@@ -35,6 +35,8 @@
 
 #define VID_SIERRA_HL7588 0x413C
 #define PID_SIERRA_HL7588 0x81C8
+#define VID_SIERRA_HL7588_DELL 0x1519
+#define PID_SIERRA_HL7588_DELL 0x0443
 
 G_DEFINE_TYPE (MMBearerMbim, mm_bearer_mbim, MM_TYPE_BASE_BEARER)
 
@@ -777,6 +779,31 @@ workaround_done (MMBaseModem *modem,
     connect_context_step (ctx);
 }
 
+static void
+check_model_id_done (MMBaseModem *modem,
+                     GAsyncResult *res,
+                     ConnectContext *ctx)
+{
+    const gchar *response;
+    GError *error = NULL;
+
+    response = mm_base_modem_at_command_finish (modem, res, &error);
+    if (!error && g_strcmp0 ("HL7588", response) == 0) {
+        mm_dbg ("Sending workaround AT command for Sierra HL7588...");
+        mm_base_modem_at_command (modem,
+                                  "AT+CGACT=1,3",
+                                  10,
+                                  FALSE,
+                                  (GAsyncReadyCallback)workaround_done,
+                                  ctx);
+        return;
+    }
+
+    /* Keep on */
+    ctx->step++;
+    connect_context_step (ctx);
+}
+
 static unsigned
 get_uint_property (GObject *obj, const gchar *property_name)
 {
@@ -821,14 +848,13 @@ connect_context_step (ConnectContext *ctx)
 
         mm_dbg ("Checking if Sierra HL7588: %x:%x", vid, pid);
 
-        if (vid == VID_SIERRA_HL7588 && pid == PID_SIERRA_HL7588) {
-
-            mm_dbg ("Sending workaround AT command for Sierra HL7588...");
+        if ((vid == VID_SIERRA_HL7588 && pid == PID_SIERRA_HL7588) ||
+            (vid == VID_SIERRA_HL7588_DELL && pid == PID_SIERRA_HL7588_DELL)) {
             mm_base_modem_at_command (modem,
-                                      "AT+CGACT=1,3",
-                                      10,
-                                      FALSE,
-                                      (GAsyncReadyCallback)workaround_done,
+                                      "AT+CGMM",
+                                      3,
+                                      TRUE,
+                                      (GAsyncReadyCallback)check_model_id_done,
                                       ctx);
             g_object_unref (modem);
             return;
diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c
index 49d0643..d6975a9 100644
--- a/src/mm-broadband-modem-mbim.c
+++ b/src/mm-broadband-modem-mbim.c
@@ -2271,6 +2271,8 @@ device_notification_cb (MbimDevice *device,
 
 #define VID_SIERRA_HL7588 0x413C
 #define PID_SIERRA_HL7588 0x81C8
+#define VID_SIERRA_HL7588_DELL 0x1519
+#define PID_SIERRA_HL7588_DELL 0x0443
 
 static unsigned
 get_uint_property (GObject *obj, const gchar *property_name)
@@ -2282,6 +2284,21 @@ get_uint_property (GObject *obj, const gchar *property_name)
     return g_value_get_uint (&value);
 }
 
+static gboolean
+check_is_hl7588 (MMBroadbandModemMbim *self)
+{
+    unsigned vid, pid;
+
+    vid = get_uint_property (G_OBJECT (self), MM_BASE_MODEM_VENDOR_ID);
+    pid = get_uint_property (G_OBJECT (self), MM_BASE_MODEM_PRODUCT_ID);
+
+    if ((VID_SIERRA_HL7588 == vid && PID_SIERRA_HL7588 == pid) ||
+        (VID_SIERRA_HL7588_DELL == vid && PID_SIERRA_HL7588_DELL == pid))
+        return TRUE;
+
+    return FALSE;
+}
+
 static void
 function_error_cb (MbimDevice *device,
                    GError *function_error,
@@ -2296,10 +2313,7 @@ function_error_cb (MbimDevice *device,
      */
     if (g_error_matches (function_error,
                          MBIM_PROTOCOL_ERROR, MBIM_PROTOCOL_ERROR_NOT_OPENED)
-        && VID_SIERRA_HL7588 == get_uint_property (G_OBJECT (self),
-                                                   MM_BASE_MODEM_VENDOR_ID)
-        && PID_SIERRA_HL7588 == get_uint_property (G_OBJECT (self),
-                                                   MM_BASE_MODEM_PRODUCT_ID)) {
+        && check_is_hl7588 (self)) {
         int fd;
         ssize_t written;
         const char reset_cmd[] = "AT+CFUN=16\r";