From nobody Tue Apr 09 22:03:46 2024 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 4VDg2p68qfz5G66d; Tue, 9 Apr 2024 22:03:46 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VDg2p1B44z58xh; Tue, 9 Apr 2024 22:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712700226; 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=ybaryZZlR83tTjRzBWHJ8hLjHb809KKvKoXg24m9NMc=; b=FbjwSSy/wjMSaz+BSFgS/4ZgN8YdJRXXj+n/TZ4xvOdwb+vm6lHIV6KFFwEo33icSD9Z8W ETYy5vX0DdXLIwnUPijKVXimdwXhzEUocmvrZ8I/XliG1zFgMO4AsOjtEYcqB0aa04x3BG zqJeCzoow9RZXuwYWOWKVp0BUzIUg2D0XNp6hlvYi5APloqCwd4NuAl/bKUfzj+nDZwsPd s9onKDywBGIWcRpcj3k6zSLuQRhFlkOuDBX9RWDcJXaENMC2hXOTVlzz6xhzsCKg75i4Yw Lj+dF2LvMQDMmkrmAzlE43PH817U//y639MeKRi51sdoJ57TNI9cXqcmaPDYLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712700226; a=rsa-sha256; cv=none; b=vl+CHwYDO4kXFq2xAhHxI5RgyDxJEBw5/zx1wX6d1u8IYa4xoB7J6scdxFsCGQ1dQEWVWV 3NuDqdrXkTdIXVeEu1naDK0ZvU25/P1SS62rYSPaTEOmy9yaMEBIr2cvqr0IJK0G+skT3y zX/ZRJ5PrB4/rnLTxqI1L2U9S+GmLPVect0HS5/taiw6TZRaimcPBJLIBn9NuUytolNKsf daUfrL4oF+BsBg4OvwpKTMIxiHXHkR/TFKo/poIwkjhyCLMijO+vNOzw5K1v9SwyIhA3Kx vNOcsPWuRWTcuBuP4FpajJrUW//oKAu/kTkQe5Z1pW87cHoY+M8IvhXCkVkKUg== 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=1712700226; 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=ybaryZZlR83tTjRzBWHJ8hLjHb809KKvKoXg24m9NMc=; b=Rz3ihc0WykclgjSpcP0gLCTq2JrWVezTJ3nbRZ+MBHihqdRpxyIMHmrMqDUglHHKx0i/9l HqRtPOQAw2WYCOHkfRZkzcCiS0v+2SpR3k2ELnJuBQMgi7y74yaNTcXu3gK/heW1aAxyzi 2SQw4R92ySph2abFVxoih8MDyrEYFtKsOI456nfcC0V3/E54d7ST5qY3FkAMjhOQaOhmyC 7ue64yp0iAYRkuzgFZXanJ6okhY1o6KnZHOBHaJsinHdqA+svg4kLsEwRxNxr5SSy3kiW0 nzCppgcL+0TciTHx7PE7MBeBtK3WwoYDP0AENKRBVqYGuC39xjdHtM8nHxS4pQ== 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 4VDg2p0pG7z1BFR; Tue, 9 Apr 2024 22:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 439M3kN4049520; Tue, 9 Apr 2024 22:03:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 439M3kpa049517; Tue, 9 Apr 2024 22:03:46 GMT (envelope-from git) Date: Tue, 9 Apr 2024 22:03:46 GMT Message-Id: <202404092203.439M3kpa049517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a508f5d92a93 - main - NOTES: Tidy entries for SATA controllers 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: Sender: dev-commits-src-main+owner@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a508f5d92a93cda11b0c68084dbb181f97e7f5f7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a508f5d92a93cda11b0c68084dbb181f97e7f5f7 commit a508f5d92a93cda11b0c68084dbb181f97e7f5f7 Author: John Baldwin AuthorDate: 2024-04-09 22:02:58 +0000 Commit: John Baldwin CommitDate: 2024-04-09 22:02:58 +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 --- sys/conf/NOTES | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index b15f2fdd22f5..cf447004cb92 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1685,9 +1685,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 @@ -1697,7 +1698,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