From eb85d44f0647df0e3d2d40b7680242e637f216ed Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Mon, 17 Sep 2012 19:26:33 +0000 Subject: [PATCH] Integrate nvme(4) and nvd(4) into the amd64 and i386 builds. Sponsored by: Intel --- sys/amd64/conf/NOTES | 5 +++++ sys/conf/files.amd64 | 10 ++++++++++ sys/conf/files.i386 | 10 ++++++++++ sys/i386/conf/NOTES | 5 +++++ sys/modules/Makefile | 6 ++++++ 5 files changed, 36 insertions(+) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index a453cb992166..6562981abd19 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -427,6 +427,11 @@ 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 + # # SafeNet crypto driver: can be moved to the MI NOTES as soon as # it's tested on a big-endian machine diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 61803411c43a..66f7df646797 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -212,7 +212,17 @@ dev/kbd/kbd.c optional atkbd | sc | ukbd dev/lindev/full.c optional lindev dev/lindev/lindev.c optional lindev dev/nfe/if_nfe.c optional nfe pci +dev/nvd/nvd.c optional nvd nvme dev/nve/if_nve.c optional nve pci +dev/nvme/nvme.c optional nvme +dev/nvme/nvme_ctrlr.c optional nvme +dev/nvme/nvme_ctrlr_cmd.c optional nvme +dev/nvme/nvme_ns.c optional nvme +dev/nvme/nvme_ns_cmd.c optional nvme +dev/nvme/nvme_qpair.c optional nvme +dev/nvme/nvme_sysctl.c optional nvme +dev/nvme/nvme_test.c optional nvme +dev/nvme/nvme_uio.c optional nvme dev/nvram/nvram.c optional nvram isa dev/random/ivy.c optional random rdrand_rng dev/random/nehemiah.c optional random padlock_rng diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 24d02a32a01b..aaddfde605b9 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -224,7 +224,17 @@ dev/lindev/lindev.c optional lindev dev/mse/mse.c optional mse dev/mse/mse_isa.c optional mse isa dev/nfe/if_nfe.c optional nfe pci +dev/nvd/nvd.c optional nvd nvme dev/nve/if_nve.c optional nve pci +dev/nvme/nvme.c optional nvme +dev/nvme/nvme_ctrlr.c optional nvme +dev/nvme/nvme_ctrlr_cmd.c optional nvme +dev/nvme/nvme_ns.c optional nvme +dev/nvme/nvme_ns_cmd.c optional nvme +dev/nvme/nvme_qpair.c optional nvme +dev/nvme/nvme_sysctl.c optional nvme +dev/nvme/nvme_test.c optional nvme +dev/nvme/nvme_uio.c optional nvme dev/nvram/nvram.c optional nvram isa dev/pcf/pcf_isa.c optional pcf dev/random/ivy.c optional random rdrand_rng diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 1ad040e7e1b7..186859559156 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -746,6 +746,11 @@ 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 + # # SafeNet crypto driver: can be moved to the MI NOTES as soon as # it's tested on a big-endian machine diff --git a/sys/modules/Makefile b/sys/modules/Makefile index cbb7ac173f01..1904f2209fa9 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -244,7 +244,9 @@ SUBDIR= \ ntfs \ ntfs_iconv \ nullfs \ + ${_nvd} \ ${_nve} \ + ${_nvme} \ ${_nvram} \ ${_nwfs} \ ${_nxge} \ @@ -586,9 +588,11 @@ _ixgb= ixgb _ixgbe= ixgbe _mly= mly _nfe= nfe +_nvd= nvd .if ${MK_SOURCELESS_HOST} != "no" _nve= nve .endif +_nvme= nvme _nvram= nvram _nxge= nxge _tpm= tpm @@ -695,9 +699,11 @@ _mthca= mthca .endif _ndis= ndis _nfe= nfe +_nvd= nvd .if ${MK_SOURCELESS_HOST} != "no" _nve= nve .endif +_nvme= nvme _nvram= nvram _nxge= nxge .if ${MK_CDDL} != "no" || defined(ALL_MODULES)