From nobody Fri Jul 19 15:40:17 2024 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 4WQYlk1rvYz5RrDF; Fri, 19 Jul 2024 15:40:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WQYlj6Gxnz4sWH; Fri, 19 Jul 2024 15:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721403617; 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=VLpOwmDK9LkWvcnzxqLMMtPwgbvJNAWFV/uqRFqNXy0=; b=drEWp6iiAhz/aiPlZ1aRkO36GMS01bsDR47kFitoMPvMmUJso/2cOWSlO8SvlaSIZ4NSP8 6bfewFp8Ll4m0SL5V3iP+/b/CLiXUYivobHrwX3agvAvLiGoJLOXpfTrbVCCGiQwUtEH+X vAl+P6OXUzzI/EU+Aa0QX26O0SLconE+/2AJ3oT45vhdkZOh1ZY5feXXxQrcATiBmtMkcS dZpOTLnuxwsNucXn/fm6lHEQU2L4Uw04sM5sHeKEQiP3jx18XuebfUzpW597g/uJHlz0B3 U1OhwcDODIOxTFr3Xj4QLvZxsrRPNCOL7qajLOG7QIBUec2Knt7WWqI9op+Gow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721403617; a=rsa-sha256; cv=none; b=DZwN81sM7J1gTuoSBU8lTr+1aDrLFjLlZJdXRs/PvUXP00TY2SufT8IdAGTzfqiPifGL5p YrG5JRrJWLKPISuOjthtukQnx5L4hmW4vqrb47CC3TN5KbGzodWkziRa+LLxE+rFmSrMJS 9qntV2QyCAtZdmmD+8GTTBz3mXiS9HLAjO3CguXXxHV6l4QwtpbsURcYYZppXVv/TBPJna Nnuf6nYUPdxVi+o4DsNiAwRnfpEh9RWCYT1L44VntcBm3vdgT23PVkE4UMB2bfObBHgYYW rh6Bzb3t5FwpKotIgtafVe839Ic3K+QUIwnGV34IEr5Rm8AKXVHXiHvu59qp9w== 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=1721403617; 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=VLpOwmDK9LkWvcnzxqLMMtPwgbvJNAWFV/uqRFqNXy0=; b=CJHpjhf8tnjcwgvvKv1RTO9j8D0101QxqhIeg+dM/9AIHXUI0Oyw2gsxOvfAUCYafxa1WH HXrU19cD2/0wylOrbKvrcSBRDtxYzXckrXNvl0aNwbjJHigb5buaF1x9Y/1uyMU+mAsFlG 0oO1uQGCOfLmclUdn8xNtzNgXZd3vA/tUvxAJaVU8VMf2nPGoXkfplb6QDwCTq0SEx8rc2 YZ1oNR+PPTY0r6uh6odBv5X0DmymsGJlXrXiXIkZyob506DZ/lfuGm/PQ5f5SwTyPxSlHK XpLIlJ8UZFsb3Ns7HWlcsx4PONJjT6cHpmXkyYBozIt32R4W1/Bul8Xa10kS2Q== 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 4WQYlj5sslzdfN; Fri, 19 Jul 2024 15:40:17 +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 46JFeHC7082670; Fri, 19 Jul 2024 15:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46JFeHhI082667; Fri, 19 Jul 2024 15:40:17 GMT (envelope-from git) Date: Fri, 19 Jul 2024 15:40:17 GMT Message-Id: <202407191540.46JFeHhI082667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 15e2ffbbfade - stable/14 - NOTES: Tidy entries for SATA controllers 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 15e2ffbbfade7cf5e37ff4e3259f698436d425d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=15e2ffbbfade7cf5e37ff4e3259f698436d425d4 commit 15e2ffbbfade7cf5e37ff4e3259f698436d425d4 Author: John Baldwin AuthorDate: 2024-04-09 22:02:58 +0000 Commit: John Baldwin CommitDate: 2024-07-18 17:14:22 +0000 NOTES: Tidy entries for SATA controllers - Add typical comments after device entries (copied from amd64 GENERIC) - Add an entry for 'device ada'. Normally this is pulled in via 'device sd', but is documented in ada(4) and can be used to include ATA/SATA disk support in a kernel without SCSI disk support. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44689 (cherry picked from commit a508f5d92a93cda11b0c68084dbb181f97e7f5f7) --- sys/conf/NOTES | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 9d2ab71623ed..3217bdcb9600 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1682,9 +1682,10 @@ device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s # These drivers are part of cam(4) subsystem. They supersede less featured # ata(4) subsystem drivers, supporting same hardware. -device ahci -device mvs -device siis +device ahci # AHCI-compatible SATA controllers +device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA +device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA +device ada # ATA/SATA direct access devices (aka disks) # # The 'ATA' driver supports all legacy ATA/ATAPI controllers, including @@ -1694,7 +1695,7 @@ device siis # the 'atacore' driver then selecting the drivers on a per vendor basis. # For example to build a system which only supports a VIA chipset, # omit 'ata' and include the 'atacore', 'atapci' and 'atavia' drivers. -device ata +device ata # Legacy ATA/SATA controllers # Modular ATA #device atacore # Core ATA functionality