fibocom: Added support for firmware objects

Added load_update_settings, load_update_settings_finish
Add support for fastboot flash

6 files changed, 163 insertions, 7 deletions

diff --git a/src/plugins/fibocom/77-mm-fibocom-port-types.rules b/src/plugins/fibocom/77-mm-fibocom-port-types.rules
index 5793cd62..d4fd239a 100644
--- a/src/plugins/fibocom/77-mm-fibocom-port-types.rules
+++ b/src/plugins/fibocom/77-mm-fibocom-port-types.rules
@@ -47,6 +47,7 @@ ATTRS{idVendor}=="2cb7", ATTRS{idProduct}=="01a2", ENV{.MM_USBIFNUM}=="02", SUBS
 ATTRS{idVendor}=="2cb7", ATTRS{idProduct}=="01a2", ENV{.MM_USBIFNUM}=="03", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_SECONDARY}="1"
 ATTRS{idVendor}=="2cb7", ATTRS{idProduct}=="01a2", ENV{.MM_USBIFNUM}=="04", ENV{ID_MM_PORT_IGNORE}="1"
 ATTRS{idVendor}=="2cb7", ATTRS{idProduct}=="01a2", ENV{.MM_USBIFNUM}=="05", ENV{ID_MM_PORT_IGNORE}="1"
+ATTRS{idVendor}=="2cb7", ATTRS{idProduct}=="01a2", ENV{.MM_USBIFNUM}=="02", SUBSYSTEM=="tty", ENV{ID_MM_FIBOCOM_FASTBOOT}="1"
 
 # Fibocom FM101-GL (ADB)
 #  ttyUSB0 (if #2): debug port (ignore)
diff --git a/src/plugins/fibocom/mm-broadband-modem-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-fibocom.c
index 901cdd7b..9fad4d2f 100644
--- a/src/plugins/fibocom/mm-broadband-modem-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-fibocom.c
@@ -23,17 +23,20 @@
 #include "mm-iface-modem-3gpp.h"
 #include "mm-iface-modem-3gpp-profile-manager.h"
 #include "mm-log.h"
+#include "mm-shared-fibocom.h"
 
 static void iface_modem_init                      (MMIfaceModem                   *iface);
 static void iface_modem_3gpp_init                 (MMIfaceModem3gpp               *iface);
 static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManager *iface);
+static void iface_modem_firmware_init             (MMIfaceModemFirmware           *iface);
 
 static MMIfaceModem3gppProfileManager *iface_modem_3gpp_profile_manager_parent;
 
 G_DEFINE_TYPE_EXTENDED (MMBroadbandModemFibocom, mm_broadband_modem_fibocom, MM_TYPE_BROADBAND_MODEM, 0,
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP, iface_modem_3gpp_init)
-                        G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP_PROFILE_MANAGER, iface_modem_3gpp_profile_manager_init))
+                        G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP_PROFILE_MANAGER, iface_modem_3gpp_profile_manager_init)
+                        G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_FIRMWARE, iface_modem_firmware_init))
 
 typedef enum {
     FEATURE_SUPPORT_UNKNOWN,
@@ -751,6 +754,13 @@ iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManager *iface)
 }
 
 static void
+iface_modem_firmware_init (MMIfaceModemFirmware *iface)
+{
+    iface->load_update_settings = mm_shared_fibocom_firmware_load_update_settings;
+    iface->load_update_settings_finish = mm_shared_fibocom_firmware_load_update_settings_finish;
+}
+
+static void
 mm_broadband_modem_fibocom_class_init (MMBroadbandModemFibocomClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
diff --git a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
index ac0be416..ec2e1a87 100644
--- a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
@@ -28,14 +28,16 @@
 #include "mm-broadband-modem-mbim-fibocom.h"
 #include "mm-shared-fibocom.h"
 
-static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface);
-static void shared_fibocom_init   (MMSharedFibocom  *iface);
+static void iface_modem_3gpp_init     (MMIfaceModem3gpp     *iface);
+static void shared_fibocom_init       (MMSharedFibocom      *iface);
+static void iface_modem_firmware_init (MMIfaceModemFirmware *iface);
 
 static MMIfaceModem3gpp *iface_modem_3gpp_parent;
 
 G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimFibocom, mm_broadband_modem_mbim_fibocom, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP, iface_modem_3gpp_init)
-                        G_IMPLEMENT_INTERFACE (MM_TYPE_SHARED_FIBOCOM,  shared_fibocom_init))
+                        G_IMPLEMENT_INTERFACE (MM_TYPE_SHARED_FIBOCOM,  shared_fibocom_init)
+                        G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_FIRMWARE, iface_modem_firmware_init))
 
 /******************************************************************************/
 
@@ -76,6 +78,13 @@ iface_modem_3gpp_init (MMIfaceModem3gpp *iface)
     iface->set_initial_eps_bearer_settings_finish = mm_shared_fibocom_set_initial_eps_bearer_settings_finish;
 }
 
+static void
+iface_modem_firmware_init (MMIfaceModemFirmware *iface)
+{
+    iface->load_update_settings = mm_shared_fibocom_firmware_load_update_settings;
+    iface->load_update_settings_finish = mm_shared_fibocom_firmware_load_update_settings_finish;
+}
+
 static MMIfaceModem3gpp *
 peek_parent_3gpp_interface (MMSharedFibocom *self)
 {
diff --git a/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
index 86f48797..f1daf807 100644
--- a/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
@@ -28,14 +28,16 @@
 #include "mm-broadband-modem-mbim-xmm-fibocom.h"
 #include "mm-shared-fibocom.h"
 
-static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface);
-static void shared_fibocom_init   (MMSharedFibocom  *iface);
+static void iface_modem_3gpp_init     (MMIfaceModem3gpp     *iface);
+static void shared_fibocom_init       (MMSharedFibocom      *iface);
+static void iface_modem_firmware_init (MMIfaceModemFirmware *iface);
 
 static MMIfaceModem3gpp *iface_modem_3gpp_parent;
 
 G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimXmmFibocom, mm_broadband_modem_mbim_xmm_fibocom, MM_TYPE_BROADBAND_MODEM_MBIM_XMM, 0,
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP, iface_modem_3gpp_init)
-                        G_IMPLEMENT_INTERFACE (MM_TYPE_SHARED_FIBOCOM,  shared_fibocom_init))
+                        G_IMPLEMENT_INTERFACE (MM_TYPE_SHARED_FIBOCOM,  shared_fibocom_init)
+                        G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_FIRMWARE, iface_modem_firmware_init))
 
 /******************************************************************************/
 
@@ -79,6 +81,13 @@ iface_modem_3gpp_init (MMIfaceModem3gpp *iface)
     iface->set_initial_eps_bearer_settings_finish = mm_shared_fibocom_set_initial_eps_bearer_settings_finish;
 }
 
+static void
+iface_modem_firmware_init (MMIfaceModemFirmware *iface)
+{
+    iface->load_update_settings = mm_shared_fibocom_firmware_load_update_settings;
+    iface->load_update_settings_finish = mm_shared_fibocom_firmware_load_update_settings_finish;
+}
+
 static MMIfaceModem3gpp *
 peek_parent_3gpp_interface (MMSharedFibocom *self)
 {
diff --git a/src/plugins/fibocom/mm-shared-fibocom.c b/src/plugins/fibocom/mm-shared-fibocom.c
index 10b82c59..9554b4df 100644
--- a/src/plugins/fibocom/mm-shared-fibocom.c
+++ b/src/plugins/fibocom/mm-shared-fibocom.c
@@ -28,6 +28,7 @@
 #include "mm-iface-modem.h"
 #include "mm-iface-modem-3gpp.h"
 #include "mm-shared-fibocom.h"
+#include "mm-base-modem-at.h"
 
 /*****************************************************************************/
 /* Private data context */
@@ -220,6 +221,122 @@ mm_shared_fibocom_set_initial_eps_bearer_settings (MMIfaceModem3gpp    *self,
 
 /*****************************************************************************/
 
+MMFirmwareUpdateSettings *
+mm_shared_fibocom_firmware_load_update_settings_finish (MMIfaceModemFirmware  *self,
+                                                        GAsyncResult          *res,
+                                                        GError               **error)
+{
+    return g_task_propagate_pointer (G_TASK (res), error);
+}
+
+static gboolean
+fibocom_is_fastboot_supported (MMBaseModem *modem,
+                               MMPort      *port)
+{
+    return mm_kernel_device_get_global_property_as_boolean (mm_port_peek_kernel_device (port), "ID_MM_FIBOCOM_FASTBOOT");
+}
+
+static MMModemFirmwareUpdateMethod
+fibocom_get_firmware_update_methods (MMBaseModem *modem,
+                                     MMPort      *port)
+{
+    MMModemFirmwareUpdateMethod update_methods;
+
+    update_methods = MM_MODEM_FIRMWARE_UPDATE_METHOD_NONE;
+
+    if (fibocom_is_fastboot_supported (modem, port))
+        update_methods |= MM_MODEM_FIRMWARE_UPDATE_METHOD_FASTBOOT;
+
+    return update_methods;
+}
+
+static void
+fibocom_at_port_get_firmware_version_ready (MMBaseModem  *self,
+                                            GAsyncResult *res,
+                                            GTask        *task)
+{
+    MMFirmwareUpdateSettings    *update_settings;
+    MMModemFirmwareUpdateMethod  update_methods;
+    const gchar                 *version_from_at;
+    g_auto(GStrv)                version = NULL;
+    g_autoptr(GPtrArray)         ids = NULL;
+    GError                      *error = NULL;
+
+    update_settings = g_task_get_task_data (task);
+    update_methods = mm_firmware_update_settings_get_method (update_settings);
+
+    /* Set device ids */
+    ids = mm_iface_firmware_build_generic_device_ids (MM_IFACE_MODEM_FIRMWARE (self), &error);
+    if (error) {
+        mm_obj_warn (self, "failed to build generic device ids: %s", error->message);
+        g_task_return_error (task, error);
+        g_object_unref (task);
+        return;
+    }
+
+    /* The version get from the AT needs to be formatted
+     *
+     * version_from_at : AT+GTPKGVER: "19500.0000.00.01.02.80_6001.0000.007.000.075_A89"
+     * version[1] : 19500.0000.00.01.02.80_6001.0000.007.000.075_A89
+     */
+    version_from_at = mm_base_modem_at_command_finish (self, res, NULL);
+    if (version_from_at) {
+        version = g_strsplit (version_from_at, "\"", -1);
+        if (version && version[0] && version[1] && g_utf8_validate (version[1], -1, NULL)) {
+            mm_firmware_update_settings_set_version (update_settings, version[1]);
+        }
+    }
+
+    mm_firmware_update_settings_set_device_ids (update_settings, (const gchar **)ids->pdata);
+
+    /* Set update methods */
+    if (update_methods & MM_MODEM_FIRMWARE_UPDATE_METHOD_FASTBOOT) {
+        /* Fastboot AT */
+        mm_firmware_update_settings_set_fastboot_at (update_settings, "AT+SYSCMD=\"sys_reboot bootloader\"");
+    }
+
+    g_task_return_pointer (task, g_object_ref (update_settings), g_object_unref);
+    g_object_unref (task);
+}
+
+void
+mm_shared_fibocom_firmware_load_update_settings (MMIfaceModemFirmware *self,
+                                                 GAsyncReadyCallback   callback,
+                                                 gpointer              user_data)
+{
+    GTask *task;
+    MMPortSerialAt *at_port;
+    MMModemFirmwareUpdateMethod update_methods;
+    MMFirmwareUpdateSettings *update_settings;
+
+    task = g_task_new (self, NULL, callback, user_data);
+
+    at_port = mm_base_modem_peek_best_at_port (MM_BASE_MODEM (self), NULL);
+    if (at_port) {
+        update_methods = fibocom_get_firmware_update_methods (MM_BASE_MODEM (self), MM_PORT (at_port));
+        update_settings = mm_firmware_update_settings_new (update_methods);
+        g_task_set_task_data (task, update_settings, g_object_unref);
+
+        /* Get modem version by AT */
+        mm_base_modem_at_command (MM_BASE_MODEM (self),
+                                  "+GTPKGVER?",
+                                  3,
+                                  TRUE,
+                                  (GAsyncReadyCallback) fibocom_at_port_get_firmware_version_ready,
+                                  task);
+
+        return;
+    }
+
+    g_task_return_new_error (task,
+                             MM_CORE_ERROR,
+                             MM_CORE_ERROR_FAILED,
+                             "Couldn't find a port to fetch firmware info");
+    g_object_unref (task);
+}
+
+/*****************************************************************************/
+
 static void
 shared_fibocom_init (gpointer g_iface)
 {
diff --git a/src/plugins/fibocom/mm-shared-fibocom.h b/src/plugins/fibocom/mm-shared-fibocom.h
index cc4348d2..cbd6e172 100644
--- a/src/plugins/fibocom/mm-shared-fibocom.h
+++ b/src/plugins/fibocom/mm-shared-fibocom.h
@@ -25,6 +25,7 @@
 #include "mm-broadband-modem.h"
 #include "mm-iface-modem-3gpp.h"
 #include "mm-iface-modem.h"
+#include "mm-iface-modem-firmware.h"
 
 #define MM_TYPE_SHARED_FIBOCOM               (mm_shared_fibocom_get_type ())
 #define MM_SHARED_FIBOCOM(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_SHARED_FIBOCOM, MMSharedFibocom))
@@ -46,8 +47,17 @@ void     mm_shared_fibocom_set_initial_eps_bearer_settings        (MMIfaceModem3
                                                                    MMBearerProperties  *config,
                                                                    GAsyncReadyCallback  callback,
                                                                    gpointer             user_data);
+
 gboolean mm_shared_fibocom_set_initial_eps_bearer_settings_finish (MMIfaceModem3gpp    *self,
                                                                    GAsyncResult        *res,
                                                                    GError             **error);
 
+void                      mm_shared_fibocom_firmware_load_update_settings        (MMIfaceModemFirmware  *self,
+                                                                                  GAsyncReadyCallback    callback,
+                                                                                  gpointer               user_data);
+
+MMFirmwareUpdateSettings *mm_shared_fibocom_firmware_load_update_settings_finish (MMIfaceModemFirmware  *self,
+                                                                                  GAsyncResult          *res,
+                                                                                  GError               **error);
+
 #endif /* MM_SHARED_FIBOCOM_H */