aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Weiss <luca@z3ntu.xyz>2020-03-29 16:42:37 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-03-29 15:25:01 +0000
commit750acec6dd607819bbf440b9a6fff8359188c96b (patch)
tree2a78e973d849a107b01bd124f17a66c4f7150340
parent3fb2fc4015bfd428e88e89710c3dd89db7d42b82 (diff)
downloadaports-750acec6dd607819bbf440b9a6fff8359188c96b.tar.gz
aports-750acec6dd607819bbf440b9a6fff8359188c96b.tar.bz2
aports-750acec6dd607819bbf440b9a6fff8359188c96b.tar.xz
community/libqmi: apply patches to fix crash on smdpkg & rpmsg
These patches will be included in the next stable version of libqmi, but patch them into the package in the meantime. https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/merge_requests/101
-rw-r--r--community/libqmi/0001-qmi-device-support-and-detect-smdpkt-managed-QMI-con.patch262
-rw-r--r--community/libqmi/0002-qmi-device-detect-rpmsg-control-ports.patch41
-rw-r--r--community/libqmi/APKBUILD10
3 files changed, 310 insertions, 3 deletions
diff --git a/community/libqmi/0001-qmi-device-support-and-detect-smdpkt-managed-QMI-con.patch b/community/libqmi/0001-qmi-device-support-and-detect-smdpkt-managed-QMI-con.patch
new file mode 100644
index 0000000000..dca5c9cdbd
--- /dev/null
+++ b/community/libqmi/0001-qmi-device-support-and-detect-smdpkt-managed-QMI-con.patch
@@ -0,0 +1,262 @@
+From 6fc07ae25a7c3e2375f02f7ab65c92073303e8d0 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander@aleksander.es>
+Date: Fri, 18 Oct 2019 11:37:17 +0200
+Subject: [PATCH 1/2] qmi-device: support and detect smdpkt managed QMI control
+ ports
+
+Fixes https://gitlab.freedesktop.org/mobile-broadband/libqmi/issues/20
+---
+ .../libqmi-glib/libqmi-glib-common.sections | 2 +
+ src/libqmi-glib/qmi-device.c | 68 ++++++++---------
+ src/libqmi-glib/qmi-utils.c | 73 ++++++++++++++++---
+ src/libqmi-glib/qmi-utils.h | 10 ++-
+ 4 files changed, 106 insertions(+), 47 deletions(-)
+
+diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections
+index 1e35f0c..e381c71 100644
+--- a/docs/reference/libqmi-glib/libqmi-glib-common.sections
++++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections
+@@ -1405,6 +1405,8 @@ QmiEndian
+ <SUBSECTION Traces>
+ qmi_utils_get_traces_enabled
+ qmi_utils_set_traces_enabled
++<SUBSECTION Private>
++__QmiTransportType
+ </SECTION>
+
+ <SECTION>
+diff --git a/src/libqmi-glib/qmi-device.c b/src/libqmi-glib/qmi-device.c
+index 14dbb53..8b1f387 100644
+--- a/src/libqmi-glib/qmi-device.c
++++ b/src/libqmi-glib/qmi-device.c
+@@ -1897,68 +1897,68 @@ device_create_endpoint (QmiDevice *self,
+ }
+
+ static gboolean
+-device_setup_open_flags_by_driver (QmiDevice *self,
+- DeviceOpenContext *ctx,
+- GError **error)
+-{
+- gchar *driver;
+- GError *inner_error = NULL;
+-
+- driver = __qmi_utils_get_driver (qmi_file_get_path (self->priv->file), &inner_error);
+- if (driver)
+- g_debug ("[%s] loaded driver of cdc-wdm port: %s", qmi_file_get_path_display (self->priv->file), driver);
+- else if (!self->priv->no_file_check)
+- g_warning ("[%s] couldn't load driver of cdc-wdm port: %s", qmi_file_get_path_display (self->priv->file), inner_error->message);
++device_setup_open_flags_by_transport (QmiDevice *self,
++ DeviceOpenContext *ctx,
++ GError **error)
++{
++ __QmiTransportType transport;
++ GError *inner_error = NULL;
++
++ transport = __qmi_utils_get_transport_type (qmi_file_get_path (self->priv->file), &inner_error);
++ if ((transport == __QMI_TRANSPORT_TYPE_UNKNOWN) && !self->priv->no_file_check)
++ g_warning ("[%s] couldn't detect transport type of port: %s", qmi_file_get_path_display (self->priv->file), inner_error->message);
+ g_clear_error (&inner_error);
+
+ #if defined MBIM_QMUX_ENABLED
+
+ /* Auto mode requested? */
+ if (ctx->flags & QMI_DEVICE_OPEN_FLAGS_AUTO) {
+- if (!g_strcmp0 (driver, "cdc_mbim")) {
++ switch (transport) {
++ case __QMI_TRANSPORT_TYPE_MBIM:
+ g_debug ("[%s] automatically selecting MBIM mode", qmi_file_get_path_display (self->priv->file));
+ ctx->flags |= QMI_DEVICE_OPEN_FLAGS_MBIM;
+- goto out;
+- }
+- if (!g_strcmp0 (driver, "qmi_wwan")) {
++ break;
++ case __QMI_TRANSPORT_TYPE_QMUX:
+ g_debug ("[%s] automatically selecting QMI mode", qmi_file_get_path_display (self->priv->file));
+ ctx->flags &= ~QMI_DEVICE_OPEN_FLAGS_MBIM;
+- goto out;
++ break;
++ case __QMI_TRANSPORT_TYPE_UNKNOWN:
++ g_set_error (&inner_error, QMI_CORE_ERROR, QMI_CORE_ERROR_FAILED,
++ "Cannot automatically select QMI/MBIM mode");
++ break;
+ }
+- g_set_error (&inner_error,
+- QMI_CORE_ERROR,
+- QMI_CORE_ERROR_FAILED,
+- "Cannot automatically select QMI/MBIM mode: driver %s",
+- driver ? driver : "unknown");
+ goto out;
+ }
+
+ /* MBIM mode requested? */
+ if (ctx->flags & QMI_DEVICE_OPEN_FLAGS_MBIM) {
+- if (g_strcmp0 (driver, "cdc_mbim") && !self->priv->no_file_check)
+- g_warning ("[%s] requested MBIM mode but unexpected driver found: %s", qmi_file_get_path_display (self->priv->file), driver);
++ if ((transport != __QMI_TRANSPORT_TYPE_MBIM) && !self->priv->no_file_check)
++ g_warning ("[%s] requested MBIM mode but unexpected transport type found", qmi_file_get_path_display (self->priv->file));
+ goto out;
+ }
+
+ #else
+
+- if (ctx->flags & QMI_DEVICE_OPEN_FLAGS_AUTO)
++ /* Auto mode requested? */
++ if (ctx->flags & QMI_DEVICE_OPEN_FLAGS_AUTO) {
+ g_warning ("[%s] requested auto mode but no MBIM QMUX support available", qmi_file_get_path_display (self->priv->file));
+- if (ctx->flags & QMI_DEVICE_OPEN_FLAGS_MBIM)
++ goto out;
++ }
++
++ /* MBIM mode requested? */
++ if (ctx->flags & QMI_DEVICE_OPEN_FLAGS_MBIM) {
+ g_warning ("[%s] requested MBIM mode but no MBIM QMUX support available", qmi_file_get_path_display (self->priv->file));
++ goto out;
++ }
+
+ #endif /* MBIM_QMUX_ENABLED */
+
+ /* QMI mode requested? */
+- if (g_strcmp0 (driver, "qmi_wwan") && !self->priv->no_file_check)
+- g_warning ("[%s] requested QMI mode but unexpected driver found: %s",
+- qmi_file_get_path_display (self->priv->file), driver ? driver : "unknown");
++ if ((transport != __QMI_TRANSPORT_TYPE_QMUX) && !self->priv->no_file_check)
++ g_warning ("[%s] requested QMI mode but unexpected transport type found",
++ qmi_file_get_path_display (self->priv->file));
+
+-#if defined MBIM_QMUX_ENABLED
+ out:
+-#endif
+-
+- g_free (driver);
+
+ if (inner_error) {
+ g_propagate_error (error, inner_error);
+@@ -1984,7 +1984,7 @@ device_open_step (GTask *task)
+ /* Fall through */
+
+ case DEVICE_OPEN_CONTEXT_STEP_DRIVER:
+- if (!device_setup_open_flags_by_driver (self, ctx, &error)) {
++ if (!device_setup_open_flags_by_transport (self, ctx, &error)) {
+ g_task_return_error (task, error);
+ g_object_unref (task);
+ return;
+diff --git a/src/libqmi-glib/qmi-utils.c b/src/libqmi-glib/qmi-utils.c
+index 162db0a..6e46be9 100644
+--- a/src/libqmi-glib/qmi-utils.c
++++ b/src/libqmi-glib/qmi-utils.c
+@@ -417,18 +417,13 @@ __qmi_string_utf8_from_ucs2le (const guint8 *ucs2le,
+ }
+ /*****************************************************************************/
+
+-gchar *
+-__qmi_utils_get_driver (const gchar *cdc_wdm_path,
+- GError **error)
++static gchar *
++utils_get_driver (const gchar *device_basename,
++ GError **error)
+ {
+ static const gchar *subsystems[] = { "usbmisc", "usb" };
+- guint i;
+- gchar *device_basename;
+- gchar *driver = NULL;
+-
+- device_basename = __qmi_utils_get_devname (cdc_wdm_path, error);
+- if (!device_basename)
+- return NULL;
++ guint i;
++ gchar *driver = NULL;
+
+ for (i = 0; !driver && i < G_N_ELEMENTS (subsystems); i++) {
+ gchar *tmp;
+@@ -450,9 +445,65 @@ __qmi_utils_get_driver (const gchar *cdc_wdm_path,
+ g_free (path);
+ }
+
++ if (!driver)
++ g_set_error (error, QMI_CORE_ERROR, QMI_CORE_ERROR_FAILED,
++ "couldn't detect device driver");
++ return driver;
++}
++
++__QmiTransportType
++__qmi_utils_get_transport_type (const gchar *path,
++ GError **error)
++{
++ __QmiTransportType transport = __QMI_TRANSPORT_TYPE_UNKNOWN;
++ gchar *device_basename = NULL;
++ gchar *driver = NULL;
++ gchar *sysfs_path = NULL;
++ GError *inner_error = NULL;
++
++ device_basename = __qmi_utils_get_devname (path, &inner_error);
++ if (!device_basename)
++ goto out;
++
++ driver = utils_get_driver (device_basename, &inner_error);
++
++ /* On Android systems we get access to the QMI control port through
++ * virtual smdcntl devices in the smdpkt subsystem. */
++ if (!driver) {
++ path = g_strdup_printf ("/sys/devices/virtual/smdpkt/%s", device_basename);
++ if (g_file_test (path, G_FILE_TEST_EXISTS)) {
++ g_clear_error (&inner_error);
++ transport = __QMI_TRANSPORT_TYPE_QMUX;
++ }
++ goto out;
++ }
++
++ if (!g_strcmp0 (driver, "cdc_mbim")) {
++ transport = __QMI_TRANSPORT_TYPE_MBIM;
++ goto out;
++ }
++
++ if (!g_strcmp0 (driver, "qmi_wwan")) {
++ transport = __QMI_TRANSPORT_TYPE_QMUX;
++ goto out;
++ }
++
++ g_set_error (&inner_error, QMI_CORE_ERROR, QMI_CORE_ERROR_FAILED,
++ "unexpected driver detected: %s", driver);
++
++ out:
++
+ g_free (device_basename);
++ g_free (driver);
++ g_free (sysfs_path);
+
+- return driver;
++ if (inner_error) {
++ g_assert (transport == __QMI_TRANSPORT_TYPE_UNKNOWN);
++ g_propagate_error (error, inner_error);
++ } else
++ g_assert (transport != __QMI_TRANSPORT_TYPE_UNKNOWN);
++
++ return transport;
+ }
+
+ gchar *
+diff --git a/src/libqmi-glib/qmi-utils.h b/src/libqmi-glib/qmi-utils.h
+index 7283101..6963851 100644
+--- a/src/libqmi-glib/qmi-utils.h
++++ b/src/libqmi-glib/qmi-utils.h
+@@ -97,9 +97,15 @@ G_GNUC_INTERNAL
+ gchar *__qmi_string_utf8_from_ucs2le (const guint8 *ucs2le,
+ gsize ucs2le_len);
+
++typedef enum {
++ __QMI_TRANSPORT_TYPE_UNKNOWN,
++ __QMI_TRANSPORT_TYPE_QMUX,
++ __QMI_TRANSPORT_TYPE_MBIM,
++} __QmiTransportType;
++
+ G_GNUC_INTERNAL
+-gchar *__qmi_utils_get_driver (const gchar *cdc_wdm_path,
+- GError **error);
++__QmiTransportType __qmi_utils_get_transport_type (const gchar *path,
++ GError **error);
+
+ G_GNUC_INTERNAL
+ gchar *__qmi_utils_get_devpath (const gchar *cdc_wdm_path,
+--
+2.26.0
+
diff --git a/community/libqmi/0002-qmi-device-detect-rpmsg-control-ports.patch b/community/libqmi/0002-qmi-device-detect-rpmsg-control-ports.patch
new file mode 100644
index 0000000000..68bdde0533
--- /dev/null
+++ b/community/libqmi/0002-qmi-device-detect-rpmsg-control-ports.patch
@@ -0,0 +1,41 @@
+From 816c36f9a1d24ac1b2a4c46d04cb2ca47d9c0a4e Mon Sep 17 00:00:00 2001
+From: Luca Weiss <luca@z3ntu.xyz>
+Date: Mon, 21 Oct 2019 21:05:28 +0200
+Subject: [PATCH 2/2] qmi-device: detect rpmsg control ports
+
+and adjust the path to check for smdpkt nodes
+---
+ src/libqmi-glib/qmi-utils.c | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/src/libqmi-glib/qmi-utils.c b/src/libqmi-glib/qmi-utils.c
+index 6e46be9..7ef3b33 100644
+--- a/src/libqmi-glib/qmi-utils.c
++++ b/src/libqmi-glib/qmi-utils.c
+@@ -467,11 +467,19 @@ __qmi_utils_get_transport_type (const gchar *path,
+
+ driver = utils_get_driver (device_basename, &inner_error);
+
+- /* On Android systems we get access to the QMI control port through
+- * virtual smdcntl devices in the smdpkt subsystem. */
+ if (!driver) {
+- path = g_strdup_printf ("/sys/devices/virtual/smdpkt/%s", device_basename);
+- if (g_file_test (path, G_FILE_TEST_EXISTS)) {
++ /* On Android systems we get access to the QMI control port through
++ * virtual smdcntl devices in the smdpkt subsystem. */
++ sysfs_path = g_strdup_printf ("/sys/class/smdpkt/%s", device_basename);
++ if (g_file_test (sysfs_path, G_FILE_TEST_EXISTS)) {
++ g_clear_error (&inner_error);
++ transport = __QMI_TRANSPORT_TYPE_QMUX;
++ goto out;
++ }
++ g_free (sysfs_path);
++ /* On mainline kernels this control port is provided by rpmsg */
++ sysfs_path = g_strdup_printf ("/sys/class/rpmsg/%s", device_basename);
++ if (g_file_test (sysfs_path, G_FILE_TEST_EXISTS)) {
+ g_clear_error (&inner_error);
+ transport = __QMI_TRANSPORT_TYPE_QMUX;
+ }
+--
+2.26.0
+
diff --git a/community/libqmi/APKBUILD b/community/libqmi/APKBUILD
index d64c649b88..572705c30b 100644
--- a/community/libqmi/APKBUILD
+++ b/community/libqmi/APKBUILD
@@ -2,14 +2,16 @@
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=libqmi
pkgver=1.24.8
-pkgrel=0
+pkgrel=1
pkgdesc="QMI modem protocol helper library"
url="https://www.freedesktop.org/wiki/Software/libqmi"
arch="all"
license="GPL-2.0-or-later AND LGPL-2.1-or-later"
makedepends="glib-dev gtk-doc libgudev-dev libmbim-dev linux-headers python3"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.freedesktop.org/software/libqmi/libqmi-$pkgver.tar.xz"
+source="https://www.freedesktop.org/software/libqmi/libqmi-$pkgver.tar.xz
+ 0001-qmi-device-support-and-detect-smdpkt-managed-QMI-con.patch
+ 0002-qmi-device-detect-rpmsg-control-ports.patch"
# Tests fail
[ "$CARCH" = s390x ] && options="$options !check"
@@ -33,4 +35,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="b60ac355792373afbb202b2791c641468b48a1e54e5f34336fe37fa799c24ac566d6070ba4faaaf6b5693ae2bb5cc75c1240c7f2ee04c8e35eeeb66ec2677093 libqmi-1.24.8.tar.xz"
+sha512sums="b60ac355792373afbb202b2791c641468b48a1e54e5f34336fe37fa799c24ac566d6070ba4faaaf6b5693ae2bb5cc75c1240c7f2ee04c8e35eeeb66ec2677093 libqmi-1.24.8.tar.xz
+2fb1f8532aaa734619bd4f24679b96042e1ea05367137cc7d40d2140ee84e80acd10d04557e49c64bfdb7c3b107e61a12e62d99440a4188ba1a7510b3f2000ea 0001-qmi-device-support-and-detect-smdpkt-managed-QMI-con.patch
+c758e38fb9480c1806e12f433432e0cf461319dab94c9040695725f8d3577432306c97d6d783b3e9fd46ef2c6cf879243c7d0db89eb62baad847bd13ed0bd727 0002-qmi-device-detect-rpmsg-control-ports.patch"