Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager:verizon-lp1675062 into ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:modem-manager/xenial/1.6.2

[Alfonso Sanchez-Beato]

Send +CGACT for Sierra HL7588 on connection

Sent AT+CGACT=1,3 command for Sierra HL7588 on connection as a
workaround for buggy modem firmware. This makes sure vzwinternet
is activated. Fix for LP: #1675062.

Send +CGACT for Sierra HL7588 on connection

Sent AT+CGACT=1,3 command for Sierra HL7588 on connection as a
workaround for buggy modem firmware. This makes sure vzwinternet
is activated. Fix for LP: #1675062.

[Konrad Zapałowicz (kzapalowicz)]

just a small comment

review: Needs Fixing (code)

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

FAILED: Continuous integration, rev:00f064fc5161c5b4094afdafd596da7774af041c
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1450/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1019/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1358/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/650

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1450/rebuild

review: Needs Fixing (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

ack

review: Approve (code)

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

FAILED: Continuous integration, rev:2f4a05b706f21ed59618639ba61fbdf436bc7dd4
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1451/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1020/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1359/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/651

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1451/rebuild

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

One question in line, worth submitting this upstream?

review: Needs Information

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

@morphis, no not really, they said they will fix this in the next firmware release, so upstream can live without this (and probably happy without it).

[Simon Fels (morphis)]

LGTM

review: Approve

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

PASSED: Continuous integration, rev:2f4a05b706f21ed59618639ba61fbdf436bc7dd4
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1452/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1021
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1360/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1582
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/652/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1452/rebuild

review: Approve (continuous-integration)

diff --git a/src/mm-bearer-mbim.c b/src/mm-bearer-mbim.c
index 5db5f32..af5dd20 100644
--- a/src/mm-bearer-mbim.c
+++ b/src/mm-bearer-mbim.c
@@ -31,6 +31,10 @@
 #include "mm-port-enums-types.h"
 #include "mm-bearer-mbim.h"
 #include "mm-log.h"
+#include "mm-base-modem-at.h"
+
+#define VID_SIERRA_HL7588 0x413C
+#define PID_SIERRA_HL7588 0x81C8
 
 G_DEFINE_TYPE (MMBearerMbim, mm_bearer_mbim, MM_TYPE_BASE_BEARER)
 
@@ -218,6 +222,7 @@ reload_stats (MMBaseBearer *self,
 
 typedef enum {
     CONNECT_STEP_FIRST,
+    CONNECT_STEP_SEND_SIERRA_WORKAROUND,
     CONNECT_STEP_PACKET_SERVICE,
     CONNECT_STEP_PROVISIONED_CONTEXTS,
     CONNECT_STEP_CONNECT,
@@ -760,6 +765,29 @@ packet_service_set_ready (MbimDevice *device,
 }
 
 static void
+workaround_done (MMBaseModem *modem,
+                 GAsyncResult *res,
+                 ConnectContext *ctx)
+{
+    /* Not really worth checking for errors here */
+    mm_dbg ("Sierra HL7588 workaround command finished");
+
+    /* Keep on */
+    ctx->step++;
+    connect_context_step (ctx);
+}
+
+static unsigned
+get_uint_property (GObject *obj, const gchar *property_name)
+{
+    GValue value = G_VALUE_INIT;
+
+    g_value_init (&value, G_TYPE_UINT);
+    g_object_get_property (obj, property_name, &value);
+    return g_value_get_uint (&value);
+}
+
+static void
 connect_context_step (ConnectContext *ctx)
 {
     MbimMessage *message;
@@ -779,6 +807,37 @@ connect_context_step (ConnectContext *ctx)
         /* Fall down */
         ctx->step++;
 
+    case CONNECT_STEP_SEND_SIERRA_WORKAROUND: {
+        MMBaseModem *modem = NULL;
+        unsigned vid, pid;
+
+        g_object_get (ctx->self,
+                      MM_BASE_BEARER_MODEM, &modem,
+                      NULL);
+        g_assert (modem);
+
+        vid = get_uint_property (G_OBJECT (modem), MM_BASE_MODEM_VENDOR_ID);
+        pid = get_uint_property (G_OBJECT (modem), MM_BASE_MODEM_PRODUCT_ID);
+
+        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...");
+            mm_base_modem_at_command (modem,
+                                      "AT+CGACT=1,3",
+                                      10,
+                                      FALSE,
+                                      (GAsyncReadyCallback)workaround_done,
+                                      ctx);
+            g_object_unref (modem);
+            return;
+        }
+
+        g_object_unref (modem);
+        /* Fall down */
+        ctx->step++;
+    }
     case CONNECT_STEP_PACKET_SERVICE: {
         GError *error = NULL;