temp/modemmanager: dropped, upstreamed to Alpine
This commit is contained in:
Dylan Van Assche
Minecrell
parent
15d740b746
commit
520894dc1b
9 changed files with 0 additions and 678 deletions
|
|
@ -1,44 +0,0 @@
|
|||
From 44932947cb3c6cfbded0ba48c1133f95fdfa0c1f Mon Sep 17 00:00:00 2001
|
||||
From: Dylan Van Assche <me@dylanvanassche.be>
|
||||
Date: Fri, 27 Nov 2020 19:54:46 +0100
|
||||
Subject: [PATCH] build: Allow elogind for suspend/resume support
|
||||
|
||||
Added elogind to supported suspend/resume hooks. Upstreaming at https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/407
|
||||
---
|
||||
configure.ac | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e3c9a4f8..032c4c4c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -248,13 +248,14 @@ dnl
|
||||
|
||||
PKG_CHECK_MODULES(LIBSYSTEMD, [libsystemd >= 209],[have_libsystemd=yes],[have_libsystemd=no])
|
||||
PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 183],[have_libsystemd_login=yes],[have_libsystemd_login=no])
|
||||
+PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 209], [have_elogind=yes], [have_elogind=no])
|
||||
AC_ARG_WITH(systemd-suspend-resume,
|
||||
AS_HELP_STRING([--with-systemd-suspend-resume=no|yes],
|
||||
[Enable systemd suspend/resume support [[default=auto]]]),,
|
||||
[with_systemd_suspend_resume=auto])
|
||||
|
||||
if test "x$with_systemd_suspend_resume" = "xauto"; then
|
||||
- if test "x$have_libsystemd" = "xyes" || test "x$have_libsystemd_login" = "xyes"; then
|
||||
+ if test "x$have_libsystemd" = "xyes" || test "x$have_libsystemd_login" = "xyes" || test "x$have_elogind" = "xyes"; then
|
||||
with_systemd_suspend_resume=yes
|
||||
else
|
||||
with_systemd_suspend_resume=no
|
||||
@@ -263,8 +264,8 @@ fi
|
||||
|
||||
case $with_systemd_suspend_resume in
|
||||
yes)
|
||||
- if test "x$have_libsystemd" = "xno" && test "x$have_libsystemd_login" = "xno"; then
|
||||
- AC_MSG_ERROR(libsystemd or libsystemd-login development headers are required)
|
||||
+ if test "x$have_libsystemd" = "xno" && test "x$have_libsystemd_login" = "xno" && test "x$have_elogind" = "xno"; then
|
||||
+ AC_MSG_WARN(libsystemd, libsystemd-login or elogind must be available at runtime for suspend/resume support)
|
||||
fi
|
||||
AC_DEFINE(WITH_SYSTEMD_SUSPEND_RESUME, 1, [Define if you have systemd suspend-resume support])
|
||||
;;
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From 94ea3cd9ec1e59071a29ca6ed33386bf50c6355d Mon Sep 17 00:00:00 2001
|
||||
From: Dylan Van Assche <me@dylanvanassche.be>
|
||||
Date: Fri, 27 Nov 2020 20:08:47 +0100
|
||||
Subject: [PATCH] broadband-modem: Do not send ATH during probing
|
||||
|
||||
ATH (AT hangup) rejects an incoming call during probing. This is a hack,
|
||||
needs improvement, but suggested by the maintainer: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/194
|
||||
---
|
||||
src/mm-broadband-modem.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
|
||||
index 97c60b68..9e55b011 100644
|
||||
--- a/src/mm-broadband-modem.c
|
||||
+++ b/src/mm-broadband-modem.c
|
||||
@@ -7607,7 +7607,7 @@ modem_voice_check_support (MMIfaceModemVoice *self,
|
||||
|
||||
/* Check ATH support */
|
||||
mm_base_modem_at_command (MM_BASE_MODEM (self),
|
||||
- "H",
|
||||
+ "I",
|
||||
3,
|
||||
FALSE,
|
||||
(GAsyncReadyCallback)ath_format_check_ready,
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
From 9a4e5a7c2da36288cd66c1500dcd0e1ba844c9cc Mon Sep 17 00:00:00 2001
|
||||
From: Dylan Van Assche <me@dylanvanassche.be>
|
||||
Date: Wed, 25 Nov 2020 19:58:25 +0100
|
||||
Subject: [PATCH] serial-parsers: do not fail to detect a valid response with a
|
||||
call or text incoming
|
||||
|
||||
Upstreaming at
|
||||
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/406
|
||||
---
|
||||
src/mm-serial-parsers.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/mm-serial-parsers.c b/src/mm-serial-parsers.c
|
||||
index b511302e..248cc685 100644
|
||||
--- a/src/mm-serial-parsers.c
|
||||
+++ b/src/mm-serial-parsers.c
|
||||
@@ -108,7 +108,7 @@ mm_serial_parser_v1_new (void)
|
||||
|
||||
parser = g_slice_new (MMSerialParserV1);
|
||||
|
||||
- parser->regex_ok = g_regex_new ("\\r\\nOK(\\r\\n)+$", flags, 0, NULL);
|
||||
+ parser->regex_ok = g_regex_new ("\\r\\nOK(\\r\\n)+", flags, 0, NULL);
|
||||
parser->regex_connect = g_regex_new ("\\r\\nCONNECT.*\\r\\n", flags, 0, NULL);
|
||||
parser->regex_sms = g_regex_new ("\\r\\n>\\s*$", flags, 0, NULL);
|
||||
parser->regex_cme_error = g_regex_new ("\\r\\n\\+CME ERROR:\\s*(\\d+)\\r\\n$", flags, 0, NULL);
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
# Forked from Alpine QMI rpmsg support (certain Qualcomm MSM* modems)
|
||||
|
||||
pkgname=modemmanager
|
||||
pkgver=9999
|
||||
_pkgver=1.14.8
|
||||
pkgrel=2
|
||||
pkgdesc="ModemManager library"
|
||||
url="http://www.freedesktop.org/wiki/Software/ModemManager"
|
||||
arch="armhf armv7 aarch64"
|
||||
license="GPL-2.0-or-later AND LGPL-2.1-or-later"
|
||||
depends_dev="libmm-glib"
|
||||
makedepends="$depends_dev gobject-introspection-dev gtk-doc vala
|
||||
libgudev-dev polkit-dev libmbim-dev libqmi-dev linux-headers"
|
||||
# Needed because of patch modifying configure.ac
|
||||
makedepends="$makedepends automake autoconf autoconf-archive"
|
||||
checkdepends="glib-dev"
|
||||
options="!check" # https://bugs.freedesktop.org/show_bug.cgi?id=101197
|
||||
subpackages="
|
||||
$pkgname-lang
|
||||
$pkgname-doc
|
||||
libmm-glib:libmm
|
||||
$pkgname-dev
|
||||
$pkgname-openrc
|
||||
$pkgname-bash-completion
|
||||
"
|
||||
source="https://www.freedesktop.org/software/ModemManager/ModemManager-$_pkgver.tar.xz
|
||||
$pkgname.rules
|
||||
$pkgname.initd
|
||||
0001-build-Allow-elogind-for-suspend-resume-support.patch
|
||||
0002-broadband-modem-Do-not-send-ATH-during-probing.patch
|
||||
0003-serial-parsers-do-not-fail-to-detect-a-valid-respons.patch
|
||||
rpmsg.patch
|
||||
rpmsg-udev.rules
|
||||
utf16.patch"
|
||||
builddir="$srcdir"/ModemManager-$_pkgver
|
||||
|
||||
# Workaround build freeze with QEMU user emulation
|
||||
export JOBS=1
|
||||
export MAKEFLAGS=-j$JOBS
|
||||
|
||||
build() {
|
||||
# Note: --enable-gtk-doc is disabled to speed up build time
|
||||
./autogen.sh \
|
||||
--build=$CBUILD \
|
||||
--host=$CHOST \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--mandir=/usr/share/man \
|
||||
--infodir=/usr/share/info \
|
||||
--localstatedir=/var \
|
||||
--with-polkit=permissive \
|
||||
--disable-static \
|
||||
--with-dbus-sys-dir=/etc/dbus-1/system.d \
|
||||
--enable-vala=yes \
|
||||
--with-systemd-suspend-resume=yes
|
||||
make
|
||||
}
|
||||
|
||||
libmm() {
|
||||
cd "$builddir"
|
||||
mkdir -p "$subpkgdir"
|
||||
make DESTDIR="$subpkgdir" -C libmm-glib install
|
||||
# move dev files to modemmnager-dev
|
||||
mv -f "$subpkgdir/usr/include/libmm-glib" "$pkgdir/usr/include/"
|
||||
mv -f "$subpkgdir/usr/share/gir-1.0" "$pkgdir/usr/share/"
|
||||
rmdir "$subpkgdir/usr/include" "$subpkgdir/usr/share"
|
||||
}
|
||||
|
||||
package() {
|
||||
make DESTDIR="$pkgdir" install
|
||||
make DESTDIR="$pkgdir" -C libmm-glib uninstall
|
||||
rmdir "$pkgdir"/usr/lib/girepository-1.0 # in libmm-glib
|
||||
rm -rf "$pkgdir"/usr/share/dbus-1/system-services #systemd-service
|
||||
mkdir -p "$pkgdir/usr/share/polkit-1/rules.d"
|
||||
install -m644 -D "$srcdir/$pkgname.rules" \
|
||||
"$pkgdir/usr/share/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
|
||||
install -m755 -D "$srcdir/$pkgname.initd" \
|
||||
"$pkgdir/etc/init.d/$pkgname"
|
||||
install -Dm644 "$srcdir/rpmsg-udev.rules" "$pkgdir/usr/lib/udev/rules.d/80-modemmanager-pmos.rules"
|
||||
# post-install message
|
||||
mkdir -p "$pkgdir/usr/share/doc/$pkgname"
|
||||
cat > $pkgdir/usr/share/doc/$pkgname/README.alpine <<EOF
|
||||
If your USB modem shows up as a Flash drive when you plug it in:
|
||||
|
||||
install 'usb-modeswitch' to automatically switch to USB modem mode whenever you plug it in.
|
||||
To control your modem without the root password: add your user account to the 'plugdev' group.
|
||||
EOF
|
||||
}
|
||||
|
||||
check() {
|
||||
make check
|
||||
}
|
||||
|
||||
sha512sums="2457214fecd7d4d9fef291f756ef19973b98a05d07721cd57bdaee704cd6b9e96d27f6741bd8d245a0495f1d338e65db12f19b2d9a8dd6a5cddfb050614381c6 ModemManager-1.14.8.tar.xz
|
||||
8d736f477649e42c05b34ac55391353c7f0c17138d039e049b16b07624d86fd9968ef1aa14672a63decf8b2c0ae984a34a0770322198b326775efba58f566685 modemmanager.rules
|
||||
e2769401c52c3fff0b8057c13c6f7f2e5656c2963239ecbd647a01e66a344f6852cf2ba065358248315945bdf6ebbc4976903565b12ace2d15df6586dcc1de5b modemmanager.initd
|
||||
cdb3bce108f6f31818b0b229fb01da1e9f114c7b6db67648c59714a07c0374700f172858071e6f0c9377957a7bb1cdb005755d88fbd4ca94448c3541e51516b2 0001-build-Allow-elogind-for-suspend-resume-support.patch
|
||||
ed830556918d62e68ccd3672c7cb60d17041356071c05480ff0cbaf97d448927ff01d304e85b40b1bfc49faa4af8c07cc7205adc945b436ae324f21259104273 0002-broadband-modem-Do-not-send-ATH-during-probing.patch
|
||||
97534f3a9f501a13fad0de7d432d9b2f684bc9639db74d56954d1f314812db66f06b97201ba53ec668f3e1dd924380afc66ef35a4cd2267ad1c526cdcb1c5f08 0003-serial-parsers-do-not-fail-to-detect-a-valid-respons.patch
|
||||
64270c00630f3dd73b5e06547e441f5cf8d75b96032da423c4132af2fc84b2c35042800e105c66bae354d61c66b716cc602421ac0ff82f7b4a8f0ce798855e24 rpmsg.patch
|
||||
0928a7b658d0eeb37daf40930ea930b266151df743c2c7b1d863bce9447fedb904924a5e673732d5bc765dc2ec6d8f4a2b47bc946575e8f18712c0f7ee81fb73 rpmsg-udev.rules
|
||||
7a88ea53600377e4a6bd652fa90036b7d8284dbaeb02c39f79501fc6f1368519291786df2fd8112b9b606da759d6e758be30fe558bab3a85a70e07e366362530 utf16.patch"
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
|
||||
supervisor=supervise-daemon
|
||||
command=/usr/sbin/ModemManager
|
||||
|
||||
description="ModemManager Daemon"
|
||||
|
||||
depend() {
|
||||
need dbus
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
// Let users in plugdev group modify ModemManager
|
||||
polkit.addRule(function(action, subject) {
|
||||
if ((action.id == "org.freedesktop.ModemManager1.Device.Control" ||
|
||||
action.id == "org.freedesktop.ModemManager1.Contacts" ||
|
||||
action.id == "org.freedesktop.ModemManager1.Messaging" ||
|
||||
action.id == "org.freedesktop.ModemManager1.Location") &&
|
||||
subject.isInGroup("plugdev") && subject.active) {
|
||||
return "yes";
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
SYMLINK=="modem", SUBSYSTEM=="rpmsg", ENV{ID_MM_CANDIDATE}="1", ENV{ID_MM_DEVICE_PROCESS}="1", ENV{ID_MM_PORT_TYPE_QCDM}="1", ENV{ID_MM_PHYSDEV_UID}="qcom-rpmsg"
|
||||
SYMLINK=="modem-at", SUBSYSTEM=="rpmsg", ENV{ID_MM_CANDIDATE}="1", ENV{ID_MM_DEVICE_PROCESS}="1", ENV{ID_MM_PHYSDEV_UID}="qcom-rpmsg"
|
||||
ENV{INTERFACE}=="rmnet0", SUBSYSTEM=="net", ENV{ID_MM_CANDIDATE}="1", ENV{ID_MM_DEVICE_PROCESS}="1", ENV{ID_MM_PHYSDEV_UID}="qcom-rpmsg"
|
||||
|
|
@ -1,434 +0,0 @@
|
|||
From 482cfce46e1f8ec546499b782c2c2d96e6a9203e Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Gerhold <stephan@gerhold.net>
|
||||
Date: Sat, 21 Dec 2019 18:30:13 +0100
|
||||
Subject: [PATCH] core: Add support for Qualcomm MSM/QMI modems via rpmsg
|
||||
|
||||
Most older Qualcomm SoCs (e.g. MSM8916, MSM8974, ...) communicate with
|
||||
the integrated modem via shared memory (SMD channels). This is similar
|
||||
to QRTR on newer SoCs, but without the "network" layer. In fact, the older
|
||||
SoCs also have QRTR, but the modem QMI services are not exposed there.
|
||||
|
||||
The mainline Linux kernel exposes SMD channels via the "remote processor
|
||||
messaging bus" (rpmsg). Through special IOCTL calls it is possible to
|
||||
create a char device for a rpmsg/SMD channel. We can then use these to
|
||||
send QMI/AT messages to the modem, much like the ordinary serial char
|
||||
devices when using a Qualcomm modem through USB.
|
||||
|
||||
The QMI/AT messages needed to use the modem seem to be pretty much
|
||||
the same as when using QMI via USB. We have tested on a few smartphones
|
||||
with MSM8916 which are running a (close-to) mainline kernel, e.g.:
|
||||
|
||||
- BQ Aquaris X5
|
||||
- Motorola Moto G4 Play
|
||||
- Samsung Galaxy A3/A5 (2015)
|
||||
- Wileyfox Swift
|
||||
- Xiaomi Redmi 2
|
||||
|
||||
Most of the modem functionality seems to be working fine, without any
|
||||
changes to the QMI/AT messages that are sent to the modem:
|
||||
|
||||
- Voice calls
|
||||
- SMS
|
||||
- Mobile Internet
|
||||
- GPS (modem sends NMEA messages, so far we were unable to get a fix
|
||||
for some reason...)
|
||||
|
||||
However, note that the implementation of voice call audio and network
|
||||
interface is very different from the USB modems. It is completely
|
||||
independent of the rpmsg channels that are used to control the modem.
|
||||
I have written special drivers for:
|
||||
|
||||
- Voice call audio (q6voice) [1]
|
||||
- Network interface (BAM DMUX) [2]
|
||||
(Note: Newer SoCs use IPA (IP Accelerator) instead of BAM DMUX...)
|
||||
|
||||
I have plans to upstream these, but there is still some more work
|
||||
needed (mostly fine tuning for some edge cases). This is independent of the
|
||||
changes in ModemManager, because the additional drivers are only necessary
|
||||
if you want to have audio/Internet actually working.
|
||||
|
||||
This commit adds support for probing rpmsg ports within ModemManager.
|
||||
I think most of the changes are quite straightforward, but there are
|
||||
some FIXME comments scattered over the code where I was not sure about
|
||||
the best way to implement it. Those still need to be discussed :)
|
||||
|
||||
Note: This commit does not add the udev rules necessary to use rpmsg
|
||||
modems with ModemManager. The reason for that is that you typically need
|
||||
additional system services/tools and udev rules anyway for the modem to work.
|
||||
|
||||
Currently I'm using:
|
||||
|
||||
SYMLINK=="modem", SUBSYSTEM=="rpmsg", ENV{ID_MM_CANDIDATE}="1", ENV{ID_MM_DEVICE_PROCESS}="1", ENV{ID_MM_PORT_TYPE_QCDM}="1", ENV{ID_MM_PHYSDEV_UID}="qcom-rpmsg"
|
||||
SYMLINK=="modem-at", SUBSYSTEM=="rpmsg", ENV{ID_MM_CANDIDATE}="1", ENV{ID_MM_DEVICE_PROCESS}="1", ENV{ID_MM_PHYSDEV_UID}="qcom-rpmsg"
|
||||
ENV{INTERFACE}=="rmnet0", SUBSYSTEM=="net", ENV{ID_MM_CANDIDATE}="1", ENV{ID_MM_DEVICE_PROCESS}="1", ENV{ID_MM_PHYSDEV_UID}="qcom-rpmsg"
|
||||
|
||||
The purpose of `ENV{ID_MM_PHYSDEV_UID}` is to link the network interface
|
||||
to the modem in ModemManager, since it isn't related to the rpmsg ports
|
||||
in any way. Of course this is rather naive because there could be also
|
||||
other network interfaces called `rmnet0`...
|
||||
|
||||
Also, the udev rules assume that we already have set up the rpmsg
|
||||
char devices at /dev/modem (SMD channel `DATA5_CNTL`) and /dev/modem-at
|
||||
(SMD channel `DATA4`). Those can be set up using rpmsgexport [3].
|
||||
In postmarketOS [4], this is handled using additional udev rules, see [5].
|
||||
|
||||
[1]: https://github.com/msm8916-mainline/linux/commits/q6voice
|
||||
[2]: https://github.com/msm8916-mainline/linux/commits/bam-dmux
|
||||
[3]: https://github.com/andersson/rpmsgexport
|
||||
[4]: https://postmarketos.org
|
||||
[5]: https://gitlab.com/postmarketOS/pmaports/-/blob/master/modem/msm-modem/udev-rpmsg.rules
|
||||
---
|
||||
plugins/generic/mm-plugin-generic.c | 2 +-
|
||||
src/mm-base-manager.c | 12 +++++--
|
||||
src/mm-base-modem.c | 55 ++++++++++++++++++++++++-----
|
||||
src/mm-broadband-modem-qmi.c | 12 ++++++-
|
||||
src/mm-plugin.c | 19 ++++++++++
|
||||
src/mm-port-probe.c | 24 ++++++++++---
|
||||
src/mm-port-qmi.c | 7 ++--
|
||||
src/mm-port-qmi.h | 2 +-
|
||||
src/mm-port-serial-at.c | 3 +-
|
||||
src/mm-port.h | 3 +-
|
||||
10 files changed, 118 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/plugins/generic/mm-plugin-generic.c b/plugins/generic/mm-plugin-generic.c
|
||||
index c2e3a07e..db4e3462 100644
|
||||
--- a/plugins/generic/mm-plugin-generic.c
|
||||
+++ b/plugins/generic/mm-plugin-generic.c
|
||||
@@ -91,7 +91,7 @@ create_modem (MMPlugin *self,
|
||||
G_MODULE_EXPORT MMPlugin *
|
||||
mm_plugin_create (void)
|
||||
{
|
||||
- static const gchar *subsystems[] = { "tty", "net", "usb", NULL };
|
||||
+ static const gchar *subsystems[] = { "tty", "net", "usb", "rpmsg", NULL };
|
||||
|
||||
return MM_PLUGIN (
|
||||
g_object_new (MM_TYPE_PLUGIN_GENERIC,
|
||||
diff --git a/src/mm-base-manager.c b/src/mm-base-manager.c
|
||||
index 653adb5c..da2a3294 100644
|
||||
--- a/src/mm-base-manager.c
|
||||
+++ b/src/mm-base-manager.c
|
||||
@@ -467,7 +467,8 @@ handle_uevent (GUdevClient *client,
|
||||
/* A bit paranoid */
|
||||
subsys = g_udev_device_get_subsystem (device);
|
||||
g_return_if_fail (subsys != NULL);
|
||||
- g_return_if_fail (g_str_equal (subsys, "tty") || g_str_equal (subsys, "net") || g_str_has_prefix (subsys, "usb"));
|
||||
+ g_return_if_fail (g_str_equal (subsys, "tty") || g_str_equal (subsys, "net") ||
|
||||
+ g_str_has_prefix (subsys, "usb") || g_str_equal (subsys, "rpmsg"));
|
||||
|
||||
kernel_device = mm_kernel_device_udev_new (device);
|
||||
|
||||
@@ -561,6 +562,13 @@ process_scan (MMBaseManager *self,
|
||||
g_object_unref (G_OBJECT (iter->data));
|
||||
}
|
||||
g_list_free (devices);
|
||||
+
|
||||
+ devices = g_udev_client_query_by_subsystem (self->priv->udev, "rpmsg");
|
||||
+ for (iter = devices; iter; iter = g_list_next (iter)) {
|
||||
+ start_device_added (self, G_UDEV_DEVICE (iter->data), manual_scan);
|
||||
+ g_object_unref (G_OBJECT (iter->data));
|
||||
+ }
|
||||
+ g_list_free (devices);
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -1448,7 +1456,7 @@ mm_base_manager_init (MMBaseManager *self)
|
||||
|
||||
#if defined WITH_UDEV
|
||||
{
|
||||
- const gchar *subsys[5] = { "tty", "net", "usb", "usbmisc", NULL };
|
||||
+ const gchar *subsys[] = { "tty", "net", "usb", "usbmisc", "rpmsg", NULL };
|
||||
|
||||
/* Setup UDev client */
|
||||
self->priv->udev = g_udev_client_new (subsys);
|
||||
diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c
|
||||
index 0805cedb..e4aef11a 100644
|
||||
--- a/src/mm-base-modem.c
|
||||
+++ b/src/mm-base-modem.c
|
||||
@@ -175,6 +175,7 @@ mm_base_modem_grab_port (MMBaseModem *self,
|
||||
if (!g_str_equal (subsys, "net") &&
|
||||
!g_str_equal (subsys, "tty") &&
|
||||
!(g_str_has_prefix (subsys, "usb") && g_str_has_prefix (name, "cdc-wdm")) &&
|
||||
+ !g_str_equal (subsys, "rpmsg") &&
|
||||
!g_str_equal (subsys, "virtual")) {
|
||||
g_set_error (error,
|
||||
MM_CORE_ERROR,
|
||||
@@ -297,7 +298,7 @@ mm_base_modem_grab_port (MMBaseModem *self,
|
||||
g_str_has_prefix (name, "cdc-wdm")) {
|
||||
#if defined WITH_QMI
|
||||
if (ptype == MM_PORT_TYPE_QMI)
|
||||
- port = MM_PORT (mm_port_qmi_new (name));
|
||||
+ port = MM_PORT (mm_port_qmi_new (name, MM_PORT_SUBSYS_USB));
|
||||
#endif
|
||||
#if defined WITH_MBIM
|
||||
if (!port && ptype == MM_PORT_TYPE_MBIM)
|
||||
@@ -340,6 +341,36 @@ mm_base_modem_grab_port (MMBaseModem *self,
|
||||
/* Store flags already */
|
||||
mm_port_serial_at_set_flags (MM_PORT_SERIAL_AT (port), at_pflags);
|
||||
}
|
||||
+ /* rpmsg ports... */
|
||||
+ else if (g_str_equal (subsys, "rpmsg")) {
|
||||
+#if defined WITH_QMI
|
||||
+ if (ptype == MM_PORT_TYPE_QMI)
|
||||
+ port = MM_PORT (mm_port_qmi_new (name, MM_PORT_SUBSYS_RPMSG));
|
||||
+#endif
|
||||
+ /* Non-serial AT port */
|
||||
+ if (!port && ptype == MM_PORT_TYPE_AT) {
|
||||
+ port = MM_PORT (mm_port_serial_at_new (name, MM_PORT_SUBSYS_RPMSG));
|
||||
+
|
||||
+ /* Set common response parser */
|
||||
+ mm_port_serial_at_set_response_parser (MM_PORT_SERIAL_AT (port),
|
||||
+ mm_serial_parser_v1_parse,
|
||||
+ mm_serial_parser_v1_new (),
|
||||
+ mm_serial_parser_v1_destroy);
|
||||
+ /* Store flags already */
|
||||
+ mm_port_serial_at_set_flags (MM_PORT_SERIAL_AT (port), at_pflags);
|
||||
+ }
|
||||
+
|
||||
+ if (!port) {
|
||||
+ g_set_error (error,
|
||||
+ MM_CORE_ERROR,
|
||||
+ MM_CORE_ERROR_UNSUPPORTED,
|
||||
+ "Cannot add port '%s/%s', unsupported",
|
||||
+ subsys,
|
||||
+ name);
|
||||
+ g_free (key);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+ }
|
||||
else
|
||||
/* We already filter out before all non-tty, non-net, non-cdc-wdm ports */
|
||||
g_assert_not_reached ();
|
||||
@@ -711,7 +742,17 @@ mm_base_modem_peek_port_qmi_for_data (MMBaseModem *self,
|
||||
{
|
||||
GList *cdc_wdm_qmi_ports, *l;
|
||||
const gchar *net_port_parent_path;
|
||||
- MMPortQmi *found = NULL;
|
||||
+ MMPortQmi *found = NULL, *primary;
|
||||
+
|
||||
+ /* FIXME: For RPMSG modems the network interface is not related to the
|
||||
+ * QMI device, they are managed through completely different subsystems.
|
||||
+ * For now there should be just one QMI and one net port so we can just
|
||||
+ * return the primary QMI port.
|
||||
+ */
|
||||
+ primary = mm_base_modem_peek_port_qmi (MM_BASE_MODEM (self));
|
||||
+ if (primary && mm_port_get_subsys (MM_PORT (primary)) == MM_PORT_SUBSYS_RPMSG)
|
||||
+ /* Assume there is just one QMI port */
|
||||
+ return primary;
|
||||
|
||||
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));
|
||||
@@ -1239,13 +1280,11 @@ mm_base_modem_organize_ports (MMBaseModem *self,
|
||||
secondary = backup_primary ? backup_primary : backup_secondary;
|
||||
|
||||
#if defined WITH_QMI
|
||||
- /* On QMI-based modems, we need to have at least a net port */
|
||||
+ /* On QMI-based modems, a net port is required for broadband.
|
||||
+ * However, all other functionality works without so just warn about this.
|
||||
+ */
|
||||
if (qmi_primary && !data_primary) {
|
||||
- g_set_error_literal (error,
|
||||
- MM_CORE_ERROR,
|
||||
- MM_CORE_ERROR_FAILED,
|
||||
- "Failed to find a net port in the QMI modem");
|
||||
- return FALSE;
|
||||
+ mm_obj_warn (self, "Failed to find a net port in the QMI modem");
|
||||
}
|
||||
#endif
|
||||
|
||||
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
|
||||
index 83e808c2..e641c401 100644
|
||||
--- a/src/mm-broadband-modem-qmi.c
|
||||
+++ b/src/mm-broadband-modem-qmi.c
|
||||
@@ -9457,7 +9457,17 @@ initialization_started (MMBroadbandModem *self,
|
||||
|
||||
/* Now open our QMI port */
|
||||
mm_port_qmi_open (ctx->qmi,
|
||||
- TRUE,
|
||||
+ /* FIXME: Parts of the "data format" functionality on libqmi
|
||||
+ * assume that we are talking to qmi_wwan, which exposes the
|
||||
+ * kernel data format through sysfs.
|
||||
+ *
|
||||
+ * For RPMSG modems the driver that manages the net port
|
||||
+ * is a different one, and setting the kernel data format
|
||||
+ * therefore eventually works differently there.
|
||||
+ * For now skip setting the data format entirely for RPMSG
|
||||
+ * to avoid a Segmentation Fault.
|
||||
+ */
|
||||
+ mm_port_get_subsys (MM_PORT (ctx->qmi)) != MM_PORT_SUBSYS_RPMSG,
|
||||
NULL,
|
||||
(GAsyncReadyCallback)qmi_port_open_ready,
|
||||
task);
|
||||
diff --git a/src/mm-plugin.c b/src/mm-plugin.c
|
||||
index 77bd6528..f6bee411 100644
|
||||
--- a/src/mm-plugin.c
|
||||
+++ b/src/mm-plugin.c
|
||||
@@ -773,6 +773,12 @@ mm_plugin_supports_port (MMPlugin *self,
|
||||
|
||||
/* Build flags depending on what probing needed */
|
||||
probe_run_flags = MM_PORT_PROBE_NONE;
|
||||
+ if (g_str_equal (mm_kernel_device_get_subsystem (port), "rpmsg")) {
|
||||
+ if (self->priv->at)
|
||||
+ probe_run_flags |= MM_PORT_PROBE_AT;
|
||||
+ if (self->priv->qmi)
|
||||
+ probe_run_flags |= MM_PORT_PROBE_QMI;
|
||||
+ } else
|
||||
if (!g_str_has_prefix (mm_kernel_device_get_name (port), "cdc-wdm")) {
|
||||
/* Serial ports... */
|
||||
if (self->priv->at)
|
||||
@@ -958,6 +964,18 @@ mm_plugin_create_modem (MMPlugin *self,
|
||||
}
|
||||
|
||||
#if defined WITH_QMI
|
||||
+/* FIXME: For RPMSG modems the network interface usually won't be managed
|
||||
+ * by the USB qmi_wwan driver so the check below prevents them from getting
|
||||
+ * registered in ModemManager.
|
||||
+ *
|
||||
+ * I guess it should be just skipped in the RPMSG case. However, to detect that
|
||||
+ * it seems like we would need to iterate another time over "port_probes"
|
||||
+ * to see if the QMI port is provided by the RPMSG subsystem.
|
||||
+ *
|
||||
+ * I'm not sure if there is a simple way to detect this situation only based
|
||||
+ * on the network device itself (which has nothing to do with RPMSG).
|
||||
+ */
|
||||
+#if 0
|
||||
if (MM_IS_BROADBAND_MODEM_QMI (modem) &&
|
||||
port_type == MM_PORT_TYPE_NET &&
|
||||
g_strcmp0 (driver, "qmi_wwan") != 0) {
|
||||
@@ -966,6 +984,7 @@ mm_plugin_create_modem (MMPlugin *self,
|
||||
force_ignored = TRUE;
|
||||
goto grab_port;
|
||||
}
|
||||
+#endif
|
||||
|
||||
if (!MM_IS_BROADBAND_MODEM_QMI (modem) &&
|
||||
port_type == MM_PORT_TYPE_NET &&
|
||||
diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c
|
||||
index 0c1edef1..b062f236 100644
|
||||
--- a/src/mm-port-probe.c
|
||||
+++ b/src/mm-port-probe.c
|
||||
@@ -484,6 +484,9 @@ static void
|
||||
wdm_probe_qmi (MMPortProbe *self)
|
||||
{
|
||||
PortProbeRunContext *ctx;
|
||||
+#if defined WITH_QMI
|
||||
+ MMPortSubsys subsys = MM_PORT_SUBSYS_USB;
|
||||
+#endif
|
||||
|
||||
g_assert (self->priv->task);
|
||||
ctx = g_task_get_task_data (self->priv->task);
|
||||
@@ -491,8 +494,11 @@ wdm_probe_qmi (MMPortProbe *self)
|
||||
#if defined WITH_QMI
|
||||
mm_obj_dbg (self, "probing QMI...");
|
||||
|
||||
+ if (g_str_equal (mm_kernel_device_get_subsystem (self->priv->port), "rpmsg"))
|
||||
+ subsys = MM_PORT_SUBSYS_RPMSG;
|
||||
+
|
||||
/* Create a port and try to open it */
|
||||
- ctx->port_qmi = mm_port_qmi_new (mm_kernel_device_get_name (self->priv->port));
|
||||
+ ctx->port_qmi = mm_port_qmi_new (mm_kernel_device_get_name (self->priv->port), subsys);
|
||||
mm_port_qmi_open (ctx->port_qmi,
|
||||
FALSE,
|
||||
NULL,
|
||||
@@ -1269,6 +1275,8 @@ serial_open_at (MMPortProbe *self)
|
||||
|
||||
if (g_str_has_prefix (mm_kernel_device_get_subsystem (self->priv->port), "usb"))
|
||||
subsys = MM_PORT_SUBSYS_USB;
|
||||
+ if (g_str_equal (mm_kernel_device_get_subsystem (self->priv->port), "rpmsg"))
|
||||
+ subsys = MM_PORT_SUBSYS_RPMSG;
|
||||
|
||||
ctx->serial = MM_PORT_SERIAL (mm_port_serial_at_new (mm_kernel_device_get_name (self->priv->port), subsys));
|
||||
if (!ctx->serial) {
|
||||
@@ -1570,9 +1578,10 @@ mm_port_probe_is_qmi (MMPortProbe *self)
|
||||
|
||||
subsys = mm_kernel_device_get_subsystem (self->priv->port);
|
||||
name = mm_kernel_device_get_name (self->priv->port);
|
||||
- if (!g_str_has_prefix (subsys, "usb") ||
|
||||
- !name ||
|
||||
- !g_str_has_prefix (name, "cdc-wdm"))
|
||||
+ if ((!g_str_has_prefix (subsys, "usb") ||
|
||||
+ !name ||
|
||||
+ !g_str_has_prefix (name, "cdc-wdm")) &&
|
||||
+ !g_str_equal (subsys, "rpmsg"))
|
||||
return FALSE;
|
||||
|
||||
return self->priv->is_qmi;
|
||||
@@ -1656,6 +1665,13 @@ mm_port_probe_get_port_type (MMPortProbe *self)
|
||||
}
|
||||
}
|
||||
|
||||
+ if (g_str_equal (subsys, "rpmsg")) {
|
||||
+#if defined WITH_QMI
|
||||
+ if (self->priv->is_qmi)
|
||||
+ return MM_PORT_TYPE_QMI;
|
||||
+#endif
|
||||
+ }
|
||||
+
|
||||
if (self->priv->flags & MM_PORT_PROBE_QCDM &&
|
||||
self->priv->is_qcdm)
|
||||
return MM_PORT_TYPE_QCDM;
|
||||
diff --git a/src/mm-port-qmi.c b/src/mm-port-qmi.c
|
||||
index 83d92b9d..0c4a4a98 100644
|
||||
--- a/src/mm-port-qmi.c
|
||||
+++ b/src/mm-port-qmi.c
|
||||
@@ -788,11 +788,14 @@ mm_port_qmi_close (MMPortQmi *self,
|
||||
/*****************************************************************************/
|
||||
|
||||
MMPortQmi *
|
||||
-mm_port_qmi_new (const gchar *name)
|
||||
+mm_port_qmi_new (const gchar *name, MMPortSubsys subsys)
|
||||
{
|
||||
+ g_return_val_if_fail (subsys == MM_PORT_SUBSYS_USB ||
|
||||
+ subsys == MM_PORT_SUBSYS_RPMSG, NULL);
|
||||
+
|
||||
return MM_PORT_QMI (g_object_new (MM_TYPE_PORT_QMI,
|
||||
MM_PORT_DEVICE, name,
|
||||
- MM_PORT_SUBSYS, MM_PORT_SUBSYS_USB,
|
||||
+ MM_PORT_SUBSYS, subsys,
|
||||
MM_PORT_TYPE, MM_PORT_TYPE_QMI,
|
||||
NULL));
|
||||
}
|
||||
diff --git a/src/mm-port-qmi.h b/src/mm-port-qmi.h
|
||||
index b4e8460c..6a5c298a 100644
|
||||
--- a/src/mm-port-qmi.h
|
||||
+++ b/src/mm-port-qmi.h
|
||||
@@ -46,7 +46,7 @@ struct _MMPortQmiClass {
|
||||
|
||||
GType mm_port_qmi_get_type (void);
|
||||
|
||||
-MMPortQmi *mm_port_qmi_new (const gchar *name);
|
||||
+MMPortQmi *mm_port_qmi_new (const gchar *name, MMPortSubsys subsys);
|
||||
|
||||
void mm_port_qmi_open (MMPortQmi *self,
|
||||
gboolean set_data_format,
|
||||
diff --git a/src/mm-port-serial-at.c b/src/mm-port-serial-at.c
|
||||
index c8e4782f..11a086ed 100644
|
||||
--- a/src/mm-port-serial-at.c
|
||||
+++ b/src/mm-port-serial-at.c
|
||||
@@ -532,7 +532,8 @@ mm_port_serial_at_new (const char *name,
|
||||
{
|
||||
g_return_val_if_fail (subsys == MM_PORT_SUBSYS_TTY ||
|
||||
subsys == MM_PORT_SUBSYS_USB ||
|
||||
- subsys == MM_PORT_SUBSYS_UNIX, NULL);
|
||||
+ subsys == MM_PORT_SUBSYS_UNIX ||
|
||||
+ subsys == MM_PORT_SUBSYS_RPMSG, NULL);
|
||||
|
||||
return MM_PORT_SERIAL_AT (g_object_new (MM_TYPE_PORT_SERIAL_AT,
|
||||
MM_PORT_DEVICE, name,
|
||||
diff --git a/src/mm-port.h b/src/mm-port.h
|
||||
index 33b07d97..861a086b 100644
|
||||
--- a/src/mm-port.h
|
||||
+++ b/src/mm-port.h
|
||||
@@ -28,8 +28,9 @@ typedef enum { /*< underscore_name=mm_port_subsys >*/
|
||||
MM_PORT_SUBSYS_NET,
|
||||
MM_PORT_SUBSYS_USB,
|
||||
MM_PORT_SUBSYS_UNIX,
|
||||
+ MM_PORT_SUBSYS_RPMSG,
|
||||
|
||||
- MM_PORT_SUBSYS_LAST = MM_PORT_SUBSYS_UNIX /*< skip >*/
|
||||
+ MM_PORT_SUBSYS_LAST = MM_PORT_SUBSYS_RPMSG /*< skip >*/
|
||||
} MMPortSubsys;
|
||||
|
||||
typedef enum { /*< underscore_name=mm_port_type >*/
|
||||
--
|
||||
2.28.0
|
||||
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
temp/modemmanager: Fix sending SMS with UTF-16 characters
|
||||
|
||||
Upstream: no
|
||||
|
||||
Patch recommended by Aleksander Morgado in upstream issue, until a proper
|
||||
fix is developed:
|
||||
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/274#note_671679
|
||||
|
||||
diff --git a/src/mm-charsets.c b/src/mm-charsets.c
|
||||
index 19d1874c4..67b2103cd 100644
|
||||
--- a/src/mm-charsets.c
|
||||
+++ b/src/mm-charsets.c
|
||||
@@ -43,7 +43,7 @@ static const CharsetEntry charset_map[] = {
|
||||
{ "PCCP437", "CP437", "CP437", "CP437//TRANSLIT", MM_MODEM_CHARSET_PCCP437 },
|
||||
{ "PCDN", "CP850", "CP850", "CP850//TRANSLIT", MM_MODEM_CHARSET_PCDN },
|
||||
{ "HEX", NULL, NULL, NULL, MM_MODEM_CHARSET_HEX },
|
||||
- { "UTF-16", "UTF16", "UTF-16BE", "UTF-16BE//TRANSLIT", MM_MODEM_CHARSET_UTF16 },
|
||||
+ { "UTF-16", "UTF16", "UTF-16BE", "UTF-16BE", MM_MODEM_CHARSET_UTF16 },
|
||||
};
|
||||
Loading…
Reference in a new issue