From nobody Fri Feb 6 00:28:14 2026 X-Original-To: dev-commits-src-all@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 4f6Zgf4fz7z6RRt6 for ; Fri, 06 Feb 2026 00:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6Zgf1ZdGz3w1M for ; Fri, 06 Feb 2026 00:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770337694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GVjYh0NutOMcMZzoTC1pSRaadA7qet5/VQ2Unx0obvM=; b=xtYPvtwhHg8SmnAsWeEMW+HiF068ZzWkbb1SQONds+N8JipDrxOoPGuHcG7XbueIouXf/D DW+QXgHv6g1wa6bIGu9lS1RE7+/uvzcDJTu4fYFBBNTJJMgN6CXfPZVhloSef4kBmagcsA CgaPbnsvNN6lgGFxcwQCWL0z9Q/OG6YXT3fnxAgMAZIwUiUQm7EjZp3lvJtEB8WF46nNtU XXwGz6jWDKlg8O0MOMY7RWryWmsaoH/vzMy9dVneHEAj/H14vvJkBNGp+oATzUx8SnYVs4 nP7orz0iMoStbLVZLn5VFsG6daEar3kCz9igF5ozRx/MTErgPWTr+5qwht4FVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770337694; a=rsa-sha256; cv=none; b=fWTEsEGQS6i56aFkdd/7nyKerbd6+ntAtR/yuc1J6MLx/P+PixcXZsmsW7ERRe859/NYML JiFZje9k18qwGMWARTJL4oq1eCSTYxmpZMjMr8NvgFUscitFnwphUv4T3kZ8qCi3AAyeZQ 0ctLYn0upGIwN7RoXPmPMT0Z3zqOvV5UKBYt8QKPW7eSvtMO/uOVasYXufvKACguYWgfGp 7+zXifAC2hv76NVRLWWz+vHrl3TzTajvWL+8nRU2kYUffoDAH4V5MyLSkNz/B+6XCJcqZ8 IYzYEZF2DTDOrAApeWegWqvSIBiaI6J75+E0W22PHGF8Cs29dz3I3BPDffGVkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770337694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GVjYh0NutOMcMZzoTC1pSRaadA7qet5/VQ2Unx0obvM=; b=RbhFMCnuN8KBtSlz2yIJEx7/LN6ycTLiCcHPUROtwzFcvjkJWWvPmD+NXPiaFSJp+t+EKQ 0ouKVwoJClR7ZHyzldEzPMH97ebskU+t2ddJKBCvP5ZLOBrz27DkH7DYttCBfBDTXigrP8 /Nua6cKHWqmGFW1QFkn4RIYgosLOqu/v2Hbqa0budRAO99BJeHFqBvusEex+9DIi5FiR7T 7OaBwSJuZqnstK6fnowde6G7fUXjGogy4jtAZBCdDluwKnYRIbmC6jdgzyb+FCq9j+AGZE 2H3t4dETYdKe4uZaZhZfNAQbY1bn+6l+5B8q1cOx4I2quISWRNA7SK0RZp4LuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Zgf13Ytzsd7 for ; Fri, 06 Feb 2026 00:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31872 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 00:28:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 3cdb401480a1 - stable/14 - umass.4: Modernize driver loading instructions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3cdb401480a17618ac4bac5dd2281006efaf614e Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 00:28:14 +0000 Message-Id: <6985359e.31872.53937c69@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=3cdb401480a17618ac4bac5dd2281006efaf614e commit 3cdb401480a17618ac4bac5dd2281006efaf614e Author: Alexander Ziaee AuthorDate: 2025-10-09 14:55:14 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-06 00:22:10 +0000 umass.4: Modernize driver loading instructions + consolidate kernel configuration in SYNOPSIS + explain driver autoloading in DESCRIPTION + s/port/interface/ because of internal USBs + fix flow of remaining example MFC after: 1 day (cherry picked from commit d8a4843cb76ec1b7da8d5defafb7eef9a6cc1c21) --- share/man/man4/umass.4 | 56 +++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4 index db4e6f0890f2..8c6b03a3afea 100644 --- a/share/man/man4/umass.4 +++ b/share/man/man4/umass.4 @@ -25,44 +25,44 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 2, 2025 +.Dd October 9, 2025 .Dt UMASS 4 .Os .Sh NAME .Nm umass .Nd USB Mass Storage Devices driver .Sh SYNOPSIS -To compile this driver into the kernel, -place the following line in your -kernel configuration file: -.Bd -ragged -offset indent +.Cd "device da" .Cd "device scbus" +.Cd "device pass" .Cd "device usb" .Cd "device umass" -.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 -umass_load="YES" -.Ed +.Cd umass_load .Sh DESCRIPTION The .Nm driver provides support for Mass Storage devices that attach to the USB -port. +interface. .Pp -To use the -.Nm -driver, +If the appropriate hardware is detected, +the driver will be loaded automatically by +.Xr devmatch 8 . +To load the driver manually at boot time, use the +.Cm umass_load +command at the +.Xr loader 8 +prompt, or add it to +.Xr loader.conf 5 . +.Pp +To use the driver in a custom kernel, .Xr usb 4 -and one of -.Xr uhci 4 -or -.Xr ohci 4 -or -.Xr ehci 4 +and at least one of +.Xr uhci 4 , +.Xr ohci 4 , +.Xr ehci 4 , or .Xr xhci 4 must be configured in the kernel. @@ -88,16 +88,8 @@ USB hard disk drives USB floppy drives .El .Sh EXAMPLES -.Bd -literal -offset indent -device umass -device scbus -device da -device pass -.Ed -.Pp -Add the -.Nm -driver to the kernel. +Rescan all slots on a multi-slot flash reader, +where the slots map to separate LUNs on a single SCSI ID: .Bd -literal -offset indent camcontrol rescan 0:0:0 camcontrol rescan 0:0:1 @@ -105,8 +97,6 @@ camcontrol rescan 0:0:2 camcontrol rescan 0:0:3 .Ed .Pp -Rescan all slots on a multi-slot flash reader, where the slots map to separate -LUNs on a single SCSI ID. Typically only the first slot will be enabled at boot time. This assumes that the flash reader is the first SCSI bus in the system and has 4 slots.