From nobody Thu Aug 21 15:02:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c76467125z65GfX; Thu, 21 Aug 2025 15:02:14 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c76466l92z3C11; Thu, 21 Aug 2025 15:02:14 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755788534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=RJS4vrOh3L0w3HHUi0Bh5zUM9cwVX2ByCp+daTqohUk=; b=suDmlzhsV5zqStzy6wua/BwD1r82HKcxO7rh/aSh5C8wkfrzewECuzVsfBQxidt8l2zDde Ngfmd9bchVQh9FsmOckKRENOIhwltpwwBoDKCPnsnAhiGm6+PS2Rc81v2+cQv7UfqqttZS HRy6mKIsjFs/sIhW63D4VI/LjQZb3wdL4vWl47YVD63O//qLUDMizQpr/6JHppif6nOQXd N6FoUKOFE2/4IY/YcXtHvyHob/5U+A4eX0R7i11Tbf3zPYuejW6hegkavYpjoqb5wOex63 HSrllDRJYgCuPTlvNKgkujCUOcPgERZ1xqg8+dWS0L9FlWq5oX3EUUCWtsQXiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755788534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=RJS4vrOh3L0w3HHUi0Bh5zUM9cwVX2ByCp+daTqohUk=; b=rHaCq5Vq4n+d8ikpNz3CcAuQwZag9VjzOyxcApKz617vcLyEoFw+YsrRvuLRw5tONHxYPn Tx1s2j+6vfWiAai9n4S7Lb9pxAxWvrqyZsVaUpUohnVnW3HE6uj6cMzebBxGvWm/Ugqgxs Q5qgUVLPhpD9qtJOgSPFaPqcUX+yMQ/e5k2blyvEPhOc3jSqLnBKHY3iJ1LfsqEBDUWtfM 0L5hNjI8iJzMJ3pWM/iNWf6umyUCbg1E99QOaKM/uPThVhGBA0H/uxhh9bmR1obrOtKTei 9UL6ts0dLdJIsbBi3jdBZju9C3p6f++AQ/G6uf1RUGSy8qbOp9GcsJZ8w574ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755788534; a=rsa-sha256; cv=none; b=oF6kawScIbG70CUSgVoJVTNeSZSdAcKZgRWrWfO4/xuHhae6lkt3YGHzslSQpo2CSyxjv4 B4RkbLV71C0s7czREjUS+D/13S7zdnSC5bt/q1Q8wSA2+UA5luEjaA1BhaVrwD2h6Tl232 ziPhjoh8tnrYgT7EU7uuFj3KOoYZwbwgGbp7WQt5X8Ri1OJ9tICSvxxsUAf8KkQ7b0cDQP 8PmCv9v+WPYRog8xsYtjNRAEySj12nkI5Dhv5Q7JX+6QLJB0A4edk/262UaL4I36AhnJS2 A6P1TOl6V4zTj81p4N09uXMhdtCJ2ZHPSQtiivWZoEgOXhRqp6TPR9qoMJWAjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2001:19f0:6001:9db:98f0:9fe0:3545:10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4c764439QSz5hY; Thu, 21 Aug 2025 15:02:12 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: <65F7C538-6AF3-429B-AC08-541A7C7CA1D0@FreeBSD.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_A0529DCA-96D6-4CB5-A525-0800EA98418A" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 458ac2b6e445 - main - umb.4: Improve synposis, add netmap Date: Thu, 21 Aug 2025 23:02:01 +0800 In-Reply-To: Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: Alexander Ziaee References: X-Mailer: Apple Mail (2.3696.120.41.1.10) --Apple-Mail=_A0529DCA-96D6-4CB5-A525-0800EA98418A Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Aug 21, 2025, at 10:08 PM, Alexander Ziaee = wrote: >=20 > On 2025-08-20 23:21 -04:00 EDT, "Zhenlei Huang" > wrote: >> Hi Alexander, >>=20 >> I'd presume umb(4) does not depends on netmap. A quick search of = DEV_NETMAP >>=20 >> ``` >> #ifdef DEV_NETMAP >> static void umb_input(if_t , struct mbuf *); >> #endif >> ... >> #ifdef DEV_NETMAP >> if_setinputfn(ifp, umb_input); >> #endif >> ``` >>=20 >> I think the #ifdef can be removed. I currently do not have that = hardware so I'd appreciate if someone can test it. >=20 > I didn't get that far myself, this commit was partially in response to = comment 67 [0] on the original bug where a user got the driver working = on FreeBSD 14 by adding `device netmap` to their kernconf, and it didn't = work without that. >=20 > Should we send this to khorben? >=20 > [0] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D263783#c67 = I replied to PR 263783.=20 >=20 > Best, > Alex >=20 >>=20 >> Best regards, >> Zhenlei >>=20 >>> On Aug 21, 2025, at 9:50 AM, Alexander Ziaee = wrote: >>>=20 >>> The branch main has been updated by ziaee: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D458ac2b6e4452acc1a614352c8945ecc= 37667aa0 >>>=20 >>> commit 458ac2b6e4452acc1a614352c8945ecc37667aa0 >>> Author: Alexander Ziaee >>> AuthorDate: 2025-08-20 14:45:08 +0000 >>> Commit: Alexander Ziaee >>> CommitDate: 2025-08-21 01:48:13 +0000 >>>=20 >>> umb.4: Improve synposis, add netmap >>>=20 >>> Rewrite synopsis in a more consistent style, and add "device = netmap", >>> In FreeBSD 15, netmap is included in = GENERIC/{amd64,arm64,powerpc64}, >>> but it still needs to be used in FreeBSD 14 or custom kernels = which >>> don't include GENERIC. >>>=20 >>> MFC after: umb does not mfc >>> Reviewed by: gbe >>> Differential Revision: https://reviews.freebsd.org/D51732 >>> --- >>> share/man/man4/umb.4 | 28 ++++++++++++++-------------- >>> 1 file changed, 14 insertions(+), 14 deletions(-) >>>=20 >>> diff --git a/share/man/man4/umb.4 b/share/man/man4/umb.4 >>> index 7ecc9a39c1ca..311a50faf8e7 100644 >>> --- a/share/man/man4/umb.4 >>> +++ b/share/man/man4/umb.4 >>> @@ -17,34 +17,34 @@ >>> .\" >>> .\" $NetBSD: umb.4,v 1.4 2019/08/30 09:22:17 wiz Exp $ >>> .\" >>> -.Dd May 11, 2025 >>> +.Dd August 4, 2025 >>> .Dt UMB 4 >>> .Os >>> .Sh NAME >>> .Nm umb >>> .Nd USB Mobile Broadband Interface Model (MBIM) cellular modem = driver >>> .Sh SYNOPSIS >>> -To compile this driver into the kernel, >>> -place the following lines in your >>> -kernel configuration file: >>> -.Bd -ragged -offset indent >>> +.Cd "device netmap" >>> .Cd "device usb" >>> .Cd "device umb" >>> -.Ed >>> .Pp >>> -Alternatively, to load the driver as a >>> -module at boot time, place the following line in >>> +In >>> .Xr loader.conf 5 : >>> -.Bd -literal -offset indent >>> -umb_load=3D"YES" >>> -.Ed >>> -.Pp >>> -If neither of the above is done, the driver will automatically be = loaded >>> -by devd(8) when the device is connected. >>> +.Cd umb_load=3D"YES" >>> .Sh DESCRIPTION >>> The >>> .Nm >>> driver provides support for USB MBIM devices. >>> +If the appropriate hardware is detected, >>> +the driver will be loaded automatically by >>> +.Xr devmatch 8 . >>> +To load the driver manually, >>> +.Cm load >>> +it in >>> +.Xr loader.conf 5 >>> +or at the >>> +.Xr loader 8 >>> +prompt. >>> .Pp >>> MBIM devices establish connections via cellular networks such as >>> GPRS, UMTS, and LTE. --Apple-Mail=_A0529DCA-96D6-4CB5-A525-0800EA98418A Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii

On Aug 21, 2025, at 10:08 PM, Alexander Ziaee <ziaee@FreeBSD.org> = wrote:

On 2025-08-20 23:21 -04:00 EDT, "Zhenlei Huang" <zlei@FreeBSD.org> = wrote:
Hi = Alexander,

I'd presume umb(4) does not = depends on netmap. A quick search of DEV_NETMAP

```
#ifdef DEV_NETMAP
static void =      umb_input(if_t , struct mbuf *);
#endif
...
#ifdef DEV_NETMAP
       if_setinputfn(ifp, = umb_input);
#endif
```

I think the #ifdef can be removed. I currently do not have = that hardware so I'd appreciate if someone can test it.

I didn't get that far myself, this commit was partially in = response to comment 67 [0] on the original bug where a user got the = driver working on FreeBSD 14 by adding `device netmap` to their = kernconf, and it didn't work without that.

Should we send this to khorben?

[0] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D263783#c67<= /a>

I = replied to PR 263783. 


Best,
Alex


Best regards,
Zhenlei

On Aug 21, 2025, at 9:50 AM, Alexander Ziaee <ziaee@FreeBSD.org> = wrote:

The branch main has been updated by = ziaee:

URL: https://cgit.FreeBSD.org/src/commit/?id=3D458ac2b6e4452acc1a614= 352c8945ecc37667aa0

commit = 458ac2b6e4452acc1a614352c8945ecc37667aa0
Author: =     Alexander Ziaee <ziaee@FreeBSD.org>
AuthorDate: 2025-08-20 14:45:08 +0000
Commit: =     Alexander Ziaee <ziaee@FreeBSD.org>
CommitDate: 2025-08-21 01:48:13 +0000

  umb.4: Improve synposis, add netmap

  Rewrite synopsis in a more = consistent style, and add "device netmap",
  In = FreeBSD 15, netmap is included in GENERIC/{amd64,arm64,powerpc64},
  but it still needs to be used in FreeBSD 14 or = custom kernels which
  don't include GENERIC.

  MFC after: =             &n= bsp;umb does not mfc
  Reviewed by: =            gbe
  Differential Revision:  https://reviews.freebsd.org/D51732
---
share/man/man4/umb.4 | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/share/man/man4/umb.4 = b/share/man/man4/umb.4
index 7ecc9a39c1ca..311a50faf8e7 = 100644
--- a/share/man/man4/umb.4
+++ = b/share/man/man4/umb.4
@@ -17,34 +17,34 @@
.\"
.\" $NetBSD: umb.4,v 1.4 2019/08/30 = 09:22:17 wiz Exp $
.\"
-.Dd May 11, 2025
+.Dd August 4, 2025
.Dt UMB 4
.Os
.Sh NAME
.Nm umb
.Nd USB Mobile Broadband Interface Model (MBIM) cellular = modem driver
.Sh SYNOPSIS
-To compile this = driver into the kernel,
-place the following lines in = your
-kernel configuration file:
-.Bd = -ragged -offset indent
+.Cd "device netmap"
.Cd "device usb"
.Cd "device umb"
-.Ed
.Pp
-Alternatively, to load = the driver as a
-module at boot time, place the following = line in
+In
.Xr loader.conf 5 :
-.Bd -literal -offset indent
-umb_load=3D"YES"-.Ed
-.Pp
-If neither of the = above is done, the driver will automatically be loaded
-by = devd(8) when the device is connected.
+.Cd = umb_load=3D"YES"
.Sh DESCRIPTION
The
.Nm
driver provides support for USB MBIM = devices.
+If the appropriate hardware is detected,
+the driver will be loaded automatically by
+.Xr = devmatch 8 .
+To load the driver manually,
+.Cm load
+it in
+.Xr loader.conf = 5
+or at the
+.Xr loader 8
+prompt.
.Pp
MBIM devices = establish connections via cellular networks such as
GPRS, = UMTS, and LTE.



= --Apple-Mail=_A0529DCA-96D6-4CB5-A525-0800EA98418A--