diff options
Diffstat (limited to 'src/plugins/quectel')
-rw-r--r-- | src/plugins/quectel/77-mm-quectel-port-types.rules | 58 | ||||
-rw-r--r-- | src/plugins/quectel/mm-broadband-modem-mbim-quectel.c | 10 | ||||
-rw-r--r-- | src/plugins/quectel/mm-broadband-modem-qmi-quectel.c | 10 | ||||
-rw-r--r-- | src/plugins/quectel/mm-broadband-modem-quectel.c | 10 | ||||
-rw-r--r-- | src/plugins/quectel/mm-shared-quectel.c | 94 | ||||
-rw-r--r-- | src/plugins/quectel/mm-shared-quectel.h | 1 |
6 files changed, 115 insertions, 68 deletions
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); }; |