From nobody Fri Oct 10 16:31:00 2025 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 4cjsgT02B8z6BY1n; Fri, 10 Oct 2025 16:31:01 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cjsgS2bdrz3Z9P; Fri, 10 Oct 2025 16:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760113860; 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=WBrjmpm7l4dDqTNRU3FzmeKtIQn5RW6o16aqwd4kE8M=; b=Uv/xIQkgYpmUd2htBmb3b8c7DoSwdP2qFjlEkc2+L9r4vsFhrYKAIWxFZBiIPlevh7Souz edpY/qhQkEx9heM8+OCkSUcyVQ5l9+g30ktCJtblxnOC2FWDHG1whdYhLvavHWl9VbgnZy sgUICb7rJucWvofYkcSzDNXnDni2UMHNo8tAX9fJavNNdEb396C3tb0mntevRMvJqoggI8 QI2+EHyAlRW/ZQTpfW88p0Q8VUm2onTot3P5HJQZ0NDYSrM2TxYySPompsevHliMRRZSYS Vlt/zmE6I8UySWj2wi9VEKjqRHQsdq8Rjb1U0qzpXHf5ZO/Oats0QsqmzufQRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760113860; 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=WBrjmpm7l4dDqTNRU3FzmeKtIQn5RW6o16aqwd4kE8M=; b=kXSOM4RzHbZtj98W72ZNybg+epEEmKpIPb7LkP3RBbPyUhiIYGjH5M8LQuf8yvnldGm8sv Yn0HkFZyjSjy9PPcbdWm3BQXD635EM+7EdfcLxfAQUQV8B2MV/AkxAZY9M96+6VcPxzJi5 2J4ZHm/PlM8bCVvTmMrKqq6aEL4QokdQdtz0pfjTR+aE4q7wdGAXQsJAt6yYlPd2T9IU/o nb0AgQ4vOclSmqWk0NtsJDw+h0TDrng1bE/oMGIsIYVnzzuh+Ptlq9QGdCLC7GCxAY9Vha n7qkI9KDiqyyPqlmZp/ZXqcYojpPy9xUJ79XN/rNh5vBrmoxODuNPpFKKku4rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760113860; a=rsa-sha256; cv=none; b=eJBNjiqw++678wu+244ARwAsJq3e0/m1/D0HJ9bqAFhK4UffmPfPwr6pl3sN8gPZi/m6G6 bAuFdcQ/OiwHetdd4+hx19L8AMLBncTn6Bni5wmnZkKYt1i55lhc1g/UGNOC7tF+oJXnB/ zLy7bwIVXQ9Jpzd4l22XkIvB5zVRr47TU6fp19l2azv0X9/blHYSd1GPH87B5HsaLhEkri dH1pM9EEy3U28+LLo4moASDAn2EsnQ3TWPh37S62+L6vT7yrhnPkbrWe742ej3XKxOc6K1 b/eRBzoBvvBv35r4i7OkVmqv2WWj29Cwu8jrfR8mnbwRExMBR6YxPYN+9PgFRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cjsgS2894z19Mq; Fri, 10 Oct 2025 16:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59AGV0HX025827; Fri, 10 Oct 2025 16:31:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59AGV0wx025824; Fri, 10 Oct 2025 16:31:00 GMT (envelope-from git) Date: Fri, 10 Oct 2025 16:31:00 GMT Message-Id: <202510101631.59AGV0wx025824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 7c837513a4fe - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 7c837513a4fe2b012c83de08cecf72f2b460c184 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=7c837513a4fe2b012c83de08cecf72f2b460c184 commit 7c837513a4fe2b012c83de08cecf72f2b460c184 Author: Alexander Ziaee AuthorDate: 2025-10-09 14:55:14 +0000 Commit: Alexander Ziaee CommitDate: 2025-10-10 16:15:06 +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.