Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager:fix-qmi-eps-reg into ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:modem-manager/xenial/1.6.12

[Alfonso Sanchez-Beato]

Update EPS registration state for LTE qmi modems

MM was not updating the EPS registration status for qmi modems. This
led to LTE-only modems never having 'registered' status. This was
happening for Quectel EC21-V modem. Merged in upstream:

https://cgit.freedesktop.org/ModemManager/ModemManager/commit/?id=10cb61f399b80c9db1b3b1b570214da164c469aa

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

FAILED: Continuous integration, rev:6055aadcc3664b8042073db22ed30cb4effcd520
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/170/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/220/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/220
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/220
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/220
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1014
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/757
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/783/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:6055aadcc3664b8042073db22ed30cb4effcd520
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/171/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/221/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/221
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/221
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/221
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1015
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/758
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/784/console

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

review: Needs Fixing (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Sent upstream:

https://lists.freedesktop.org/archives/modemmanager-devel/2018-February/006201.html
https://lists.freedesktop.org/archives/modemmanager-devel/2018-February/006203.html

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

FAILED: Continuous integration, rev:33dd913075d4214cc33523481329092f6709e721
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/172/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/222/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/222
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/222
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/222
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1016
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/759
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/785/console

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

review: Needs Fixing (continuous-integration)

[Tony Espy (awe)]

It looks like there are two other places in the qmi driver that call update_cs_registration_state() and update_ps_registration_state(). Shouldn't update_eps_registration_state() be called in those places as well?

review: Needs Information

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

There is only one additional place, in line 4631. I do not update EPS state because when that is run is because it is not a 3gpp network, and EPS is a specific feature of LTE/3gpp.

[Tony Espy (awe)]

OK, thanks for the explanation. LGTM otherwise!

review: Approve

diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index 2f7115d..721fce0 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -4714,6 +4714,8 @@ common_process_serving_system_3gpp (MMBroadbandModemQmi *self,
     /* Report new registration states */
     mm_iface_modem_3gpp_update_cs_registration_state (MM_IFACE_MODEM_3GPP (self), mm_cs_registration_state);
     mm_iface_modem_3gpp_update_ps_registration_state (MM_IFACE_MODEM_3GPP (self), mm_ps_registration_state);
+    if (mm_access_technologies & MM_MODEM_ACCESS_TECHNOLOGY_LTE)
+        mm_iface_modem_3gpp_update_eps_registration_state (MM_IFACE_MODEM_3GPP (self), mm_ps_registration_state);
 
     /* Get 3GPP location LAC and CI */
     lac = 0;
@@ -5169,6 +5171,7 @@ common_process_system_info_3gpp (MMBroadbandModemQmi *self,
     guint16 lac;
     guint32 cid;
     gchar *operator_id;
+    gboolean has_lte_info;
 
     ps_registration_state = MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN;
     cs_registration_state = MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN;
@@ -5180,12 +5183,13 @@ common_process_system_info_3gpp (MMBroadbandModemQmi *self,
      *   LTE > WCDMA > GSM
      * The first one giving results will be the one reported.
      */
-    if (!process_lte_info (response_output, indication_output,
-                           &cs_registration_state,
-                           &ps_registration_state,
-                           &lac,
-                           &cid,
-                           &operator_id) &&
+    has_lte_info = process_lte_info (response_output, indication_output,
+                                     &cs_registration_state,
+                                     &ps_registration_state,
+                                     &lac,
+                                     &cid,
+                                     &operator_id);
+    if (!has_lte_info &&
         !process_wcdma_info (response_output, indication_output,
                              &cs_registration_state,
                              &ps_registration_state,
@@ -5210,6 +5214,8 @@ common_process_system_info_3gpp (MMBroadbandModemQmi *self,
     /* Report new registration states */
     mm_iface_modem_3gpp_update_cs_registration_state (MM_IFACE_MODEM_3GPP (self), cs_registration_state);
     mm_iface_modem_3gpp_update_ps_registration_state (MM_IFACE_MODEM_3GPP (self), ps_registration_state);
+    if (has_lte_info)
+        mm_iface_modem_3gpp_update_eps_registration_state (MM_IFACE_MODEM_3GPP (self), ps_registration_state);
     mm_iface_modem_3gpp_update_location (MM_IFACE_MODEM_3GPP (self), lac, cid);
 }