From nobody Fri Jul 19 15:40:20 2024 X-Original-To: dev-commits-src-branches@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 4WQYlm2DZ6z5Rr5H; Fri, 19 Jul 2024 15:40:20 +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 4WQYlm0xgPz4scX; Fri, 19 Jul 2024 15:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721403620; 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=f1iINIzDdIlb78Xy8iMPY93DdBFg8va73/n6Ui21CtA=; b=ORssLxl/3T/ltB53c8XxAcf1FnwQDVmHOfXpcg9oOG0FNKr07DTFseLo5sK41879NXvpGM 4oNeADvQq3aphMVAw8bTpZeanOxYy9PIQ3VLPGXsDu32mhSeimVl9V1r8KPUHLOJDpp2io DYh/hACRnqTrjFFxQNWd+CUaM920IsAv1Rp4NNIAK84GvOVgPoAQ9yOTulnzj1BklTRXJn fNt3a/wE5J82CW63+W9qWwnFxwwdKzjoZxbe/XdBm1Unx0a2j/YRsu2//Lr8xNWoAe18I2 InoCb0PwVbVI7wTBjPCemdsn+o6xwi2rb9corn4TMyMfpPZt6eKCaatwM4FWVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721403620; a=rsa-sha256; cv=none; b=vUHJCNa5UJ99BR3hRciTaNTlFEbwuSmRY6maZgzFmoBOb1xDG77aYuXXNY+zHLf7CBjZ7J v17nt97b8Nju9Cg0emW5RpNcnGRyKeZFA0SwNp1p3Oo7O+bgLGDJnzChfSOjHmMGGEYn6T dQDGApG6u/KmIvDXvzx8VUQN/1vnIuPPfGTC6y3M0tHVbVtaJ/x0pzsXiIAQBPDHqL+pzr UxH2zZ+wBiedvqdyKMdyeAg9LE/HiP0CrrIhxmYA5DtuYwV2QapYbApDMT4kJI98tYpJSO YPPx5tVojjZQ0/t41Fy1d5VxH6oEQBq+kD/ilat9WTZXyhmZtjJLdeoPagnvFQ== 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=1721403620; 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=f1iINIzDdIlb78Xy8iMPY93DdBFg8va73/n6Ui21CtA=; b=BvdVrceI01e9WhduKBxJSK/aT6OiHjnEzUfkZQt56lLY6Y1KIX4eOTKbx9UqlEUFS21gTW hQvloWn/MEM4EfzwRmmM0A9HRs3a3mkzfXCfLJQgTtGtx5Xmji7AKK0OHbq4573/Qi7k6f bfYNtOGhkHxqpzZR+0M3NIHBhSDUA+RLFxyldylPOTxVweeO8unCD5iKhWU9F31oh8opGg o5+omw8Ic1cEyeCT+pOvOix5895yXgu2Q6aIGtigNqLUewMPUgFzb9WhiWoTVvZXXxkCTP 18IDoHfe4rEIrl9D8/ZbBPJpvi+ybiHnWQkvwOEKGum8U4mhiPPwiL2iwBG0XQ== 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 4WQYlm0TGnzdKh; Fri, 19 Jul 2024 15:40:20 +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 46JFeK3p082772; Fri, 19 Jul 2024 15:40:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46JFeKgB082769; Fri, 19 Jul 2024 15:40:20 GMT (envelope-from git) Date: Fri, 19 Jul 2024 15:40:20 GMT Message-Id: <202407191540.46JFeKgB082769@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: 9f756367a07a - stable/14 - NOTES: Move NVMe entries to MI file List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 9f756367a07a0e29f671e36be87a12f64799dc7b Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9f756367a07a0e29f671e36be87a12f64799dc7b commit 9f756367a07a0e29f671e36be87a12f64799dc7b Author: John Baldwin AuthorDate: 2024-04-09 22:02:58 +0000 Commit: John Baldwin CommitDate: 2024-07-18 17:20:12 +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 (cherry picked from commit 8f7105a20697d47060dbedc966cf085a64aeced6) --- 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 031b5f9567b5..c2d718e9f307 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -101,11 +101,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 3217bdcb9600..96e850bd1dbe 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1672,6 +1672,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 52720f6d83d1..bcf45aa78e9c 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 - # NOTE: dtrace introduces CDDL-licensed components into the kernel device dtrace # dtrace core device dtraceall # include all dtrace modules