From nobody Thu Oct 9 21:07:43 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 4cjMsC25Pxz6C7m3; Thu, 09 Oct 2025 21:07:43 +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 4cjMsC1Dv4z3fYx; Thu, 09 Oct 2025 21:07:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760044063; 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=DimsaqOKVFV24FRJqO5dZyivPkAEwEqXnaYD62D92Rg=; b=WG+8zXv+ngdjGo+DOTzpQsVq23tEsPxwokK88Y03STaZtQzQ93Q2WK0FZ2oJmA6GMgt+52 DpeWdkx0LSulcA4hcIp2DZ6QDdkfz9TkKwYljD3BGfTmpgE4ILYXLiPsDUsqGCu5AughAN jLGIga5i+IQUcnuhgMGJLlCBu9l8m6nA5qTMBxLo0o8K58pnlPDmxji1ZFW367I2XX2+MN gjvs+WA3GQd702ohmTbDFNbtEE58s/v5J124HzNrieFFLMfU4nCQpyjdZz4rDKuhN7XFfw 6mHI2f8u2bDJyVnB/GCiwjlsb5mKNU+370RYEG0WLKogznSy5YHq3OWmVOTaJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760044063; 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=DimsaqOKVFV24FRJqO5dZyivPkAEwEqXnaYD62D92Rg=; b=wKU7aAJ2p6E2BfzoO1OwRqoBe9poHCfyg1/rV5xfVY1imzq5cvsYZ/CrROEvt9ldlnP62s KeXzV/8XSadtorhjtX6eRpBQ/cg1yLXJtue4zbBOzq78uFgHiFcO141MDd5MnAulXQS23I 0BxxviRFjAIk6+9v3E3QyXM805ngUWpmdgTY3p7nKoIWY1BWQjsJ79iNv2eHUjbfuDqUsp 1Pd3DA+aJuS35qwsDLtpDRu++fniMeXYtliFAwrSaufgRdinZtho/dB/Dj3p9q5XOefJRd h0y3PSO7jmjCZtLFDZvDTJ4fI6v2l7Cy95+08EXDHleh/ox7AbEdFW8SqutIng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760044063; a=rsa-sha256; cv=none; b=yxW2PMLG1HB5ZeutEVn7b7Uv0PvK8cqTvyljcGzHrjtdhesOhDJuxI+eAji5OqXHc62ajz OeDzYYdXZ0e4gTsC2+kufHo4N5NXmoosJzqSmOFeLcWnVjCMFvz4v7sRB6SxoNrWOCXqwm aUcau9yGr0YFxZnTaNN/bA16vxKhFV4PzdqnXV7SX+o6gNiWvKEq4PG2pjXm5e8w0c/Hn/ ZM8uce16sLI7e4s+AfIeJgqg0I5ui1uUn5j/qYnww6lsiJADf6O3qYjM/1cC/yFaaBGJKT 3xENtbNB8lcQrmLjkS6rl4v3qVNjszMKO3kWXoT0gjyRB14oScX9GPKC1xlubw== 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 4cjMsC0qb0zb2y; Thu, 09 Oct 2025 21:07:43 +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 599L7hgA034859; Thu, 9 Oct 2025 21:07:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599L7hHh034856; Thu, 9 Oct 2025 21:07:43 GMT (envelope-from git) Date: Thu, 9 Oct 2025 21:07:43 GMT Message-Id: <202510092107.599L7hHh034856@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: d8a4843cb76e - main - umass.4: Modernize driver loading instructions 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8a4843cb76ec1b7da8d5defafb7eef9a6cc1c21 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=d8a4843cb76ec1b7da8d5defafb7eef9a6cc1c21 commit d8a4843cb76ec1b7da8d5defafb7eef9a6cc1c21 Author: Alexander Ziaee AuthorDate: 2025-10-09 14:55:14 +0000 Commit: Alexander Ziaee CommitDate: 2025-10-09 21:06:50 +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 --- 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.