Added NVME configuration parameters

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/Makefile b/Makefile
index ede835017a6a5f480bbafaf20ead011212879ade..0fba0ea2dfb0915ebc4192173d1f9e44488ca8e0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,5 +12,19 @@ obj-$(CONFIG_QEDE)           += drivers/net/ethernet/qlogic/qede/
 obj-$(CONFIG_RDS)               += net/rds/
 obj-$(CONFIG_SUNRPC_XPRT_RDMA)  += net/sunrpc/xprtrdma/
 obj-$(CONFIG_SCSI_SRP_ATTRS)    += drivers/scsi/
-obj-$(CONFIG_NVME_CORE)                += drivers/nvme/
+obj-$(CONFIG_NVME_CORE)         += drivers/nvme/host/
+obj-$(CONFIG_NVME_HOST_WITHOUT_FC)      += drivers/nvme/host/
+obj-$(CONFIG_NVME_HOST_WITHOUT_FC)      += drivers/nvme/target/
+obj-$(CONFIG_BLK_DEV_NVME)      += drivers/nvme/host/
+obj-$(CONFIG_NVME_FABRICS)      += drivers/nvme/host/
+obj-$(CONFIG_NVME_FC)           += drivers/nvme/host/
+obj-$(CONFIG_NVME_RDMA)         += drivers/nvme/host/
+obj-$(CONFIG_NVME_MULTIPATH)    += drivers/nvme/host/
+obj-$(CONFIG_NVME_HOST_DUMMY)   += drivers/nvme/host/
+obj-$(CONFIG_NVME_TARGET)       += drivers/nvme/target/
+obj-$(CONFIG_NVME_TARGET_LOOP)  += drivers/nvme/target/
+obj-$(CONFIG_NVME_TARGET_RDMA)  += drivers/nvme/target/
+obj-$(CONFIG_NVME_TARGET_FC)    += drivers/nvme/target/
+obj-$(CONFIG_NVME_TARGET_FCLOOP)  += drivers/nvme/target/
+obj-$(CONFIG_NVME_TARGET_DUMMY) += drivers/nvme/target/
 obj-$(CONFIG_BNXT)            += drivers/net/ethernet/broadcom/bnxt/

diff --git a/configure b/configure
index de1ee8551b335b62440c81d2023e09d869431e87..bcbf63171ab9471ff6b837c6b227622db8cbf00c 100755 (executable)
--- a/configure
+++ b/configure
@@ -199,14 +199,12 @@ usage()
        --with-qedr-mod    make CONFIG_INFINIBAND_QEDR [no]
        --without-qedr-mod    [yes]
 
-       --with-nvme-mod    make CONFIG_NVME_CORE=m [no]
-       --without-nvme-mod    [yes]
-
-       --with-nvme-host-mod    make CONFIG_NVME_CORE=m [no]
-       --without-nvme-host-mod    [yes]
-
-       --with-nvme-target-mod    make CONFIG_NVME_TARGET_RDMA=m [no]
-       --without-nvme-target-mod    [yes]
+       --with-nvme_host-mod
+       --without-nvme_host-mod
+       --with-nvme_host-without-fc
+       --without-nvme_host-without-fc
+       --with-nvme_target-mod
+       --without-nvme_target-mod
 
        --help - print out options
 
@@ -759,7 +757,68 @@ main()
                        --without-bnxt_en-mod)
                                CONFIG_BNXT=
                                ;;
-
+                       --with-nvme_host-mod)
+                               CONFIG_NVME_CORE="m"
+                               CONFIG_BLK_DEV_NVME="m"
+                               CONFIG_NVME_FABRICS="m"
+                               CONFIG_NVME_FC="m"
+                               CONFIG_NVME_RDMA="m"
+                               CONFIG_NVME_MULTIPATH=
+                               CONFIG_NVME_HOST_WITHOUT_FC=
+                               ;;
+                       --without-nvme_host-mod)
+                               CONFIG_NVME_CORE=
+                               CONFIG_BLK_DEV_NVME=
+                               CONFIG_NVME_FABRICS=
+                               CONFIG_NVME_FC=
+                               CONFIG_NVME_RDMA=
+                               CONFIG_NVME_MULTIPATH=
+                               CONFIG_NVME_HOST_WITHOUT_FC=
+                               ;;
+                       --with-nvme_host-without-fc)
+                               CONFIG_NVME_HOST_WITHOUT_FC="m"
+                               CONFIG_NVME_CORE="m"
+                               CONFIG_BLK_DEV_NVME="m"
+                               CONFIG_NVME_FABRICS="m"
+                               CONFIG_NVME_FC=
+                               CONFIG_NVME_RDMA="m"
+                               CONFIG_NVME_MULTIPATH=
+                               CONFIG_NVME_TARGET=
+                               CONFIG_NVME_TARGET_LOOP=
+                               CONFIG_NVME_TARGET_RDMA=
+                               CONFIG_NVME_TARGET_FC=
+                               CONFIG_NVME_TARGET_FCLOOP=
+                               ;;
+                       --without-nvme_host-without-fc)
+                               CONFIG_NVME_HOST_WITHOUT_FC=
+                               CONFIG_NVME_CORE=
+                               CONFIG_BLK_DEV_NVME=
+                               CONFIG_NVME_FABRICS=
+                               CONFIG_NVME_FC=
+                               CONFIG_NVME_RDMA=
+                               CONFIG_NVME_MULTIPATH=
+                               CONFIG_NVME_TARGET=
+                               CONFIG_NVME_TARGET_LOOP=
+                               CONFIG_NVME_TARGET_RDMA=
+                               CONFIG_NVME_TARGET_FC=
+                               CONFIG_NVME_TARGET_FCLOOP=
+                               ;;
+                       --with-nvme_target-mod)
+                               CONFIG_NVME_TARGET="m"
+                               CONFIG_NVME_TARGET_LOOP="m"
+                               CONFIG_NVME_TARGET_RDMA="m"
+                               CONFIG_NVME_TARGET_FC="m"
+                               CONFIG_NVME_TARGET_FCLOOP="m"
+                               CONFIG_NVME_HOST_WITHOUT_FC=
+                               ;;
+                       --without-nvme_target-mod)
+                               CONFIG_NVME_TARGET=
+                               CONFIG_NVME_TARGET_LOOP=
+                               CONFIG_NVME_TARGET_RDMA=
+                               CONFIG_NVME_TARGET_FC=
+                               CONFIG_NVME_TARGET_FCLOOP=
+                               CONFIG_NVME_HOST_WITHOUT_FC=
+                               ;;
                        --with-nfsrdma-mod)
                                CONFIG_SUNRPC_XPRT_RDMA="m"
                                CONFIG_SUNRPC_XPRT_RDMA_CLIENT="m"
@@ -806,30 +865,6 @@ main()
                                CONFIG_INFINIBAND_QEDR=
                                CONFIG_QED_OOO=
                                ;;
-                       --with-nvme-mod)
-                               CONFIG_NVME_CORE="m"
-                               CONFIG_BLK_DEV_NVME="m"
-                               ;;
-                       --without-nvme-mod)
-                               CONFIG_NVME_CORE=
-                               CONFIG_BLK_DEV_NVME=
-                               ;;
-                       --with-nvme-host-mod)
-                               CONFIG_NVME_RDMA="m"
-                               CONFIG_NVME_FABRICS="m"
-                               ;;
-                       --without-nvme-host-mod)
-                               CONFIG_NVME_RDMA=
-                               CONFIG_NVME_FABRICS=
-                               ;;
-                       --with-nvme-target-mod)
-                               CONFIG_NVME_TARGET="m"
-                               CONFIG_NVME_TARGET_RDMA="m"
-                               ;;
-                       --without-nvme-target-mod)
-                               CONFIG_NVME_TARGET=
-                               CONFIG_NVME_TARGET_RDMA=
-                               ;;
                        --without-firmware-mod)
                                ;;
 

diff --git a/makefile.in b/makefile.in
index b5ae2e2da95d1e2e79e4b25898f7559e1b71846f..5ebc9b1bb52770363e58c68f9a415d9d58eb2818 100644 (file)
--- a/makefile.in
+++ b/makefile.in
@@ -103,8 +103,6 @@ kernel: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF)
                $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) \
                -I$$(srctree)/arch/$$(SRCARCH)/include \
                -Iarch/$$(SRCARCH)/include/generated \
-               -I$(CWD)/drivers/nvme/host \
-               -I$(CWD)/drivers/nvme/target \
                ' \
                modules