modemmanager: add support for wwan subsystem in hotplug

WWAN devices may now be exposed in the new 'wwan' subsystem in the
kernel (since 5.13), initially applicable to devices exposed in PCIe
(no USB), but at some point may also apply to USB devices that until
now were exposed via other subsystems (e.g. usbmisc, tty).

Signed-off-by: Aleksander Morgado <[email protected]>
(cherry picked from commit 2a31359c478025850a9feeb684b758ede62bf9c4)

diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile
index c89a0b0f6551c8f446137be0329251ac5e449016..ce87b0a36ab2ac0256702f36098dc50a2ffdeca1 100644 (file)
--- a/net/modemmanager/Makefile
+++ b/net/modemmanager/Makefile
@@ -131,6 +131,9 @@ define Package/modemmanager/install
        $(INSTALL_DIR) $(1)/etc/hotplug.d/tty
        $(INSTALL_DATA) ./files/25-modemmanager-tty $(1)/etc/hotplug.d/tty
 
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/wwan
+       $(INSTALL_DATA) ./files/25-modemmanager-wwan $(1)/etc/hotplug.d/wwan
+
        $(INSTALL_DIR) $(1)/lib/netifd/proto
        $(INSTALL_BIN) ./files/modemmanager.proto $(1)/lib/netifd/proto/modemmanager.sh
 endef

diff --git a/net/modemmanager/files/25-modemmanager-wwan b/net/modemmanager/files/25-modemmanager-wwan
new file mode 100644 (file)
index 0000000..c4dc6b8
--- /dev/null
+++ b/net/modemmanager/files/25-modemmanager-wwan
@@ -0,0 +1,15 @@
+#!/bin/sh
+# Copyright (C) 2021 Aleksander Morgado <[email protected]>
+
+# Load hotplug common utilities
+. /usr/share/ModemManager/modemmanager.common
+
+# We require a device name
+[ -n "$DEVNAME" ] || exit
+
+# Always make sure the rundir exists
+mkdir -m 0755 -p "${MODEMMANAGER_RUNDIR}"
+
+# Report wwan
+mm_log "${ACTION} wwan control port ${DEVNAME}: event processed"
+mm_report_event "${ACTION}" "${DEVNAME}" "wwan" "/sys${DEVPATH}"