From nobody Tue Apr 09 22:03:48 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 4VDg2r53Hqz5G66f; Tue, 9 Apr 2024 22:03:48 +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 4VDg2r3HTGz596B; Tue, 9 Apr 2024 22:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712700228; 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=kXs1ID3No8t4NB7H5L/vL2fvxmSsaQc4fwjRMdz96nQ=; b=IyaNZy6KEBjz2hVseWKIJMcoq3L7KR8YJJFD2ut4Fae+8OcpP1cLxo+uqAoVFbbdfWdKfT d+fBkv1GU9RtzMEOjY+EypCQAKVKAIit43mLmsfKr2SdTyLQSILwhi0nPzuRETyc9FLG7H Wk0/toJePppISq1IvVa7pJjgVjB7BP1ag4vKesId0XKG9pujld9eDw87tz5uifpDbBX3+U uLvpAVAyALdk4lNwOJ/q+9K/7gyuNzw6C6+zFMT5e15XVpYoLYBvWFgv8tnC4VdqFsLCL9 qD8hYKlkQXM+7eYbuQBM6M3Dpx0cJuCk2ymi1ChUua7ju8bmyTiWBOs7Z7fBPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712700228; a=rsa-sha256; cv=none; b=fwOgzGk3IgMbfrkxeaszJwvbA4G5ImuY7m1q5vuf+j4Bfni86annz+/sKHUoU5QCzTZGZC zwtJutDu8IHugmxjgMRc6NspT83223hiHtjeGLOoVlkti+cODHQ3z+eZGGP6JUK00XfjR1 QP4ob2ia5BDxAM2oiNvMPgoPv5wVlMdejpIkESJK4beKNZaGlhU0yd8XfgM/WJRxHTXBq9 vYmq2STJkCAmInudScyEzSew5nc6TgjO8YYJSTJl7knu1C1JWYKm40Xe82aM1ShByN9WGi dqZC3k6V+BuWc9FdOH5FT3NuZSkkDj5dInUqqKNTyzs7zPhiOB1OS2XOFaW6OQ== 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=1712700228; 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=kXs1ID3No8t4NB7H5L/vL2fvxmSsaQc4fwjRMdz96nQ=; b=VHooL4MB8fWwogyXOGZBOCgl0d/MKPWf6UqVROR/rk4vTUYe9B+mIgs90Kjg5X65P8qboo DrOWr59x3hUaFOaA+TjwwkX92Njph5HyRQRDKBLu9JkRzy6XE/zVRoOi1WJrxJ5emxH8DD KH6hZDlx4oQXnbyyz3spFAu/I/0JxIXLP7fnPHH5d6dGx/ARSKGWQ2eNpefH6ARvAAvZzv 7HdV3bxZMJZnLuVcWC+28IyGIcfKxKm5NsBgYmQzFjcnnX35o6kcKMoegnXD6pxv232Y3Q MhYxsVbiTyInYxIWqvsbU5LW6ln5bAdeDFyerfPnKbXgyEwqnpBn+9/IkhDazg== 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 4VDg2r2tSxz19lS; Tue, 9 Apr 2024 22:03:48 +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 439M3mHX049623; Tue, 9 Apr 2024 22:03:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 439M3mJl049620; Tue, 9 Apr 2024 22:03:48 GMT (envelope-from git) Date: Tue, 9 Apr 2024 22:03:48 GMT Message-Id: <202404092203.439M3mJl049620@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: 8f7105a20697 - main - NOTES: Move NVMe entries to MI file 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: 8f7105a20697d47060dbedc966cf085a64aeced6 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8f7105a20697d47060dbedc966cf085a64aeced6 commit 8f7105a20697d47060dbedc966cf085a64aeced6 Author: John Baldwin AuthorDate: 2024-04-09 22:02:58 +0000 Commit: John Baldwin CommitDate: 2024-04-09 22:02:58 +0000 NOTES: Move NVMe entries to MI file While here, adjust the sample setting for NVME_USE_NVD to use a non-default setting as is typical in entries in NOTES. Discussed with: imp Reviewed by: manu Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44691 --- sys/amd64/conf/NOTES | 5 ----- sys/arm64/conf/NOTES | 5 ----- sys/conf/NOTES | 11 +++++++++++ sys/i386/conf/NOTES | 5 ----- sys/riscv/conf/NOTES | 5 ----- 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 761728337ac2..39ecfb529be5 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -439,11 +439,6 @@ device imcsmb device isci options ISCI_LOGGING # enable debugging in isci HAL -# -# NVM Express (NVMe) support -device nvme # base NVMe driver -device nvd # expose NVMe namespaces as disks, depends on nvme - # # Intel Volume Management Device (VMD) support device vmd diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES index 21b1b22a5f01..91455d6032b9 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -102,11 +102,6 @@ device ice_ddp # Intel 800 Series DDP Package # Etherswitch devices device e6000sw # Marvell mv88e6085 based switches -# NVM Express (NVMe) support -device nvme # base NVMe driver -options NVME_USE_NVD=0 # prefer the cam(4) based nda(4) driver -device nvd # expose NVMe namespaces as disks, depends on nvme - # MMC/SD/SDIO Card slot support device sdhci_xenon # Marvell Xenon SD/MMC controller device aw_mmc # Allwinner SD/MMC controller diff --git a/sys/conf/NOTES b/sys/conf/NOTES index cf447004cb92..e3332ee20120 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1675,6 +1675,17 @@ device mfip # LSI MegaRAID SAS passthrough, requires CAM options MFI_DEBUG device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s +# NVM Express +# +# nvme: PCI-express NVM Express host controllers +# nda: CAM NVMe disk driver +# nvd: non-CAM NVMe disk driver + +device nvme # base NVMe driver +options NVME_USE_NVD=1 # Use nvd(4) instead of the CAM nda(4) driver +device nda # NVMe direct access devices (aka disks) +device nvd # expose NVMe namespaces as disks, depends on nvme + # # Serial ATA host controllers: # diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 45613c10c583..6692a9dba10e 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -634,11 +634,6 @@ device ips device isci options ISCI_LOGGING # enable debugging in isci HAL -# -# NVM Express (NVMe) support -device nvme # base NVMe driver -device nvd # expose NVMe namespaces as disks, depends on nvme - # # Intel Volume Management Device (VMD) support device vmd diff --git a/sys/riscv/conf/NOTES b/sys/riscv/conf/NOTES index f6b27a626dfb..d818fd0581c3 100644 --- a/sys/riscv/conf/NOTES +++ b/sys/riscv/conf/NOTES @@ -40,11 +40,6 @@ device virtio_blk # VirtIO Block device device virtio_mmio # VirtIO MMIO bus device virtio_random # VirtIO Entropy device -# NVM Express (NVMe) support -device nvme # base NVMe driver -options NVME_USE_NVD=0 # prefer the cam(4) based nda(4) driver -device nvd # expose NVMe namespaces as disks, depends on nvme - # MMC/SD/SDIO Card slot support device dwmmc