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)
This commit is contained in:
John Baldwin 2024-04-09 15:02:58 -07:00
parent 24687a65dd
commit 9f756367a0
5 changed files with 11 additions and 20 deletions

View file

@ -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

View file

@ -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

View file

@ -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:
#

View file

@ -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

View file

@ -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