From nobody Fri Oct 10 13:37:52 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 4cjnqv31vzz6C37l; Fri, 10 Oct 2025 13:38:03 +0000 (UTC) (envelope-from cyric@mm.st) Received: from fout-a2-smtp.messagingengine.com (fout-a2-smtp.messagingengine.com [103.168.172.145]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4cjnqt62Tqz3JN2; Fri, 10 Oct 2025 13:38:02 +0000 (UTC) (envelope-from cyric@mm.st) Authentication-Results: mx1.freebsd.org; none Received: from phl-compute-04.internal (phl-compute-04.internal [10.202.2.44]) by mailfout.phl.internal (Postfix) with ESMTP id 7A935EC011D; Fri, 10 Oct 2025 09:37:59 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Fri, 10 Oct 2025 09:37:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mm.st; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1760103479; x=1760189879; bh=aMbuDtpBtswcSK8EO4NtQfjtiqNQSvHjJslWRViKm5k=; b= TgmUecqMtP7voAhMRRgix9Qkb+3A0O7tH7fHyH6kJlBVNkAYeh2b5/TVCKS+FdaC Vj/7p5yFdEYpqSnE52kTN/+kbUpCPU21em9BW97549RZqwr18u/hEAR4E62Auats WOuyCuFp0bKUTzpNkwTw7WaHY4yjyjjYSyYIaWZ+Q2HiIkPLcqImHvVQR7c23g4H QW7dIjDGGFyKjLTFP7phc+NVVsR4dqzu+HveAZpQ4BUIEbBEZV02oWQWN+BTeRTU cItG3Wu1QapsFIjLMMyqmsDXAZA4390mSynSVHtwPyPvq+V+Toka/gYR2ezBBYsb qqfvTmlBk/V3XndHL5+l3Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1760103479; x=1760189879; bh=a MbuDtpBtswcSK8EO4NtQfjtiqNQSvHjJslWRViKm5k=; b=hCxisM2ap8QS8xWym qORumWGDTXeIzgK1zXKjXP7CpM+VrTHdwpleCEsk4A2qt3igKA8pQbBmWqQh/6as pK6Q1v5FM86qnSSO3fNrOfv7EPWyppiYl4ds3tXkTsGLF1GGEqDqWIZKcbCEdWyM QybMRX4uXCVQXXN8ASSShnIdYvuw8mC1OYoHvbhoAeznbyRkS84C1NaE33ApZYz6 +WHA51ZZTIuGccyRcHk8m0S25J5iK8MMK+LgRIb39lXick/WuMyN/AuIA5xh6Tgs WtFzzl6/NrJczjlFDA3V68UHQJHky8rRrXBH1N7v8END3NGTJ0f3GUzXElB9BhYD g8lUA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddutdelvddtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhepkfffgggfuffvfhfhjggtgfesthejredttddvjeenucfhrhhomheptgihrhhitges mhhmrdhsthenucggtffrrghtthgvrhhnpeevveelgffgudffgefghfefteffleduhfekgf evledtheefleeftefghefggfeggeenucffohhmrghinhepfhhrvggvsghsugdrohhrghen ucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegthihrih gtsehmmhdrshhtpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgt phhtthhopeiiihgrvggvsehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepshhrtgdqtg homhhmihhtthgvrhhssehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepuggvvhdqtgho mhhmihhtshdqshhrtgdqrghllhesfhhrvggvsghsugdrohhrghdprhgtphhtthhopeguvg hvqdgtohhmmhhithhsqdhsrhgtqdhmrghinhesfhhrvggvsghsugdrohhrgh X-ME-Proxy: Feedback-ID: icc3648d4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Oct 2025 09:37:57 -0400 (EDT) Message-ID: <4facb6f8-7f4b-4bc2-a303-efdfa8be2724@mm.st> Date: Fri, 10 Oct 2025 20:37:52 +0700 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 User-Agent: Mozilla Thunderbird Subject: Re: git: d8a4843cb76e - main - umass.4: Modernize driver loading instructions To: Alexander Ziaee , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202510092107.599L7hHh034856@gitrepo.freebsd.org> Content-Language: en-US From: cyric@mm.st In-Reply-To: <202510092107.599L7hHh034856@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:151847, ipnet:103.168.172.0/24, country:AU] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cjnqt62Tqz3JN2 Alexander Ziaee wrote: > 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 This now renders as the following - expected? In loader.conf(5): umass_load I checked your previous similar changes and it seems to be inconsistent, some include ="YES" (e.g. 52eb7e394a7) and some do not. Also I don't think .Cd is applicable here, shouldn't it rather be .Va (seems more appropriate) or even literal text? > .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. >