colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadband-modem-mbim: peeking MBIM port only in MBIM modems

Browse Source 
Move the logic out of the base modem, and make it applicable only for
MBIM modems.
This commit is contained in:
Aleksander Morgado
2020-10-22 11:52:46 +02:00
parent ca0dbd0728
commit 6defec2fae
9 changed files with 138 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/mm-base-modem.c
View File

@@ -760,86 +760,6 @@ mm_base_modem_peek_port_qmi_for_data (MMBaseModem *self,
#endif /* WITH_QMI */
#if defined WITH_MBIM
MMPortMbim *
mm_base_modem_get_port_mbim (MMBaseModem *self)
{
g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL);
/* First MBIM port in the list is the primary one always */
return (self->priv->mbim ? ((MMPortMbim *)g_object_ref (self->priv->mbim->data)) : NULL);
}
MMPortMbim *
mm_base_modem_peek_port_mbim (MMBaseModem *self)
{
g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL);
/* First MBIM port in the list is the primary one always */
return (self->priv->mbim ? (MMPortMbim *)self->priv->mbim->data : NULL);
}
MMPortMbim *
mm_base_modem_get_port_mbim_for_data (MMBaseModem *self,
MMPort *data,
GError **error)
{
MMPortMbim *mbim;
mbim = mm_base_modem_peek_port_mbim_for_data (self, data, error);
return (mbim ? (MMPortMbim *)g_object_ref (mbim) : NULL);
}
MMPortMbim *
mm_base_modem_peek_port_mbim_for_data (MMBaseModem *self,
MMPort *data,
GError **error)
{
GList *cdc_wdm_mbim_ports, *l;
const gchar *net_port_parent_path;
MMPortMbim *found = NULL;
g_warn_if_fail (mm_port_get_subsys (data) == MM_PORT_SUBSYS_NET);
net_port_parent_path = mm_kernel_device_get_interface_sysfs_path (mm_port_peek_kernel_device (data));
if (!net_port_parent_path) {
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"No parent path for 'net/%s'",
mm_port_get_device (data));
return NULL;
}
/* Find the CDC-WDM port on the same USB interface as the given net port */
cdc_wdm_mbim_ports = mm_base_modem_find_ports (MM_BASE_MODEM (self),
MM_PORT_SUBSYS_USB,
MM_PORT_TYPE_MBIM,
NULL);
for (l = cdc_wdm_mbim_ports; l && !found; l = g_list_next (l)) {
const gchar *wdm_port_parent_path;
g_assert (MM_IS_PORT_MBIM (l->data));
wdm_port_parent_path = mm_kernel_device_get_interface_sysfs_path (mm_port_peek_kernel_device (MM_PORT (l->data)));
if (wdm_port_parent_path && g_str_equal (wdm_port_parent_path, net_port_parent_path))
found = MM_PORT_MBIM (l->data);
}
g_list_free_full (cdc_wdm_mbim_ports, g_object_unref);
if (!found)
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_NOT_FOUND,
"Couldn't find associated MBIM port for 'net/%s'",
mm_port_get_device (data));
return found;
}
#endif /* WITH_MBIM */
MMPort *
mm_base_modem_get_best_data_port (MMBaseModem *self,
MMPortType type)

8
src/mm-base-modem.h
View File

@@ -129,10 +129,6 @@ MMPortSerial *mm_base_modem_peek_port_audio (MMBaseModem *self);
MMPortQmi *mm_base_modem_peek_port_qmi (MMBaseModem *self);
MMPortQmi *mm_base_modem_peek_port_qmi_for_data (MMBaseModem *self, MMPort *data, GError **error);
#endif
#if defined WITH_MBIM
MMPortMbim *mm_base_modem_peek_port_mbim (MMBaseModem *self);
MMPortMbim *mm_base_modem_peek_port_mbim_for_data (MMBaseModem *self, MMPort *data, GError **error);
#endif
MMPortSerialAt *mm_base_modem_peek_best_at_port (MMBaseModem *self, GError **error);
MMPort *mm_base_modem_peek_best_data_port (MMBaseModem *self, MMPortType type);
GList *mm_base_modem_peek_data_ports (MMBaseModem *self);
@@ -147,10 +143,6 @@ MMPortSerial *mm_base_modem_get_port_audio (MMBaseModem *self);
MMPortQmi *mm_base_modem_get_port_qmi (MMBaseModem *self);
MMPortQmi *mm_base_modem_get_port_qmi_for_data (MMBaseModem *self, MMPort *data, GError **error);
#endif
#if defined WITH_MBIM
MMPortMbim *mm_base_modem_get_port_mbim (MMBaseModem *self);
MMPortMbim *mm_base_modem_get_port_mbim_for_data (MMBaseModem *self, MMPort *data, GError **error);
#endif
MMPortSerialAt *mm_base_modem_get_best_at_port (MMBaseModem *self, GError **error);
MMPort *mm_base_modem_get_best_data_port (MMBaseModem *self, MMPortType type);
GList *mm_base_modem_get_data_ports (MMBaseModem *self);

2
src/mm-bearer-mbim.c
View File

@@ -68,7 +68,7 @@ peek_ports (gpointer self,
if (o_device) {
MMPortMbim *port;
port = mm_base_modem_peek_port_mbim (modem);
port = mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (modem));
if (!port) {
g_task_report_new_error (self,
callback,

116
src/mm-broadband-modem-mbim.c
View File

@@ -143,7 +143,7 @@ peek_device (gpointer self,
{
MMPortMbim *port;
port = mm_base_modem_peek_port_mbim (MM_BASE_MODEM (self));
port = mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (self));
if (!port) {
g_task_report_new_error (self,
callback,
@@ -172,7 +172,7 @@ shared_qmi_peek_client (MMSharedQmi *self,
g_assert (flag == MM_PORT_QMI_FLAG_DEFAULT);
port = mm_base_modem_peek_port_mbim (MM_BASE_MODEM (self));
port = mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (self));
if (!port) {
g_set_error (error,
MM_CORE_ERROR,
@@ -202,6 +202,108 @@ shared_qmi_peek_client (MMSharedQmi *self,
#endif
/*****************************************************************************/
MMPortMbim *
mm_broadband_modem_mbim_get_port_mbim (MMBroadbandModemMbim *self)
{
MMPortMbim *primary_mbim_port;
g_assert (MM_IS_BROADBAND_MODEM_MBIM (self));
primary_mbim_port = mm_broadband_modem_mbim_peek_port_mbim (self);
return (primary_mbim_port ?
MM_PORT_MBIM (g_object_ref (primary_mbim_port)) :
NULL);
}
MMPortMbim *
mm_broadband_modem_mbim_peek_port_mbim (MMBroadbandModemMbim *self)
{
MMPortMbim *primary_mbim_port = NULL;
GList *mbim_ports;
g_assert (MM_IS_BROADBAND_MODEM_MBIM (self));
mbim_ports = mm_base_modem_find_ports (MM_BASE_MODEM (self),
MM_PORT_SUBSYS_USB,
MM_PORT_TYPE_MBIM,
NULL);
/* First MBIM port in the list is the primary one always */
if (mbim_ports)
primary_mbim_port = MM_PORT_MBIM (mbim_ports->data);
g_list_free_full (mbim_ports, g_object_unref);
return primary_mbim_port;
}
MMPortMbim *
mm_broadband_modem_mbim_get_port_mbim_for_data (MMBroadbandModemMbim *self,
MMPort *data,
GError **error)
{
MMPortMbim *mbim_port;
g_assert (MM_IS_BROADBAND_MODEM_MBIM (self));
mbim_port = mm_broadband_modem_mbim_peek_port_mbim_for_data (self, data, error);
return (mbim_port ?
MM_PORT_MBIM (g_object_ref (mbim_port)) :
NULL);
}
MMPortMbim *
mm_broadband_modem_mbim_peek_port_mbim_for_data (MMBroadbandModemMbim *self,
MMPort *data,
GError **error)
{
GList *cdc_wdm_mbim_ports;
GList *l;
const gchar *net_port_parent_path;
MMPortMbim *found = NULL;
g_assert (MM_IS_BROADBAND_MODEM_MBIM (self));
g_assert (mm_port_get_subsys (data) == MM_PORT_SUBSYS_NET);
net_port_parent_path = mm_kernel_device_get_interface_sysfs_path (mm_port_peek_kernel_device (data));
if (!net_port_parent_path) {
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"No parent path for 'net/%s'",
mm_port_get_device (data));
return NULL;
}
/* Find the CDC-WDM port on the same USB interface as the given net port */
cdc_wdm_mbim_ports = mm_base_modem_find_ports (MM_BASE_MODEM (self),
MM_PORT_SUBSYS_USB,
MM_PORT_TYPE_MBIM,
NULL);
for (l = cdc_wdm_mbim_ports; l && !found; l = g_list_next (l)) {
const gchar *wdm_port_parent_path;
g_assert (MM_IS_PORT_MBIM (l->data));
wdm_port_parent_path = mm_kernel_device_get_interface_sysfs_path (mm_port_peek_kernel_device (MM_PORT (l->data)));
if (wdm_port_parent_path && g_str_equal (wdm_port_parent_path, net_port_parent_path))
found = MM_PORT_MBIM (l->data);
}
g_list_free_full (cdc_wdm_mbim_ports, g_object_unref);
if (!found)
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_NOT_FOUND,
"Couldn't find associated MBIM port for 'net/%s'",
mm_port_get_device (data));
return found;
}
/*****************************************************************************/
/* Current capabilities (Modem interface) */
@@ -515,7 +617,7 @@ modem_load_manufacturer (MMIfaceModem *self,
gchar *manufacturer = NULL;
MMPortMbim *port;
port = mm_base_modem_peek_port_mbim (MM_BASE_MODEM (self));
port = mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (self));
if (port) {
manufacturer = g_strdup (mm_kernel_device_get_physdev_manufacturer (
mm_port_peek_kernel_device (MM_PORT (port))));
@@ -549,7 +651,7 @@ modem_load_model (MMIfaceModem *self,
GTask *task;
MMPortMbim *port;
port = mm_base_modem_peek_port_mbim (MM_BASE_MODEM (self));
port = mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (self));
if (port) {
model = g_strdup (mm_kernel_device_get_physdev_product (
mm_port_peek_kernel_device (MM_PORT (port))));
@@ -2307,7 +2409,7 @@ initialization_started (MMBroadbandModem *self,
GTask *task;
ctx = g_slice_new0 (InitializationStartedContext);
ctx->mbim = mm_base_modem_get_port_mbim (MM_BASE_MODEM (self));
ctx->mbim = mm_broadband_modem_mbim_get_port_mbim (MM_BROADBAND_MODEM_MBIM (self));
task = g_task_new (self, NULL, callback, user_data);
g_task_set_task_data (task, ctx, (GDestroyNotify)initialization_started_context_free);
@@ -3270,7 +3372,7 @@ sms_notification_read_stored_sms (MMBroadbandModemMbim *self,
MbimDevice *device;
MbimMessage *message;
port = mm_base_modem_peek_port_mbim (MM_BASE_MODEM (self));
port = mm_broadband_modem_mbim_peek_port_mbim (self);
if (!port)
return;
device = mm_port_mbim_peek_device (port);
@@ -5419,7 +5521,7 @@ dispose (GObject *object)
/* If any port cleanup is needed, it must be done during dispose(), as
* the modem object will be affected by an explciit g_object_run_dispose()
* that will remove all port references right away */
mbim = mm_base_modem_peek_port_mbim (MM_BASE_MODEM (self));
mbim = mm_broadband_modem_mbim_peek_port_mbim (self);
if (mbim) {
/* Explicitly remove notification handler */
self->priv->setup_flags = PROCESS_NOTIFICATION_FLAG_NONE;

17
src/mm-broadband-modem-mbim.h
View File

@@ -41,10 +41,19 @@ struct _MMBroadbandModemMbimClass{
GType mm_broadband_modem_mbim_get_type (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMBroadbandModemMbim, g_object_unref)
MMBroadbandModemMbim *mm_broadband_modem_mbim_new (const gchar *device,
MMBroadbandModemMbim *mm_broadband_modem_mbim_new (const gchar *device,
const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
guint16 product_id);
const gchar *plugin,
guint16 vendor_id,
guint16 product_id);
MMPortMbim *mm_broadband_modem_mbim_peek_port_mbim (MMBroadbandModemMbim *self);
MMPortMbim *mm_broadband_modem_mbim_peek_port_mbim_for_data (MMBroadbandModemMbim *self,
MMPort *data,
GError **error);
MMPortMbim *mm_broadband_modem_mbim_get_port_mbim (MMBroadbandModemMbim *self);
MMPortMbim *mm_broadband_modem_mbim_get_port_mbim_for_data (MMBroadbandModemMbim *self,
MMPort *data,
GError **error);
#endif /* MM_BROADBAND_MODEM_MBIM_H */

8
src/mm-iface-modem-firmware.c
View File

@@ -21,6 +21,10 @@
#include "mm-iface-modem-firmware.h"
#include "mm-log-object.h"
#if defined WITH_MBIM
# include "mm-broadband-modem-mbim.h"
#endif
/*****************************************************************************/
void
@@ -334,8 +338,8 @@ add_generic_device_ids (MMBaseModem *self,
primary = MM_PORT (mm_base_modem_peek_port_qmi (self));
#endif
#if defined WITH_MBIM
if (!primary)
primary = MM_PORT (mm_base_modem_peek_port_mbim (self));
if (!primary && MM_IS_BROADBAND_MODEM_MBIM (self))
primary = MM_PORT (mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (self)));
#endif
if (!primary)
primary = MM_PORT (mm_base_modem_peek_port_primary (self));

7
src/mm-iface-modem.c
View File

@@ -28,6 +28,9 @@
#include "mm-private-boxed-types.h"
#include "mm-log-object.h"
#include "mm-context.h"
#if defined WITH_MBIM
# include "mm-broadband-modem-mbim.h"
#endif
#define SIGNAL_QUALITY_RECENT_TIMEOUT_SEC 60
@@ -4959,8 +4962,8 @@ interface_initialization_step (GTask *task)
primary = MM_PORT (mm_base_modem_peek_port_qmi (MM_BASE_MODEM (self)));
#endif
#if defined WITH_MBIM
if (!primary)
primary = MM_PORT (mm_base_modem_peek_port_mbim (MM_BASE_MODEM (self)));
if (!primary && MM_IS_BROADBAND_MODEM_MBIM (self))
primary = MM_PORT (mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (self)));
#endif
if (!primary)
primary = MM_PORT (mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)));

3
src/mm-sim-mbim.c
View File

@@ -24,6 +24,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-broadband-modem-mbim.h"
#include "mm-error-helpers.h"
#include "mm-iface-modem.h"
#include "mm-log-object.h"
@@ -48,7 +49,7 @@ peek_device (gpointer self,
NULL);
g_assert (MM_IS_BASE_MODEM (modem));
port = mm_base_modem_peek_port_mbim (modem);
port = mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (modem));
g_object_unref (modem);
if (!port) {

3
src/mm-sms-mbim.c
View File

@@ -24,6 +24,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-broadband-modem-mbim.h"
#include "mm-modem-helpers-mbim.h"
#include "mm-iface-modem-messaging.h"
#include "mm-sms-mbim.h"
@@ -51,7 +52,7 @@ peek_device (gpointer self,
if (o_device) {
MMPortMbim *port;
port = mm_base_modem_peek_port_mbim (modem);
port = mm_broadband_modem_mbim_peek_port_mbim (MM_BROADBAND_MODEM_MBIM (modem));
if (!port) {
g_task_report_new_error (self,
callback,