Merge request !1271 from 'generic-sahara-firehose'

broadband-modem: generic Firehose and Sahara support

https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/1271

24 files changed, 531 insertions, 169 deletions

diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c
index 8e51c6ed..82a7b574 100644
--- a/src/mm-broadband-modem-mbim.c
+++ b/src/mm-broadband-modem-mbim.c
@@ -41,6 +41,7 @@
 #include "mm-iface-modem-3gpp-profile-manager.h"
 #include "mm-iface-modem-3gpp-ussd.h"
 #include "mm-iface-modem-location.h"
+#include "mm-iface-modem-firmware.h"
 #include "mm-iface-modem-messaging.h"
 #include "mm-iface-modem-signal.h"
 #include "mm-iface-modem-sar.h"
@@ -56,6 +57,7 @@ static void iface_modem_3gpp_init                 (MMIfaceModem3gppInterface
 static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManagerInterface *iface);
 static void iface_modem_3gpp_ussd_init            (MMIfaceModem3gppUssdInterface           *iface);
 static void iface_modem_location_init             (MMIfaceModemLocationInterface           *iface);
+static void iface_modem_firmware_init             (MMIfaceModemFirmwareInterface           *iface);
 static void iface_modem_messaging_init            (MMIfaceModemMessagingInterface          *iface);
 static void iface_modem_signal_init               (MMIfaceModemSignalInterface             *iface);
 static void iface_modem_sar_init                  (MMIfaceModemSarInterface                *iface);
@@ -75,6 +77,7 @@ G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbim, mm_broadband_modem_mbim, MM_TYPE_B
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP_PROFILE_MANAGER, iface_modem_3gpp_profile_manager_init)
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP_USSD, iface_modem_3gpp_ussd_init)
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_LOCATION, iface_modem_location_init)
+                        G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_FIRMWARE, iface_modem_firmware_init)
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_MESSAGING, iface_modem_messaging_init)
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_SIGNAL, iface_modem_signal_init)
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_SAR, iface_modem_sar_init)
@@ -10293,6 +10296,29 @@ modem_set_carrier_lock (MMIfaceModem3gpp    *_self,
 }
 
 /*****************************************************************************/
+/* Load update settings (Firmware interface) */
+
+static MMFirmwareUpdateSettings *
+modem_firmware_load_update_settings_finish (MMIfaceModemFirmware  *self,
+                                            GAsyncResult          *res,
+                                            GError               **error)
+{
+    return mm_iface_modem_firmware_load_update_settings_in_port_finish (self, res, error);
+}
+
+static void
+modem_firmware_load_update_settings (MMIfaceModemFirmware *self,
+                                     GAsyncReadyCallback   callback,
+                                     gpointer              user_data)
+{
+    mm_iface_modem_firmware_load_update_settings_in_port (
+        self,
+        MM_PORT (mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (self))),
+        callback,
+        user_data);
+}
+
+/*****************************************************************************/
 
 MMBroadbandModemMbim *
 mm_broadband_modem_mbim_new (const gchar *device,
@@ -10627,6 +10653,13 @@ iface_modem_location_init (MMIfaceModemLocationInterface *iface)
 }
 
 static void
+iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
+{
+    iface->load_update_settings = modem_firmware_load_update_settings;
+    iface->load_update_settings_finish = modem_firmware_load_update_settings_finish;
+}
+
+static void
 iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface)
 {
     iface->check_support = messaging_check_support;
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index 2c817fc7..b0cd45da 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -13105,6 +13105,29 @@ signal_setup_thresholds (MMIfaceModemSignal  *self,
 }
 
 /*****************************************************************************/
+/* Load update settings (Firmware interface) */
+
+static MMFirmwareUpdateSettings *
+modem_firmware_load_update_settings_finish (MMIfaceModemFirmware  *self,
+                                            GAsyncResult          *res,
+                                            GError               **error)
+{
+    return mm_iface_modem_firmware_load_update_settings_in_port_finish (self, res, error);
+}
+
+static void
+modem_firmware_load_update_settings (MMIfaceModemFirmware *self,
+                                     GAsyncReadyCallback   callback,
+                                     gpointer              user_data)
+{
+    mm_iface_modem_firmware_load_update_settings_in_port (
+        self,
+        MM_PORT (mm_broadband_modem_qmi_peek_port_qmi (MM_BROADBAND_MODEM_QMI (self))),
+        callback,
+        user_data);
+}
+
+/*****************************************************************************/
 /* Reset data interfaces during initialization */
 
 typedef struct {
@@ -14050,6 +14073,8 @@ iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
     iface->load_current_finish = firmware_load_current_finish;
     iface->change_current = firmware_change_current;
     iface->change_current_finish = firmware_change_current_finish;
+    iface->load_update_settings = modem_firmware_load_update_settings;
+    iface->load_update_settings_finish = modem_firmware_load_update_settings_finish;
 }
 
 static MMIfaceModemLocationInterface *
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index c4140015..ddeb8d0e 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -11391,6 +11391,29 @@ modem_3gpp_profile_manager_store_profile (MMIfaceModem3gppProfileManager *self,
 }
 
 /*****************************************************************************/
+/* Load update settings (Firmware interface) */
+
+static MMFirmwareUpdateSettings *
+modem_firmware_load_update_settings_finish (MMIfaceModemFirmware  *self,
+                                            GAsyncResult          *res,
+                                            GError               **error)
+{
+    return mm_iface_modem_firmware_load_update_settings_in_port_finish (self, res, error);
+}
+
+static void
+modem_firmware_load_update_settings (MMIfaceModemFirmware *self,
+                                     GAsyncReadyCallback   callback,
+                                     gpointer              user_data)
+{
+    mm_iface_modem_firmware_load_update_settings_in_port (
+        self,
+        MM_PORT (mm_base_modem_peek_port_primary (MM_BASE_MODEM (self))),
+        callback,
+        user_data);
+}
+
+/*****************************************************************************/
 
 static const gchar *primary_init_sequence[] = {
     /* Ensure echo is off */
@@ -14347,6 +14370,8 @@ iface_modem_oma_init (MMIfaceModemOmaInterface *iface)
 static void
 iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
 {
+    iface->load_update_settings = modem_firmware_load_update_settings;
+    iface->load_update_settings_finish = modem_firmware_load_update_settings_finish;
 }
 
 static void
diff --git a/src/mm-iface-modem-firmware.c b/src/mm-iface-modem-firmware.c
index 9872db23..ee52ae80 100644
--- a/src/mm-iface-modem-firmware.c
+++ b/src/mm-iface-modem-firmware.c
@@ -40,6 +40,58 @@ mm_iface_modem_firmware_bind_simple_status (MMIfaceModemFirmware *self,
 }
 
 /*****************************************************************************/
+/* Load update settings in port (Firmware interface) */
+
+MMFirmwareUpdateSettings *
+mm_iface_modem_firmware_load_update_settings_in_port_finish (MMIfaceModemFirmware  *self,
+                                                             GAsyncResult          *res,
+                                                             GError               **error)
+{
+    return g_task_propagate_pointer (G_TASK (res), error);
+}
+
+static gboolean
+modem_is_sahara_supported (MMKernelDevice *kernel_device)
+{
+    return mm_kernel_device_get_global_property_as_boolean (kernel_device, "ID_MM_QUALCOMM_SAHARA");
+}
+
+static gboolean
+modem_is_firehose_supported (MMKernelDevice *kernel_device)
+{
+    return mm_kernel_device_get_global_property_as_boolean (kernel_device, "ID_MM_QUALCOMM_FIREHOSE");
+}
+
+void
+mm_iface_modem_firmware_load_update_settings_in_port (MMIfaceModemFirmware *self,
+                                                      MMPort               *port,
+                                                      GAsyncReadyCallback   callback,
+                                                      gpointer              user_data)
+{
+    GTask                               *task;
+    MMModemFirmwareUpdateMethod          update_methods;
+    g_autoptr(MMFirmwareUpdateSettings)  update_settings = NULL;
+
+    task = g_task_new (self, NULL, callback, user_data);
+
+    update_methods = MM_MODEM_FIRMWARE_UPDATE_METHOD_NONE;
+    if (MM_IS_PORT (port)) {
+        MMKernelDevice *kernel_device;
+
+        kernel_device = mm_port_peek_kernel_device (MM_PORT (port));
+
+        if (modem_is_firehose_supported (kernel_device))
+            update_methods |= MM_MODEM_FIRMWARE_UPDATE_METHOD_FIREHOSE;
+        if (modem_is_sahara_supported (kernel_device))
+            update_methods |= MM_MODEM_FIRMWARE_UPDATE_METHOD_SAHARA;
+    }
+
+    update_settings = mm_firmware_update_settings_new (update_methods);
+    g_task_return_pointer (task, g_object_ref (update_settings), (GDestroyNotify)g_object_unref);
+    g_object_unref (task);
+}
+
+/*****************************************************************************/
 /* Handle the 'List' method from DBus */
 
 typedef struct {
diff --git a/src/mm-iface-modem-firmware.h b/src/mm-iface-modem-firmware.h
index e5ee980d..83485a3c 100644
--- a/src/mm-iface-modem-firmware.h
+++ b/src/mm-iface-modem-firmware.h
@@ -87,4 +87,15 @@ void mm_iface_modem_firmware_shutdown (MMIfaceModemFirmware *self);
 void mm_iface_modem_firmware_bind_simple_status (MMIfaceModemFirmware *self,
                                                  MMSimpleStatus *status);
 
+/* Helper to load common update settings on the primary port */
+void mm_iface_modem_firmware_load_update_settings_in_port (
+    MMIfaceModemFirmware *self,
+    MMPort               *port,
+    GAsyncReadyCallback   callback,
+    gpointer              user_data);
+MMFirmwareUpdateSettings *mm_iface_modem_firmware_load_update_settings_in_port_finish (
+    MMIfaceModemFirmware  *self,
+    GAsyncResult          *res,
+    GError               **error);
+
 #endif /* MM_IFACE_MODEM_FIRMWARE_H */
diff --git a/src/plugins/cinterion/mm-broadband-modem-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-cinterion.c
index b3643021..31a3078a 100644
--- a/src/plugins/cinterion/mm-broadband-modem-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-cinterion.c
@@ -54,6 +54,7 @@ static void iface_modem_signal_init    (MMIfaceModemSignalInterface    *iface);
 static void shared_cinterion_init      (MMSharedCinterionInterface     *iface);
 
 static MMIfaceModemInterface         *iface_modem_parent;
+static MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
 static MMIfaceModem3gppInterface     *iface_modem_3gpp_parent;
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
 static MMIfaceModemVoiceInterface    *iface_modem_voice_parent;
@@ -3311,10 +3312,18 @@ peek_parent_interface (MMSharedCinterion *self)
 static void
 iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
 {
+    iface_modem_firmware_parent = g_type_interface_peek_parent (iface);
+
     iface->load_update_settings = mm_shared_cinterion_firmware_load_update_settings;
     iface->load_update_settings_finish = mm_shared_cinterion_firmware_load_update_settings_finish;
 }
 
+static MMIfaceModemFirmwareInterface *
+peek_parent_firmware_interface (MMSharedCinterion *self)
+{
+    return iface_modem_firmware_parent;
+}
+
 static void
 iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface)
 {
@@ -3414,6 +3423,7 @@ static void
 shared_cinterion_init (MMSharedCinterionInterface *iface)
 {
     iface->peek_parent_interface          = peek_parent_interface;
+    iface->peek_parent_firmware_interface = peek_parent_firmware_interface;
     iface->peek_parent_location_interface = peek_parent_location_interface;
     iface->peek_parent_voice_interface    = peek_parent_voice_interface;
     iface->peek_parent_time_interface     = peek_parent_time_interface;
diff --git a/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
index eb1c09a5..b8d765d3 100644
--- a/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
@@ -39,6 +39,7 @@ static void iface_modem_time_init     (MMIfaceModemTimeInterface     *iface);
 static void shared_cinterion_init     (MMSharedCinterionInterface    *iface);
 
 static MMIfaceModemInterface         *iface_modem_parent;
+static MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
 static MMIfaceModemVoiceInterface    *iface_modem_voice_parent;
 static MMIfaceModemTimeInterface     *iface_modem_time_parent;
@@ -100,10 +101,18 @@ peek_parent_interface (MMSharedCinterion *self)
 static void
 iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
 {
+    iface_modem_firmware_parent = g_type_interface_peek_parent (iface);
+
     iface->load_update_settings = mm_shared_cinterion_firmware_load_update_settings;
     iface->load_update_settings_finish = mm_shared_cinterion_firmware_load_update_settings_finish;
 }
 
+static MMIfaceModemFirmwareInterface *
+peek_parent_firmware_interface (MMSharedCinterion *self)
+{
+    return iface_modem_firmware_parent;
+}
+
 static void
 iface_modem_location_init (MMIfaceModemLocationInterface *iface)
 {
@@ -169,6 +178,7 @@ static void
 shared_cinterion_init (MMSharedCinterionInterface *iface)
 {
     iface->peek_parent_interface          = peek_parent_interface;
+    iface->peek_parent_firmware_interface = peek_parent_firmware_interface;
     iface->peek_parent_location_interface = peek_parent_location_interface;
     iface->peek_parent_voice_interface    = peek_parent_voice_interface;
     iface->peek_parent_time_interface     = peek_parent_time_interface;
diff --git a/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
index da064a40..dfdd54f1 100644
--- a/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
@@ -40,6 +40,7 @@ static void iface_modem_time_init     (MMIfaceModemTimeInterface     *iface);
 static void shared_cinterion_init     (MMSharedCinterionInterface    *iface);
 
 static MMIfaceModemInterface         *iface_modem_parent;
+static MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
 static MMIfaceModemVoiceInterface    *iface_modem_voice_parent;
 static MMIfaceModemTimeInterface     *iface_modem_time_parent;
@@ -99,10 +100,18 @@ peek_parent_interface (MMSharedCinterion *self)
 static void
 iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
 {
+    iface_modem_firmware_parent = g_type_interface_peek_parent (iface);
+
     iface->load_update_settings = mm_shared_cinterion_firmware_load_update_settings;
     iface->load_update_settings_finish = mm_shared_cinterion_firmware_load_update_settings_finish;
 }
 
+static MMIfaceModemFirmwareInterface *
+peek_parent_firmware_interface (MMSharedCinterion *self)
+{
+    return iface_modem_firmware_parent;
+}
+
 static void
 iface_modem_location_init (MMIfaceModemLocationInterface *iface)
 {
@@ -168,6 +177,7 @@ static void
 shared_cinterion_init (MMSharedCinterionInterface *iface)
 {
     iface->peek_parent_interface          = peek_parent_interface;
+    iface->peek_parent_firmware_interface = peek_parent_firmware_interface;
     iface->peek_parent_location_interface = peek_parent_location_interface;
     iface->peek_parent_voice_interface    = peek_parent_voice_interface;
     iface->peek_parent_time_interface     = peek_parent_time_interface;
diff --git a/src/plugins/cinterion/mm-shared-cinterion.c b/src/plugins/cinterion/mm-shared-cinterion.c
index 0ebf0499..8724ad3a 100644
--- a/src/plugins/cinterion/mm-shared-cinterion.c
+++ b/src/plugins/cinterion/mm-shared-cinterion.c
@@ -49,6 +49,8 @@ typedef enum {
 typedef struct {
     /* modem */
     MMIfaceModemInterface *iface_modem_parent;
+    /* firmware */
+    MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
     /* location */
     MMIfaceModemLocationInterface  *iface_modem_location_parent;
     MMModemLocationSource           supported_sources;
@@ -98,6 +100,9 @@ get_private (MMSharedCinterion *self)
         g_assert (MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_interface);
         priv->iface_modem_parent = MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_interface (self);
 
+        g_assert (MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_firmware_interface);
+        priv->iface_modem_firmware_parent = MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_firmware_interface (self);
+
         g_assert (MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_location_interface);
         priv->iface_modem_location_parent = MM_SHARED_CINTERION_GET_IFACE (self)->peek_parent_location_interface (self);
 
@@ -194,18 +199,6 @@ mm_shared_cinterion_modem_reset (MMIfaceModem        *self,
 
 /*****************************************************************************/
 /* Firmware update settings loading (Firmware interface) */
-
-typedef struct {
-    MMFirmwareUpdateSettings *update_settings;
-} LoadUpdateSettingsContext;
-
-static void
-load_update_settings_context_free (LoadUpdateSettingsContext *ctx)
-{
-    g_clear_object (&ctx->update_settings);
-    g_free (ctx);
-}
-
 MMFirmwareUpdateSettings *
 mm_shared_cinterion_firmware_load_update_settings_finish (MMIfaceModemFirmware  *self,
                                                           GAsyncResult          *res,
@@ -219,14 +212,14 @@ sfdl_test_ready (MMBaseModem  *self,
                  GAsyncResult *res,
                  GTask        *task)
 {
-    LoadUpdateSettingsContext *ctx;
+    MMFirmwareUpdateSettings *update_settings;
 
-    ctx = g_task_get_task_data (task);
+    update_settings = g_task_get_task_data (task);
 
     if (mm_base_modem_at_command_finish (self, res, NULL))
-        mm_firmware_update_settings_set_method (ctx->update_settings, MM_MODEM_FIRMWARE_UPDATE_METHOD_CINTERION_FDL);
+        mm_firmware_update_settings_set_method (update_settings, MM_MODEM_FIRMWARE_UPDATE_METHOD_CINTERION_FDL);
 
-    g_task_return_pointer (task, g_object_ref (ctx->update_settings), g_object_unref);
+    g_task_return_pointer (task, g_object_ref (update_settings), g_object_unref);
     g_object_unref (task);
 }
 
@@ -234,14 +227,18 @@ static void
 modem_set_cinterion_firmware_update_method (MMBaseModem *self,
                                             GTask       *task)
 {
-    LoadUpdateSettingsContext *ctx;
-    MMPortSerialAt            *at_port;
+    MMPortSerialAt              *at_port;
+    MMModemFirmwareUpdateMethod  update_methods;
+    MMFirmwareUpdateSettings    *update_settings;
 
-    ctx = g_task_get_task_data (task);
+    update_settings = g_task_get_task_data (task);
 
     /* We always report the primary port as the one to be used for FW upgrade */
     at_port = mm_base_modem_peek_port_primary (self);
-    if (at_port) {
+    update_methods = mm_firmware_update_settings_get_method (update_settings);
+
+    /* Prefer any parent's update method */
+    if (at_port && update_methods == MM_MODEM_FIRMWARE_UPDATE_METHOD_NONE) {
         mm_base_modem_at_command (self,
                                   "AT^SFDL=?",
                                   3,
@@ -251,26 +248,30 @@ modem_set_cinterion_firmware_update_method (MMBaseModem *self,
         return;
     }
 
-    g_task_return_pointer (task, g_object_ref (ctx->update_settings), g_object_unref);
+    g_task_return_pointer (task, g_object_ref (update_settings), g_object_unref);
     g_object_unref (task);
 }
 
-void
-mm_shared_cinterion_firmware_load_update_settings (MMIfaceModemFirmware *self,
-                                                   GAsyncReadyCallback   callback,
-                                                   gpointer              user_data)
+static void
+parent_load_update_settings_ready (MMIfaceModemFirmware *self,
+                                   GAsyncResult         *res,
+                                   GTask                *task)
 {
-    LoadUpdateSettingsContext *ctx;
-    g_autoptr(GPtrArray)       ids = NULL;
-    GError                    *error = NULL;
-    GTask                     *task;
+    Private                             *priv;
+    g_autoptr(GError)                    error = NULL;
+    g_autoptr(GPtrArray)                 ids = NULL;
+    g_autoptr(MMFirmwareUpdateSettings)  update_settings = NULL;
 
-    task = g_task_new (self, NULL, callback, user_data);
-    ctx = g_new0 (LoadUpdateSettingsContext, 1);
+    priv = get_private (MM_SHARED_CINTERION (self));
+    update_settings = priv->iface_modem_firmware_parent->load_update_settings_finish (self, res, &error);
+    if (error) {
+        g_task_return_error (task, error);
+        g_object_unref (task);
+        return;
+    }
 
-    g_task_set_task_data (task, ctx, (GDestroyNotify)load_update_settings_context_free);
+    g_task_set_task_data (task, g_object_ref (update_settings), g_object_unref);
 
-    ctx->update_settings = mm_firmware_update_settings_new (MM_MODEM_FIRMWARE_UPDATE_METHOD_NONE);
     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);
@@ -279,10 +280,31 @@ mm_shared_cinterion_firmware_load_update_settings (MMIfaceModemFirmware *self,
         return;
     }
 
-    mm_firmware_update_settings_set_device_ids (ctx->update_settings, (const gchar **)ids->pdata);
+    mm_firmware_update_settings_set_device_ids (update_settings, (const gchar **)ids->pdata);
     modem_set_cinterion_firmware_update_method (MM_BASE_MODEM (self), task);
 }
 
+void
+mm_shared_cinterion_firmware_load_update_settings (MMIfaceModemFirmware *self,
+                                                   GAsyncReadyCallback   callback,
+                                                   gpointer              user_data)
+{
+    GTask   *task;
+    Private *priv;
+
+    priv = get_private (MM_SHARED_CINTERION (self));
+    g_assert (priv->iface_modem_firmware_parent);
+    g_assert (priv->iface_modem_firmware_parent->load_update_settings);
+    g_assert (priv->iface_modem_firmware_parent->load_update_settings_finish);
+
+    task = g_task_new (self, NULL, callback, user_data);
+
+    priv->iface_modem_firmware_parent->load_update_settings (
+        self,
+        (GAsyncReadyCallback)parent_load_update_settings_ready,
+        task);
+}
+
 /*****************************************************************************/
 /* GPS trace received */
 
diff --git a/src/plugins/cinterion/mm-shared-cinterion.h b/src/plugins/cinterion/mm-shared-cinterion.h
index 775c8024..f330e328 100644
--- a/src/plugins/cinterion/mm-shared-cinterion.h
+++ b/src/plugins/cinterion/mm-shared-cinterion.h
@@ -40,6 +40,9 @@ struct _MMSharedCinterionInterface {
     /* Peek modem interface of the parent class of the object */
     MMIfaceModemInterface *  (* peek_parent_interface) (MMSharedCinterion *self);
 
+    /* Peek firmware interface of the parent class of the object */
+    MMIfaceModemFirmwareInterface *  (* peek_parent_firmware_interface) (MMSharedCinterion *self);
+
     /* Peek location interface of the parent class of the object */
     MMIfaceModemLocationInterface *  (* peek_parent_location_interface) (MMSharedCinterion *self);
 
diff --git a/src/plugins/fibocom/77-mm-fibocom-port-types.rules b/src/plugins/fibocom/77-mm-fibocom-port-types.rules
index 6611040a..2874ae3f 100644
--- a/src/plugins/fibocom/77-mm-fibocom-port-types.rules
+++ b/src/plugins/fibocom/77-mm-fibocom-port-types.rules
@@ -98,6 +98,10 @@ ATTRS{idVendor}=="1508", ATTRS{idProduct}=="1001", ENV{.MM_USBIFNUM}=="01", SUBS
 ATTRS{idVendor}=="1508", ATTRS{idProduct}=="1001", ENV{.MM_USBIFNUM}=="02", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_SECONDARY}="1"
 ATTRS{idVendor}=="1508", ATTRS{idProduct}=="1001", ENV{.MM_USBIFNUM}=="03", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_SECONDARY}="1"
 
+# Fibocom NL668-EAU with Sahara-Firehose support
+ATTRS{idVendor}=="1508", ATTRS{idProduct}=="1001", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="1508", ATTRS{idProduct}=="1001", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+
 # Fibocom L610 (GTUSBMODE=31)
 #  ttyUSB0 (if #0): AT port
 #  ttyUSB1 (if #1): NV
diff --git a/src/plugins/fibocom/mm-broadband-modem-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-fibocom.c
index 2bc27f16..0789188e 100644
--- a/src/plugins/fibocom/mm-broadband-modem-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-fibocom.c
@@ -27,6 +27,8 @@ static void iface_modem_init          (MMIfaceModemInterface         *iface);
 static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
 static void shared_fibocom_init       (MMSharedFibocomInterface      *iface);
 
+static MMIfaceModemFirmwareInterface *iface_modem_firmware_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_SHARED_FIBOCOM,  shared_fibocom_init)
@@ -265,10 +267,18 @@ iface_modem_init (MMIfaceModemInterface *iface)
 static void
 iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
 {
+    iface_modem_firmware_parent = g_type_interface_peek_parent (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 MMIfaceModemFirmwareInterface *
+peek_parent_firmware_interface (MMSharedFibocom *self)
+{
+    return iface_modem_firmware_parent;
+}
+
 static MMBaseModemClass *
 peek_parent_class (MMSharedFibocom *self)
 {
@@ -279,6 +289,7 @@ static void
 shared_fibocom_init (MMSharedFibocomInterface *iface)
 {
     iface->peek_parent_class = peek_parent_class;
+    iface->peek_parent_firmware_interface = peek_parent_firmware_interface;
 }
 
 static void
diff --git a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
index a94ba545..e00086e3 100644
--- a/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
@@ -30,6 +30,8 @@
 static void shared_fibocom_init       (MMSharedFibocomInterface      *iface);
 static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
 
+static MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
+
 G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimFibocom, mm_broadband_modem_mbim_fibocom, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
                         G_IMPLEMENT_INTERFACE (MM_TYPE_SHARED_FIBOCOM,  shared_fibocom_init)
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_FIRMWARE, iface_modem_firmware_init))
@@ -67,10 +69,18 @@ mm_broadband_modem_mbim_fibocom_init (MMBroadbandModemMbimFibocom *self)
 static void
 iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
 {
+    iface_modem_firmware_parent = g_type_interface_peek_parent (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 MMIfaceModemFirmwareInterface *
+peek_parent_firmware_interface (MMSharedFibocom *self)
+{
+    return iface_modem_firmware_parent;
+}
+
 static MMBaseModemClass *
 peek_parent_class (MMSharedFibocom *self)
 {
@@ -81,6 +91,7 @@ static void
 shared_fibocom_init (MMSharedFibocomInterface *iface)
 {
     iface->peek_parent_class = peek_parent_class;
+    iface->peek_parent_firmware_interface = peek_parent_firmware_interface;
 }
 
 static void
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 9ea560b4..3130cf2e 100644
--- a/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
@@ -32,6 +32,7 @@ static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
 static void shared_fibocom_init       (MMSharedFibocomInterface      *iface);
 
 static MMIfaceModemInterface *iface_modem_parent;
+static MMIfaceModemFirmwareInterface *iface_modem_firmware_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, iface_modem_init)
@@ -218,10 +219,18 @@ iface_modem_init (MMIfaceModemInterface *iface)
 static void
 iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
 {
+    iface_modem_firmware_parent = g_type_interface_peek_parent (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 MMIfaceModemFirmwareInterface *
+peek_parent_firmware_interface (MMSharedFibocom *self)
+{
+    return iface_modem_firmware_parent;
+}
+
 static MMBaseModemClass *
 peek_parent_class (MMSharedFibocom *self)
 {
@@ -232,6 +241,7 @@ static void
 shared_fibocom_init (MMSharedFibocomInterface *iface)
 {
     iface->peek_parent_class = peek_parent_class;
+    iface->peek_parent_firmware_interface = peek_parent_firmware_interface;
 }
 
 static void
diff --git a/src/plugins/fibocom/mm-shared-fibocom.c b/src/plugins/fibocom/mm-shared-fibocom.c
index 5cf90e3b..89be09ef 100644
--- a/src/plugins/fibocom/mm-shared-fibocom.c
+++ b/src/plugins/fibocom/mm-shared-fibocom.c
@@ -42,6 +42,8 @@ static GQuark private_quark;
 typedef struct {
     /* Parent class */
     MMBaseModemClass *class_parent;
+    /* Firmware interface of parent class */
+    MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
     /* URCs to ignore */
     GRegex *sim_ready_regex;
 } Private;
@@ -72,6 +74,10 @@ get_private (MMSharedFibocom *self)
         g_assert (MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_class);
         priv->class_parent = MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_class (self);
 
+        /* Setup firmware interface of parent class */
+        g_assert (MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_firmware_interface);
+        priv->iface_modem_firmware_parent = MM_SHARED_FIBOCOM_GET_IFACE (self)->peek_parent_firmware_interface (self);
+
         g_object_set_qdata_full (G_OBJECT (self), private_quark, priv, (GDestroyNotify)private_free);
     }
 
@@ -227,24 +233,37 @@ fibocom_at_port_get_firmware_version_ready (MMBaseModem  *self,
     g_object_unref (task);
 }
 
-void
-mm_shared_fibocom_firmware_load_update_settings (MMIfaceModemFirmware *self,
-                                                 GAsyncReadyCallback   callback,
-                                                 gpointer              user_data)
+static void
+parent_load_update_settings_ready (MMIfaceModemFirmware *self,
+                                   GAsyncResult         *res,
+                                   GTask                *task)
 {
-    GTask *task;
-    MMPortSerialAt *at_port;
-    MMModemFirmwareUpdateMethod update_methods;
-    MMFirmwareUpdateSettings *update_settings;
+    Private                             *priv;
+    MMPortSerialAt                      *at_port;
+    MMModemFirmwareUpdateMethod          update_methods;
+    g_autoptr(GError)                    error = NULL;
+    g_autoptr(MMFirmwareUpdateSettings)  update_settings;
 
-    task = g_task_new (self, NULL, callback, user_data);
+    priv = get_private (MM_SHARED_FIBOCOM (self));
+    update_settings = priv->iface_modem_firmware_parent->load_update_settings_finish (self, res, &error);
+    if (error) {
+        g_task_return_error (task, error);
+        g_object_unref (task);
+        return;
+    }
+
+    g_task_set_task_data (task, g_object_ref (update_settings), g_object_unref);
 
     /* We always report the primary port as the one to be used for FW upgrade */
     at_port = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
     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);
+        update_methods = mm_firmware_update_settings_get_method (update_settings);
+
+        /* Prefer any parent's update method */
+        if (update_methods == MM_MODEM_FIRMWARE_UPDATE_METHOD_NONE) {
+            update_methods = fibocom_get_firmware_update_methods (MM_BASE_MODEM (self), MM_PORT (at_port));
+            mm_firmware_update_settings_set_method (update_settings, update_methods);
+        }
 
         /* Get modem version by AT */
         mm_base_modem_at_command (MM_BASE_MODEM (self),
@@ -257,13 +276,31 @@ mm_shared_fibocom_firmware_load_update_settings (MMIfaceModemFirmware *self,
         return;
     }
 
-    g_task_return_new_error (task,
-                             MM_CORE_ERROR,
-                             MM_CORE_ERROR_FAILED,
-                             "Couldn't find a port to fetch firmware info");
+    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;
+    Private *priv;
+
+    priv = get_private (MM_SHARED_FIBOCOM (self));
+    g_assert (priv->iface_modem_firmware_parent);
+    g_assert (priv->iface_modem_firmware_parent->load_update_settings);
+    g_assert (priv->iface_modem_firmware_parent->load_update_settings_finish);
+
+    task = g_task_new (self, NULL, callback, user_data);
+
+    priv->iface_modem_firmware_parent->load_update_settings (
+        self,
+        (GAsyncReadyCallback)parent_load_update_settings_ready,
+        task);
+}
+
 /*****************************************************************************/
 
 static void
diff --git a/src/plugins/fibocom/mm-shared-fibocom.h b/src/plugins/fibocom/mm-shared-fibocom.h
index 22d57dcf..2a1eda05 100644
--- a/src/plugins/fibocom/mm-shared-fibocom.h
+++ b/src/plugins/fibocom/mm-shared-fibocom.h
@@ -36,6 +36,9 @@ struct _MMSharedFibocomInterface {
 
     /* Peek parent class of the object */
     MMBaseModemClass * (* peek_parent_class) (MMSharedFibocom *self);
+
+    /* Peek firmware interface of the parent class of the object */
+    MMIfaceModemFirmwareInterface *  (* peek_parent_firmware_interface) (MMSharedFibocom *self);
 };
 
 void mm_shared_fibocom_setup_ports (MMBroadbandModem *self);
diff --git a/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c b/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
index 060194e1..c7965133 100644
--- a/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
+++ b/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
@@ -42,6 +42,8 @@
 static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
 #if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED
 static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
+
+static MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
 #endif
 
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
@@ -121,23 +123,28 @@ needs_fastboot_and_qmi_pdc_mcfg_apps_version (MMIfaceModemFirmware *self)
     return (vendor_id == 0x413c && (product_id == 0x81d7 || product_id == 0x81e0 || product_id == 0x81e4 || product_id == 0x81e6));
 }
 
-static MMFirmwareUpdateSettings *
-create_update_settings (MMIfaceModemFirmware *self,
-                        const gchar          *version_str)
+static void
+fill_update_settings (MMIfaceModemFirmware     *self,
+                      MMFirmwareUpdateSettings *update_settings,
+                      const gchar              *version_str)
 {
-    MMModemFirmwareUpdateMethod  methods = MM_MODEM_FIRMWARE_UPDATE_METHOD_NONE;
-    MMFirmwareUpdateSettings    *update_settings = NULL;
+    MMModemFirmwareUpdateMethod methods;
 
-    if (needs_qdu_and_mcfg_apps_version (self))
-        methods = MM_MODEM_FIRMWARE_UPDATE_METHOD_MBIM_QDU;
-    else
-        methods = MM_MODEM_FIRMWARE_UPDATE_METHOD_FASTBOOT | MM_MODEM_FIRMWARE_UPDATE_METHOD_QMI_PDC;
+    methods = mm_firmware_update_settings_get_method (update_settings);
 
-    update_settings = mm_firmware_update_settings_new (methods);
-    if (methods & MM_MODEM_FIRMWARE_UPDATE_METHOD_FASTBOOT)
-        mm_firmware_update_settings_set_fastboot_at (update_settings, "AT^FASTBOOT");
+    /* Prefer any parent's update method */
+    if (methods == MM_MODEM_FIRMWARE_UPDATE_METHOD_NONE) {
+        if (needs_qdu_and_mcfg_apps_version (self))
+            methods = MM_MODEM_FIRMWARE_UPDATE_METHOD_MBIM_QDU;
+        else
+            methods = MM_MODEM_FIRMWARE_UPDATE_METHOD_FASTBOOT | MM_MODEM_FIRMWARE_UPDATE_METHOD_QMI_PDC;
+
+        mm_firmware_update_settings_set_method (update_settings, methods);
+
+        if (methods & MM_MODEM_FIRMWARE_UPDATE_METHOD_FASTBOOT)
+            mm_firmware_update_settings_set_fastboot_at (update_settings, "AT^FASTBOOT");
+    }
     mm_firmware_update_settings_set_version (update_settings, version_str);
-    return update_settings;
 }
 
 static void
@@ -146,6 +153,7 @@ dms_foxconn_get_firmware_version_ready (QmiClientDms *client,
                                         GTask        *task)
 {
     g_autoptr(QmiMessageDmsFoxconnGetFirmwareVersionOutput)  output = NULL;
+    MMFirmwareUpdateSettings                                *update_settings = NULL;
     GError                                                  *error = NULL;
     const gchar                                             *str;
 
@@ -155,12 +163,12 @@ dms_foxconn_get_firmware_version_ready (QmiClientDms *client,
         g_object_unref (task);
         return;
     }
+    update_settings = g_task_get_task_data (task);
 
     qmi_message_dms_foxconn_get_firmware_version_output_get_version (output, &str, NULL);
 
-    g_task_return_pointer (task,
-                           create_update_settings (g_task_get_source_object (task), str),
-                           g_object_unref);
+    fill_update_settings (g_task_get_source_object (task), update_settings, str);
+    g_task_return_pointer (task, g_object_ref (update_settings), g_object_unref);
     g_object_unref (task);
 }
 
@@ -170,6 +178,7 @@ fox_get_firmware_version_ready (QmiClientFox *client,
                                 GTask        *task)
 {
     g_autoptr(QmiMessageFoxGetFirmwareVersionOutput)  output = NULL;
+    MMFirmwareUpdateSettings                         *update_settings = NULL;
     GError                                           *error = NULL;
     const gchar                                      *str;
 
@@ -179,12 +188,12 @@ fox_get_firmware_version_ready (QmiClientFox *client,
         g_object_unref (task);
         return;
     }
+    update_settings = g_task_get_task_data (task);
 
     qmi_message_fox_get_firmware_version_output_get_version (output, &str, NULL);
 
-    g_task_return_pointer (task,
-                           create_update_settings (g_task_get_source_object (task), str),
-                           g_object_unref);
+    fill_update_settings (g_task_get_source_object (task), update_settings, str);
+    g_task_return_pointer (task, g_object_ref (update_settings), g_object_unref);
     g_object_unref (task);
 }
 
@@ -255,14 +264,22 @@ mbim_port_allocate_qmi_client_ready (MMPortMbim     *mbim,
 }
 
 static void
-firmware_load_update_settings (MMIfaceModemFirmware *self,
-                               GAsyncReadyCallback   callback,
-                               gpointer              user_data)
+parent_load_update_settings_ready (MMIfaceModemFirmware *self,
+                                   GAsyncResult         *res,
+                                   GTask                *task)
 {
-    GTask      *task;
-    MMPortMbim *mbim;
+    MMPortMbim                          *mbim;
+    g_autoptr(GError)                    error = NULL;
+    g_autoptr(MMFirmwareUpdateSettings)  update_settings;
 
-    task = g_task_new (self, NULL, callback, user_data);
+    update_settings = iface_modem_firmware_parent->load_update_settings_finish (self, res, &error);
+    if (error) {
+        g_task_return_error (task, error);
+        g_object_unref (task);
+        return;
+    }
+
+    g_task_set_task_data (task, g_object_ref (update_settings), g_object_unref);
 
     mbim = mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (self));
     mm_port_mbim_allocate_qmi_client (mbim,
@@ -272,6 +289,25 @@ firmware_load_update_settings (MMIfaceModemFirmware *self,
                                       task);
 }
 
+static void
+firmware_load_update_settings (MMIfaceModemFirmware *self,
+                               GAsyncReadyCallback   callback,
+                               gpointer              user_data)
+{
+    GTask *task;
+
+    g_assert (iface_modem_firmware_parent);
+    g_assert (iface_modem_firmware_parent->load_update_settings);
+    g_assert (iface_modem_firmware_parent->load_update_settings_finish);
+
+    task = g_task_new (self, NULL, callback, user_data);
+
+    iface_modem_firmware_parent->load_update_settings (
+        self,
+        (GAsyncReadyCallback)parent_load_update_settings_ready,
+        task);
+}
+
 #endif
 
 /*****************************************************************************/
@@ -598,6 +634,8 @@ iface_modem_location_init (MMIfaceModemLocationInterface *iface)
 static void
 iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
 {
+    iface_modem_firmware_parent = g_type_interface_peek_parent (iface);
+
     iface->load_update_settings = firmware_load_update_settings;
     iface->load_update_settings_finish = firmware_load_update_settings_finish;
 }
diff --git a/src/plugins/netprisma/77-mm-netprisma-port-types.rules b/src/plugins/netprisma/77-mm-netprisma-port-types.rules
index c2d55e16..c7dd7fee 100644
--- a/src/plugins/netprisma/77-mm-netprisma-port-types.rules
+++ b/src/plugins/netprisma/77-mm-netprisma-port-types.rules
@@ -55,41 +55,41 @@ ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010c", ENV{.MM_USBIFNUM}=="04", SUBS
 ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010c", ENV{.MM_USBIFNUM}=="05", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_PRIMARY}="1"
 
 # Netprisma LCUK54-WWD variants with Sahara-Firehose support:
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0100", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0100", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010b", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010b", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010d", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010d", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0111", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0111", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0112", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0112", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0113", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0113", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0115", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0115", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0116", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0116", ENV{ID_MM_QUECTEL_SAHARA}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0100", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0100", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010b", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010b", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010d", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010d", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0111", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0111", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0112", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0112", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0113", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0113", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0115", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0115", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0116", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0116", ENV{ID_MM_QUALCOMM_SAHARA}="1"
 
 # Netprisma LCUK54-WWD variants with Sahara-Firehose support:
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0101", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0101", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0106", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0106", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010a", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010a", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010c", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010c", ENV{ID_MM_QUECTEL_SAHARA}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0101", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0101", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0106", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="0106", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010a", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010a", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010c", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="3731", ATTRS{idProduct}=="010c", ENV{ID_MM_QUALCOMM_SAHARA}="1"
 
 GOTO="mm_netprisma_end"
 
 LABEL="mm_netprisma_pci"
 
 # Netprisma LCUR57-WWD with firehose support
-ATTRS{vendor}=="0x203e", ATTRS{device}=="0x1000", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
+ATTRS{vendor}=="0x203e", ATTRS{device}=="0x1000", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
 
 # Netprisma CFUN69-WWD with firehose support
-ATTRS{vendor}=="0x203e", ATTRS{device}=="0x1001", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
+ATTRS{vendor}=="0x203e", ATTRS{device}=="0x1001", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
 
 LABEL="mm_netprisma_end"
diff --git a/src/plugins/quectel/77-mm-quectel-port-types.rules b/src/plugins/quectel/77-mm-quectel-port-types.rules
index c7765d39..479d65a2 100644
--- a/src/plugins/quectel/77-mm-quectel-port-types.rules
+++ b/src/plugins/quectel/77-mm-quectel-port-types.rules
@@ -107,48 +107,48 @@ ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0801", ENV{.MM_USBIFNUM}=="02", SUBS
 ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0801", ENV{.MM_USBIFNUM}=="03", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_SECONDARY}="1"
 
 # Quectel EM05-G variants with Sahara-Firehose support:
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="030a", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="030a", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="030c", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="030c", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0311", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0311", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0313", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0313", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0314", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0314", ENV{ID_MM_QUECTEL_SAHARA}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="030a", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="030a", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="030c", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="030c", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0311", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0311", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0313", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0313", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0314", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0314", ENV{ID_MM_QUALCOMM_SAHARA}="1"
 
 # Quectel EM061K-GL variants with Sahara-Firehose support:
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="6008", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="6008", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="6009", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="6009", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0123", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0123", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0124", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0124", ENV{ID_MM_QUECTEL_SAHARA}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="6008", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="6008", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="6009", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="6009", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0123", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0123", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0124", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0124", ENV{ID_MM_QUALCOMM_SAHARA}="1"
 
 # Quectel EM05-CN variants with Sahara-Firehose support
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0310", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0310", ENV{ID_MM_QUECTEL_SAHARA}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0312", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0312", ENV{ID_MM_QUECTEL_SAHARA}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0310", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0310", ENV{ID_MM_QUALCOMM_SAHARA}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0312", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0312", ENV{ID_MM_QUALCOMM_SAHARA}="1"
 
 # Quectel EM05-CE with Sahara-Firehose support
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0127", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0127", ENV{ID_MM_QUECTEL_SAHARA}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0127", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0127", ENV{ID_MM_QUALCOMM_SAHARA}="1"
 
 GOTO="mm_quectel_end"
 
 LABEL="mm_quectel_pci"
 
 # Quectel EM120 and EM160 (two variants: 0x1002 and 0x100d) with firehose support
-ATTRS{vendor}=="0x1eac", ATTRS{device}=="0x1001", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{vendor}=="0x1eac", ATTRS{device}=="0x1002", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{vendor}=="0x1eac", ATTRS{device}=="0x100d", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
+ATTRS{vendor}=="0x1eac", ATTRS{device}=="0x1001", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{vendor}=="0x1eac", ATTRS{device}=="0x1002", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{vendor}=="0x1eac", ATTRS{device}=="0x100d", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
 
 # Quectel RM520 (two variants: 0x1004 and 0x1007) with firehose support
-ATTRS{vendor}=="0x1eac", ATTRS{device}=="0x1004", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
-ATTRS{vendor}=="0x1eac", ATTRS{device}=="0x1007", ENV{ID_MM_QUECTEL_FIREHOSE}="1"
+ATTRS{vendor}=="0x1eac", ATTRS{device}=="0x1004", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
+ATTRS{vendor}=="0x1eac", ATTRS{device}=="0x1007", ENV{ID_MM_QUALCOMM_FIREHOSE}="1"
 
 LABEL="mm_quectel_end"
diff --git a/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
index 82fa8c47..838b04a5 100644
--- a/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
@@ -29,6 +29,7 @@ static void iface_modem_time_init     (MMIfaceModemTimeInterface     *iface);
 static void shared_quectel_init       (MMSharedQuectelInterface      *iface);
 
 static MMIfaceModemInterface         *iface_modem_parent;
+static MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
 
 G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimQuectel, mm_broadband_modem_mbim_quectel, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
@@ -83,6 +84,8 @@ iface_modem_init (MMIfaceModemInterface *iface)
 static void
 iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
 {
+    iface_modem_firmware_parent = g_type_interface_peek_parent (iface);
+
     iface->load_update_settings        = mm_shared_quectel_firmware_load_update_settings;
     iface->load_update_settings_finish = mm_shared_quectel_firmware_load_update_settings_finish;
 }
@@ -113,6 +116,12 @@ peek_parent_modem_interface (MMSharedQuectel *self)
     return iface_modem_parent;
 }
 
+static MMIfaceModemFirmwareInterface *
+peek_parent_modem_firmware_interface (MMSharedQuectel *self)
+{
+    return iface_modem_firmware_parent;
+}
+
 static MMIfaceModemLocationInterface *
 peek_parent_modem_location_interface (MMSharedQuectel *self)
 {
@@ -129,6 +138,7 @@ static void
 shared_quectel_init (MMSharedQuectelInterface *iface)
 {
     iface->peek_parent_modem_interface          = peek_parent_modem_interface;
+    iface->peek_parent_modem_firmware_interface = peek_parent_modem_firmware_interface;
     iface->peek_parent_modem_location_interface = peek_parent_modem_location_interface;
     iface->peek_parent_class                    = peek_parent_class;
 }
diff --git a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
index a4e536a7..591718e4 100644
--- a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
@@ -33,6 +33,7 @@ static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManage
 static void shared_quectel_init                   (MMSharedQuectelInterface                *iface);
 
 static MMIfaceModemInterface                   *iface_modem_parent;
+static MMIfaceModemFirmwareInterface           *iface_modem_firmware_parent;
 static MMIfaceModemLocationInterface           *iface_modem_location_parent;
 static MMIfaceModem3gppProfileManagerInterface *iface_modem_3gpp_profile_manager_parent;
 
@@ -165,6 +166,8 @@ iface_modem_init (MMIfaceModemInterface *iface)
 static void
 iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
 {
+    iface_modem_firmware_parent = g_type_interface_peek_parent (iface);
+
     iface->load_update_settings = mm_shared_quectel_firmware_load_update_settings;
     iface->load_update_settings_finish = mm_shared_quectel_firmware_load_update_settings_finish;
 }
@@ -201,6 +204,12 @@ peek_parent_modem_interface (MMSharedQuectel *self)
     return iface_modem_parent;
 }
 
+static MMIfaceModemFirmwareInterface *
+peek_parent_modem_firmware_interface (MMSharedQuectel *self)
+{
+    return iface_modem_firmware_parent;
+}
+
 static MMIfaceModemLocationInterface *
 peek_parent_modem_location_interface (MMSharedQuectel *self)
 {
@@ -220,6 +229,7 @@ static void
 shared_quectel_init (MMSharedQuectelInterface *iface)
 {
     iface->peek_parent_modem_interface          = peek_parent_modem_interface;
+    iface->peek_parent_modem_firmware_interface = peek_parent_modem_firmware_interface;
     iface->peek_parent_modem_location_interface = peek_parent_modem_location_interface;
     iface->peek_parent_class                    = peek_parent_class;
 }
diff --git a/src/plugins/quectel/mm-broadband-modem-quectel.c b/src/plugins/quectel/mm-broadband-modem-quectel.c
index b93a4506..ecd7c9c1 100644
--- a/src/plugins/quectel/mm-broadband-modem-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-quectel.c
@@ -31,6 +31,7 @@ static void iface_modem_time_init     (MMIfaceModemTimeInterface     *iface);
 static void shared_quectel_init       (MMSharedQuectelInterface      *iface);
 
 static MMIfaceModemInterface         *iface_modem_parent;
+static MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
 
 G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQuectel, mm_broadband_modem_quectel, MM_TYPE_BROADBAND_MODEM, 0,
@@ -206,6 +207,8 @@ iface_modem_init (MMIfaceModemInterface *iface)
 static void
 iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface)
 {
+    iface_modem_firmware_parent = g_type_interface_peek_parent (iface);
+
     iface->load_update_settings = mm_shared_quectel_firmware_load_update_settings;
     iface->load_update_settings_finish = mm_shared_quectel_firmware_load_update_settings_finish;
 }
@@ -242,6 +245,12 @@ peek_parent_modem_interface (MMSharedQuectel *self)
     return iface_modem_parent;
 }
 
+static MMIfaceModemFirmwareInterface *
+peek_parent_modem_firmware_interface (MMSharedQuectel *self)
+{
+    return iface_modem_firmware_parent;
+}
+
 static MMIfaceModemLocationInterface *
 peek_parent_modem_location_interface (MMSharedQuectel *self)
 {
@@ -252,6 +261,7 @@ static void
 shared_quectel_init (MMSharedQuectelInterface *iface)
 {
     iface->peek_parent_modem_interface          = peek_parent_modem_interface;
+    iface->peek_parent_modem_firmware_interface = peek_parent_modem_firmware_interface;
     iface->peek_parent_modem_location_interface = peek_parent_modem_location_interface;
     iface->peek_parent_class                    = peek_parent_class;
 }
diff --git a/src/plugins/quectel/mm-shared-quectel.c b/src/plugins/quectel/mm-shared-quectel.c
index 24278bb6..1bae73e4 100644
--- a/src/plugins/quectel/mm-shared-quectel.c
+++ b/src/plugins/quectel/mm-shared-quectel.c
@@ -54,6 +54,7 @@ typedef struct {
     MMBaseModemClass              *class_parent;
     MMIfaceModemInterface         *iface_modem_parent;
     MMIfaceModemLocationInterface *iface_modem_location_parent;
+    MMIfaceModemFirmwareInterface *iface_modem_firmware_parent;
     MMModemLocationSource          provided_sources;
     MMModemLocationSource          enabled_sources;
     FeatureSupport                 qgps_supported;
@@ -101,6 +102,9 @@ get_private (MMSharedQuectel *self)
         g_assert (MM_SHARED_QUECTEL_GET_IFACE (self)->peek_parent_class);
         priv->class_parent = MM_SHARED_QUECTEL_GET_IFACE (self)->peek_parent_class (self);
 
+        g_assert (MM_SHARED_QUECTEL_GET_IFACE (self)->peek_parent_modem_firmware_interface);
+        priv->iface_modem_firmware_parent = MM_SHARED_QUECTEL_GET_IFACE (self)->peek_parent_modem_firmware_interface (self);
+
         g_assert (MM_SHARED_QUECTEL_GET_IFACE (self)->peek_parent_modem_location_interface);
         priv->iface_modem_location_parent = MM_SHARED_QUECTEL_GET_IFACE (self)->peek_parent_modem_location_interface (self);
 
@@ -259,20 +263,6 @@ mm_shared_quectel_firmware_load_update_settings_finish (MMIfaceModemFirmware  *s
 }
 
 static gboolean
-quectel_is_sahara_supported (MMBaseModem *modem,
-                             MMPort      *port)
-{
-    return mm_kernel_device_get_global_property_as_boolean (mm_port_peek_kernel_device (port), "ID_MM_QUECTEL_SAHARA");
-}
-
-static gboolean
-quectel_is_firehose_supported (MMBaseModem *modem,
-                               MMPort      *port)
-{
-    return mm_kernel_device_get_global_property_as_boolean (mm_port_peek_kernel_device (port), "ID_MM_QUECTEL_FIREHOSE");
-}
-
-static gboolean
 quectel_is_dfota_supported (MMBaseModem *modem,
                             MMPort      *port)
 {
@@ -287,14 +277,7 @@ quectel_get_firmware_update_methods (MMBaseModem *modem,
 
     update_methods = MM_MODEM_FIRMWARE_UPDATE_METHOD_NONE;
 
-    if (quectel_is_firehose_supported (modem, port))
-        update_methods |= MM_MODEM_FIRMWARE_UPDATE_METHOD_FIREHOSE;
-    if (quectel_is_sahara_supported (modem, port))
-        update_methods |= MM_MODEM_FIRMWARE_UPDATE_METHOD_SAHARA;
-
-    /* DFOTA should not be used in combination with any other update method. */
-    if (update_methods == MM_MODEM_FIRMWARE_UPDATE_METHOD_NONE &&
-        quectel_is_dfota_supported (modem, port))
+    if (quectel_is_dfota_supported (modem, port))
         update_methods |= MM_MODEM_FIRMWARE_UPDATE_METHOD_DFOTA;
 
     return update_methods;
@@ -477,26 +460,41 @@ quectel_at_port_get_firmware_revision_ready (MMBaseModem  *self,
     }
 }
 
-void
-mm_shared_quectel_firmware_load_update_settings (MMIfaceModemFirmware *self,
-                                                 GAsyncReadyCallback   callback,
-                                                 gpointer              user_data)
+static void
+parent_load_update_settings_ready (MMIfaceModemFirmware *self,
+                                   GAsyncResult         *res,
+                                   GTask                *task)
 {
-    GTask                      *task;
-    MMIfacePortAt              *at_port;
-    MMModemFirmwareUpdateMethod update_methods;
-    LoadUpdateSettingsContext  *ctx;
+    Private                             *priv;
+    MMIfacePortAt                       *at_port;
+    LoadUpdateSettingsContext           *ctx;
+    MMModemFirmwareUpdateMethod          update_methods;
+    g_autoptr(GError)                    error = NULL;
+    g_autoptr(MMFirmwareUpdateSettings)  update_settings = NULL;
 
-    task = g_task_new (self, NULL, callback, user_data);
-    ctx = g_new0 (LoadUpdateSettingsContext, 1);
-    g_task_set_task_data (task, ctx, (GDestroyNotify)load_update_settings_context_free);
+    priv = get_private (MM_SHARED_QUECTEL (self));
+    update_settings = priv->iface_modem_firmware_parent->load_update_settings_finish (self, res, &error);
+    if (error) {
+        g_task_return_error (task, error);
+        g_object_unref (task);
+        return;
+    }
 
     /* Get the best at port to get firmware revision */
     at_port = mm_base_modem_peek_best_at_port (MM_BASE_MODEM (self), NULL);
     if (at_port) {
-        update_methods = quectel_get_firmware_update_methods (MM_BASE_MODEM (self), MM_PORT (at_port));
-        ctx->update_settings = mm_firmware_update_settings_new (update_methods);
+        ctx = g_new0 (LoadUpdateSettingsContext, 1);
+        ctx->update_settings = g_object_ref (update_settings);
         ctx->get_firmware_maximum_retry_int = QUECTEL_STD_AP_FIRMWARE_INVALID_MAXIMUM_RETRY;
+        g_task_set_task_data (task, ctx, (GDestroyNotify)load_update_settings_context_free);
+
+        update_methods = mm_firmware_update_settings_get_method (ctx->update_settings);
+
+        /* Prefer any parent's update method */
+        if (update_methods == MM_MODEM_FIRMWARE_UPDATE_METHOD_NONE) {
+            update_methods = quectel_get_firmware_update_methods (MM_BASE_MODEM (self), MM_PORT (at_port));
+            mm_firmware_update_settings_set_method (ctx->update_settings, update_methods);
+        }
 
         /* Fetch modem name by "ATI" command */
         mm_base_modem_at_command (MM_BASE_MODEM (self),
@@ -509,13 +507,31 @@ mm_shared_quectel_firmware_load_update_settings (MMIfaceModemFirmware *self,
         return;
     }
 
-    g_task_return_new_error (task,
-                             MM_CORE_ERROR,
-                             MM_CORE_ERROR_FAILED,
-                             "Couldn't find a port to fetch firmware info");
+    g_task_return_pointer (task, g_object_ref (update_settings), g_object_unref);
     g_object_unref (task);
 }
 
+void
+mm_shared_quectel_firmware_load_update_settings (MMIfaceModemFirmware *self,
+                                                 GAsyncReadyCallback   callback,
+                                                 gpointer              user_data)
+{
+    Private *priv;
+    GTask   *task;
+
+    priv = get_private (MM_SHARED_QUECTEL (self));
+    g_assert (priv->iface_modem_firmware_parent);
+    g_assert (priv->iface_modem_firmware_parent->load_update_settings);
+    g_assert (priv->iface_modem_firmware_parent->load_update_settings_finish);
+
+    task = g_task_new (self, NULL, callback, user_data);
+
+    priv->iface_modem_firmware_parent->load_update_settings (
+        self,
+        (GAsyncReadyCallback)parent_load_update_settings_ready,
+        task);
+}
+
 /*****************************************************************************/
 /* "+QUSIM: 1" URC is emitted by Quectel modems after the USIM has been
  * (re)initialized. We register a handler for this URC and perform a check
diff --git a/src/plugins/quectel/mm-shared-quectel.h b/src/plugins/quectel/mm-shared-quectel.h
index 660d9314..7823cb7a 100644
--- a/src/plugins/quectel/mm-shared-quectel.h
+++ b/src/plugins/quectel/mm-shared-quectel.h
@@ -35,6 +35,7 @@ struct _MMSharedQuectelInterface {
     GTypeInterface g_iface;
     MMBaseModemClass              * (* peek_parent_class)                    (MMSharedQuectel *self);
     MMIfaceModemInterface         * (* peek_parent_modem_interface)          (MMSharedQuectel *self);
+    MMIfaceModemFirmwareInterface * (* peek_parent_modem_firmware_interface) (MMSharedQuectel *self);
     MMIfaceModemLocationInterface * (* peek_parent_modem_location_interface) (MMSharedQuectel *self);
 };