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

qcom-soc-plugin: add support for QRTR+IPA based setups

Browse Source
This commit is contained in:
Aleksander Morgado
2021-03-17 15:35:56 +01:00
parent ec375bd959
commit aeed8c9e5b
3 changed files with 62 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/qcom-soc/77-mm-qcom-soc.rules
View File

@@ -4,6 +4,7 @@ ACTION!="add|change|move|bind", GOTO="mm_qcom_soc_end"
# Process only known net and rpmsg ports
SUBSYSTEM=="net", DRIVERS=="bam-dmux", GOTO="mm_qcom_soc_process"
SUBSYSTEM=="net", DRIVERS=="ipa", GOTO="mm_qcom_soc_process"
SUBSYSTEM=="rpmsg", DRIVERS=="qcom-q6v5-mss", GOTO="mm_qcom_soc_process"
GOTO="mm_qcom_soc_end"

72
plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c
View File

@@ -41,7 +41,7 @@ static const QmiSioPort sio_port_per_port_number[] = {
};
static MMPortQmi *
peek_port_qmi_for_data (MMBroadbandModemQmi *self,
peek_port_qmi_for_data_bam_dmux (MMBroadbandModemQmi *self,
MMPort *data,
QmiSioPort *out_sio_port,
GError **error)
@@ -49,23 +49,9 @@ peek_port_qmi_for_data (MMBroadbandModemQmi *self,
GList *rpmsg_qmi_ports;
MMPortQmi *found = NULL;
MMKernelDevice *net_port;
const gchar *net_port_driver;
gint net_port_number;
g_assert (MM_IS_BROADBAND_MODEM_QMI (self));
g_assert (mm_port_get_subsys (data) == MM_PORT_SUBSYS_NET);
net_port = mm_port_peek_kernel_device (data);
net_port_driver = mm_kernel_device_get_driver (net_port);
if (g_strcmp0 (net_port_driver, "bam-dmux") != 0) {
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Unsupported QMI kernel driver for 'net/%s': %s",
mm_port_get_device (data),
net_port_driver);
return NULL;
}
/* The dev_port notified by the bam-dmux driver indicates which SIO port we should be using */
net_port_number = mm_kernel_device_get_attribute_as_int (net_port, "dev_port");
@@ -101,6 +87,62 @@ peek_port_qmi_for_data (MMBroadbandModemQmi *self,
return found;
}
static MMPortQmi *
peek_port_qmi_for_data_ipa (MMBroadbandModemQmi *self,
MMPort *data,
QmiSioPort *out_sio_port,
GError **error)
{
MMPortQmi *found = NULL;
/* when using IPA, we have a master network interface that will be multiplexed
* to create link interfaces. We can assume any of the available QMI ports is
* able to manage that. */
found = mm_broadband_modem_qmi_peek_port_qmi (self);
if (!found)
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_NOT_FOUND,
"Couldn't find any QMI port for 'net/%s'",
mm_port_get_device (data));
else if (out_sio_port)
*out_sio_port = QMI_SIO_PORT_NONE;
return found;
}
static MMPortQmi *
peek_port_qmi_for_data (MMBroadbandModemQmi *self,
MMPort *data,
QmiSioPort *out_sio_port,
GError **error)
{
MMKernelDevice *net_port;
const gchar *net_port_driver;
g_assert (MM_IS_BROADBAND_MODEM_QMI (self));
g_assert (mm_port_get_subsys (data) == MM_PORT_SUBSYS_NET);
net_port = mm_port_peek_kernel_device (data);
net_port_driver = mm_kernel_device_get_driver (net_port);
if (g_strcmp0 (net_port_driver, "ipa") == 0)
return peek_port_qmi_for_data_ipa (self, data, out_sio_port, error);
if (g_strcmp0 (net_port_driver, "bam-dmux") == 0)
return peek_port_qmi_for_data_bam_dmux (self, data, out_sio_port, error);
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Unsupported QMI kernel driver for 'net/%s': %s",
mm_port_get_device (data),
net_port_driver);
return NULL;
}
/*****************************************************************************/
MMBroadbandModemQmiQcomSoc *

2
plugins/qcom-soc/mm-plugin-qcom-soc.c
View File

@@ -67,7 +67,7 @@ create_modem (MMPlugin *self,
G_MODULE_EXPORT MMPlugin *
mm_plugin_create (void)
{
static const gchar *subsystems[] = { "rpmsg", "net", NULL };
static const gchar *subsystems[] = { "rpmsg", "net", "qrtr", NULL };
return MM_PLUGIN (
g_object_new (MM_TYPE_PLUGIN_QCOM_SOC,