From owner-svn-src-all@FreeBSD.ORG Mon Sep 17 19:26:34 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7DBDD1065673; Mon, 17 Sep 2012 19:26:34 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6863A8FC12; Mon, 17 Sep 2012 19:26:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8HJQYAB073567; Mon, 17 Sep 2012 19:26:34 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8HJQYKV073561; Mon, 17 Sep 2012 19:26:34 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201209171926.q8HJQYKV073561@svn.freebsd.org> From: Jim Harris Date: Mon, 17 Sep 2012 19:26:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240618 - in head/sys: amd64/conf conf i386/conf modules X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Sep 2012 19:26:34 -0000 Author: jimharris Date: Mon Sep 17 19:26:33 2012 New Revision: 240618 URL: http://svn.freebsd.org/changeset/base/240618 Log: Integrate nvme(4) and nvd(4) into the amd64 and i386 builds. Sponsored by: Intel Modified: head/sys/amd64/conf/NOTES head/sys/conf/files.amd64 head/sys/conf/files.i386 head/sys/i386/conf/NOTES head/sys/modules/Makefile Modified: head/sys/amd64/conf/NOTES ============================================================================== --- head/sys/amd64/conf/NOTES Mon Sep 17 19:25:24 2012 (r240617) +++ head/sys/amd64/conf/NOTES Mon Sep 17 19:26:33 2012 (r240618) @@ -428,6 +428,11 @@ 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 # Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Mon Sep 17 19:25:24 2012 (r240617) +++ head/sys/conf/files.amd64 Mon Sep 17 19:26:33 2012 (r240618) @@ -212,7 +212,17 @@ dev/kbd/kbd.c optional atkbd | sc | uk 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 Modified: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Mon Sep 17 19:25:24 2012 (r240617) +++ head/sys/conf/files.i386 Mon Sep 17 19:26:33 2012 (r240618) @@ -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 Modified: head/sys/i386/conf/NOTES ============================================================================== --- head/sys/i386/conf/NOTES Mon Sep 17 19:25:24 2012 (r240617) +++ head/sys/i386/conf/NOTES Mon Sep 17 19:26:33 2012 (r240618) @@ -747,6 +747,11 @@ 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 # Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Mon Sep 17 19:25:24 2012 (r240617) +++ head/sys/modules/Makefile Mon Sep 17 19:26:33 2012 (r240618) @@ -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)