ofed_scripts: Added new CONFIG_* options and cleaned up

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

diff --git a/compat-rdma.spec b/compat-rdma.spec
index 87ff9ee9f98a4d66438db03a1d4d4aab78054676..c65b194aaa786a8c1978edd3a46effff54058832 100755 (executable)
--- a/compat-rdma.spec
+++ b/compat-rdma.spec
@@ -41,7 +41,6 @@
 %define build_ipath %(if ( echo %{configure_options} | grep "with-ipath_inf-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define build_ehca %(if ( echo %{configure_options} | grep "with-ehca-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define build_ipoib %(if ( echo %{configure_options} | grep "with-ipoib-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
-%define build_sdp %(if ( echo %{configure_options} | grep "with-sdp-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define build_srp %(if ( echo %{configure_options} | grep "with-srp-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define build_srpt %(if ( echo %{configure_options} | grep "with-srp-target-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define build_iser %(if ( echo %{configure_options} | grep "with-iser-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)

diff --git a/configure b/configure
index c2528195b5007b2aa467ca1f4c2d9c1ea0b06157..0cb8884c54c85cbbf781e90614bf84194638c5fa 100755 (executable)
--- a/configure
+++ b/configure
@@ -61,15 +61,6 @@ Usage:  `basename $0` [options]
     --with-ipoib_debug_data-mod    make CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y [no]
     --without-ipoib_debug_data-mod    [yes]
 
-    --with-sdp-mod    make CONFIG_INFINIBAND_SDP=m [no]
-    --without-sdp-mod    [yes]
-
-    --with-sdp_debug-mod    make CONFIG_INFINIBAND_SDP_DEBUG=y [yes]
-    --without-sdp_debug-mod   [no]
-
-    --with-sdp_debug_data-mod    make CONFIG_INFINIBAND_SDP_DEBUG_DATA=y [no]
-    --without-sdp_debug_data-mod    [yes]
-
     --with-srp-mod    make CONFIG_INFINIBAND_SRP=m [no]
     --without-srp-mod    [yes]
 
@@ -195,9 +186,6 @@ Usage:  `basename $0` [options]
 
 EOF
 
-#   Currently not supported options
-#    --with-sdp-zcopy  make CONFIG_INFINIBAND_SDP_SEND_ZCOPY=y CONFIG_INFINIBAND_SDP_RECV_ZCOPY=y [no]
-#    --without-sdp-zcopy [yes]
 }
 
 # Execute command w/ echo and exit if it fail
@@ -403,34 +391,6 @@ main()
                         --without-ipoib_debug_data-mod)
                             CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=
                         ;;
-                        --with-sdp-mod)
-                            CONFIG_INFINIBAND_SDP="m"
-                            CONFIG_INFINIBAND_SDP_DEBUG="y"
-                            add_conf "# Load SDP module" "SDP_LOAD=yes"
-                        ;;
-                        --without-sdp-mod)
-                            CONFIG_INFINIBAND_SDP=
-                        ;;
-                        --with-sdp-zcopy)
-                            CONFIG_INFINIBAND_SDP_SEND_ZCOPY="y"
-                            CONFIG_INFINIBAND_SDP_RECV_ZCOPY="y"
-                        ;;
-                        --without-sdp-zcopy)
-                            CONFIG_INFINIBAND_SDP_SEND_ZCOPY=
-                            CONFIG_INFINIBAND_SDP_RECV_ZCOPY=
-                        ;;
-                        --with-sdp_debug-mod)
-                            CONFIG_INFINIBAND_SDP_DEBUG="y"
-                        ;;
-                        --without-sdp_debug-mod)
-                            CONFIG_INFINIBAND_SDP_DEBUG=
-                        ;;
-                        --with-sdp_debug_data-mod)
-                            CONFIG_INFINIBAND_SDP_DEBUG_DATA="y"
-                        ;;
-                        --without-sdp_debug_data-mod)
-                            CONFIG_INFINIBAND_SDP_DEBUG_DATA=
-                        ;;
                         --with-srp-mod)
                             CONFIG_INFINIBAND_SRP="m"
                             CONFIG_SCSI_SRP_ATTRS="m"
@@ -449,6 +409,7 @@ main()
                         ;;
                         --with-user_mad-mod)
                             CONFIG_INFINIBAND_USER_MAD="m"
+                            add_conf "# Load UMAD module" "UMAD_LOAD=yes"
                         ;;
                         --without-user_mad-mod)
                             CONFIG_INFINIBAND_USER_MAD=
@@ -456,13 +417,23 @@ main()
                         --with-user_access-mod)
                             CONFIG_INFINIBAND_USER_ACCESS="m"
                             CONFIG_INFINIBAND_USER_MEM=y
+                            add_conf "# Load UVERBS module" "UVERBS_LOAD=yes"
+                            add_conf "# Load UCM module" "UCM_LOAD=yes"
                         ;;
                         --without-user_access-mod)
                             CONFIG_INFINIBAND_USER_ACCESS=
                             CONFIG_INFINIBAND_USER_MEM=
                         ;;
+                        --with-user_memory-mod)
+                            CONFIG_INFINIBAND_USER_MEM=y
+                        ;;
+                        --without-user_memory-mod)
+                            CONFIG_INFINIBAND_USER_MEM=
+                        ;;
                         --with-addr_trans-mod)
                             CONFIG_INFINIBAND_ADDR_TRANS=y
+                            add_conf "# Load RDMA_CM module" "RDMA_CM_LOAD=yes"
+                            add_conf "# Load RDMA_UCM module" "RDMA_UCM_LOAD=yes"
                         ;;
                         --without-addr_trans-mod)
                             CONFIG_INFINIBAND_ADDR_TRANS=
@@ -470,7 +441,7 @@ main()
                         --with-mthca-mod)
                             CONFIG_INFINIBAND_MTHCA="m"
                             CONFIG_INFINIBAND_MTHCA_DEBUG="y"
-                            add_conf "# Load MTHCA" "MTHCA_LOAD=yes"
+                            add_conf "# Load MTHCA" "MTHCA_LOAD=no"
                         ;;
                         --without-mthca-mod)
                             CONFIG_INFINIBAND_MTHCA=
@@ -489,6 +460,8 @@ main()
                         ;;
                         --with-mlx5-mod)
                             CONFIG_MLX5_CORE="m"
+                            CONFIG_MLX5_CORE_EN="y"
+                            CONFIG_MLX5_CORE_EN_DCB="y"
                             CONFIG_MLX5_INFINIBAND="m"
                             CONFIG_BACKPORT_LRO="m"
                             CONFIG_MLX5_DEBUG="y"
@@ -502,9 +475,13 @@ main()
                         ;;
                         --with-mlx5_core-mod)
                             CONFIG_MLX5_CORE="m"
+                            CONFIG_MLX5_CORE_EN="y"
+                            CONFIG_MLX5_CORE_EN_DCB="y"
                         ;;
                         --without-mlx5_core-mod)
                             CONFIG_MLX5_CORE=
+                            CONFIG_MLX5_CORE_EN=
+                            CONFIG_MLX5_CORE_EN_DCB=
                         ;;
                         --without-mlx4-mod)
                             CONFIG_MLX4_CORE=
@@ -513,6 +490,8 @@ main()
                         ;;
                         --without-mlx5-mod)
                             CONFIG_MLX5_CORE=
+                            CONFIG_MLX5_CORE_EN=
+                            CONFIG_MLX5_CORE_EN_DCB=
                             CONFIG_MLX5_INFINIBAND=
                             CONFIG_MLX5_DEBUG=
                         ;;
@@ -533,10 +512,14 @@ main()
                         ;;
                         --with-mlx5_inf-mod)
                             CONFIG_MLX5_CORE="m"
+                            CONFIG_MLX5_CORE_EN="y"
+                            CONFIG_MLX5_CORE_EN_DCB="y"
                             CONFIG_MLX5_INFINIBAND="m"
                         ;;
                         --without-mlx5_inf-mod)
                             CONFIG_MLX5_INFINIBAND=
+                            CONFIG_MLX5_CORE_EN=
+                            CONFIG_MLX5_CORE_EN_DCB=
                         ;;
                         --with-mlx4_debug-mod)
                             CONFIG_MLX4_DEBUG="y"
@@ -594,6 +577,9 @@ main()
                             CONFIG_SCSI_ISCSI_ATTRS=
                             CONFIG_ISCSI_TCP=
                         ;;
+                        --without-isert-mod)
+                            CONFIG_INFINIBAND_ISERT=
+                        ;;
                         --with-ehca-mod)
                             CONFIG_INFINIBAND_EHCA="m"
                             CONFIG_INFINIBAND_EHCA_SCALING="y"
@@ -784,7 +770,6 @@ CONFIG_DEBUG_INFO=${CONFIG_DEBUG_INFO:-'y'}
 CONFIG_INFINIBAND=${CONFIG_INFINIBAND:-''}
 CONFIG_INFINIBAND_IPOIB=${CONFIG_INFINIBAND_IPOIB:-''}
 CONFIG_INFINIBAND_IPOIB_CM=${CONFIG_INFINIBAND_IPOIB_CM:-''}
-CONFIG_INFINIBAND_SDP=${CONFIG_INFINIBAND_SDP:-''}
 CONFIG_INFINIBAND_SRP=${CONFIG_INFINIBAND_SRP:-''}
 CONFIG_SCSI_SRP_ATTRS=${CONFIG_SCSI_SRP_ATTRS:-''}
 CONFIG_INFINIBAND_SRPT=${CONFIG_INFINIBAND_SRPT:-''}
@@ -792,11 +777,14 @@ CONFIG_INFINIBAND_SRPT=${CONFIG_INFINIBAND_SRPT:-''}
 CONFIG_INFINIBAND_USER_MAD=${CONFIG_INFINIBAND_USER_MAD:-''}
 CONFIG_INFINIBAND_USER_ACCESS=${CONFIG_INFINIBAND_USER_ACCESS:-''}
 CONFIG_INFINIBAND_ADDR_TRANS=${CONFIG_INFINIBAND_ADDR_TRANS:-''}
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=''
 CONFIG_INFINIBAND_USER_MEM=${CONFIG_INFINIBAND_USER_MEM:-''}
 CONFIG_INFINIBAND_MTHCA=${CONFIG_INFINIBAND_MTHCA:-''}
 
 CONFIG_MLX4_CORE=${CONFIG_MLX4_CORE:-''}
 CONFIG_MLX5_CORE=${CONFIG_MLX5_CORE:-''}
+CONFIG_MLX5_CORE_EN=${CONFIG_MLX5_CORE_EN:-''}
+CONFIG_MLX5_CORE_EN_DCB=${CONFIG_MLX5_CORE_EN_DCB:-''}
 CONFIG_MLX4_EN=${CONFIG_MLX4_EN:-''}
 CONFIG_MLX4_VNIC=${CONFIG_MLX4_VNIC:-''}
 CONFIG_MLX4_INFINIBAND=${CONFIG_MLX4_INFINIBAND:-''}
@@ -838,10 +826,6 @@ CONFIG_SUNRPC_XPRT_RDMA_CLIENT=${CONFIG_SUNRPC_XPRT_RDMA_CLIENT:-''}
 CONFIG_SUNRPC_XPRT_RDMA_SERVER=${CONFIG_SUNRPC_XPRT_RDMA_SERVER:-''}
 CONFIG_SCSI_SRP_ATTRS=${CONFIG_SCSI_SRP_ATTRS:-''}
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=${CONFIG_INFINIBAND_IPOIB_DEBUG_DATA:-''}
-CONFIG_INFINIBAND_SDP_SEND_ZCOPY=${CONFIG_INFINIBAND_SDP_SEND_ZCOPY:-''}
-CONFIG_INFINIBAND_SDP_RECV_ZCOPY=${CONFIG_INFINIBAND_SDP_RECV_ZCOPY:-''}
-CONFIG_INFINIBAND_SDP_DEBUG=${CONFIG_INFINIBAND_SDP_DEBUG:-''}
-CONFIG_INFINIBAND_SDP_DEBUG_DATA=${CONFIG_INFINIBAND_SDP_DEBUG_DATA:-''}
 CONFIG_INFINIBAND_IPATH=${CONFIG_INFINIBAND_IPATH:-''}
 CONFIG_INFINIBAND_QIB=${CONFIG_INFINIBAND_QIB:-''}
 CONFIG_INFINIBAND_RDMAVT=${CONFIG_INFINIBAND_RDMAVT:-''}
@@ -876,6 +860,14 @@ fi
                touch .xeon_phi_applied
        fi
 
+# Configfs requires CONFIGFS_FS to be enabled in the kernel
+if [ "X${CONFIG_INFINIBAND_ADDR_TRANS}" == "Xy" ]; then
+    check_autofconf CONFIGFS_FS
+    if [ X${CONFIGFS_FS} == "X1" ]; then
+        CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+    fi
+fi
+
        if [[ ! -e .pvrdma_applied && "X$CONFIG_INFINIBAND_PVRDMA" == "Xm" ]]; then
                echo ".pvrdma_applied does not exist. running ofed-patch.sh for pvrdma"
                ex ${CWD}/ofed_scripts/ofed_patch.sh --without-git --without-quilt --with-patchdir=tech-preview/pvrdma
@@ -905,7 +897,6 @@ CONFIG_DEBUG_INFO=${CONFIG_DEBUG_INFO}
 CONFIG_INFINIBAND=${CONFIG_INFINIBAND}
 CONFIG_INFINIBAND_IPOIB=${CONFIG_INFINIBAND_IPOIB}
 CONFIG_INFINIBAND_IPOIB_CM=${CONFIG_INFINIBAND_IPOIB_CM}
-CONFIG_INFINIBAND_SDP=${CONFIG_INFINIBAND_SDP}
 CONFIG_INFINIBAND_SRP=${CONFIG_INFINIBAND_SRP}
 CONFIG_SCSI_SRP_ATTRS=${CONFIG_SCSI_SRP_ATTRS}
 CONFIG_INFINIBAND_SRPT=${CONFIG_INFINIBAND_SRPT}
@@ -913,11 +904,14 @@ CONFIG_INFINIBAND_SRPT=${CONFIG_INFINIBAND_SRPT}
 CONFIG_INFINIBAND_USER_MAD=${CONFIG_INFINIBAND_USER_MAD}
 CONFIG_INFINIBAND_USER_ACCESS=${CONFIG_INFINIBAND_USER_ACCESS}
 CONFIG_INFINIBAND_ADDR_TRANS=${CONFIG_INFINIBAND_ADDR_TRANS}
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=${CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS}
 CONFIG_INFINIBAND_USER_MEM=${CONFIG_INFINIBAND_USER_MEM}
 CONFIG_INFINIBAND_MTHCA=${CONFIG_INFINIBAND_MTHCA}
 
 CONFIG_MLX4_CORE=${CONFIG_MLX4_CORE}
 CONFIG_MLX5_CORE=${CONFIG_MLX5_CORE}
+CONFIG_MLX5_CORE_EN=${CONFIG_MLX5_CORE_EN}
+CONFIG_MLX5_CORE_EN_DCB=${CONFIG_MLX5_CORE_EN_DCB}
 CONFIG_MLX4_EN=${CONFIG_MLX4_EN}
 CONFIG_MLX4_EN_DCB=${CONFIG_MLX4_EN_DCB}
 CONFIG_MLX4_INFINIBAND=${CONFIG_MLX4_INFINIBAND}
@@ -960,10 +954,6 @@ CONFIG_SUNRPC_XPRT_RDMA_SERVER=${CONFIG_SUNRPC_XPRT_RDMA_SERVER}
 
 
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=${CONFIG_INFINIBAND_IPOIB_DEBUG_DATA}
-CONFIG_INFINIBAND_SDP_SEND_ZCOPY=${CONFIG_INFINIBAND_SDP_SEND_ZCOPY}
-CONFIG_INFINIBAND_SDP_RECV_ZCOPY=${CONFIG_INFINIBAND_SDP_RECV_ZCOPY}
-CONFIG_INFINIBAND_SDP_DEBUG=${CONFIG_INFINIBAND_SDP_DEBUG}
-CONFIG_INFINIBAND_SDP_DEBUG_DATA=${CONFIG_INFINIBAND_SDP_DEBUG_DATA}
 CONFIG_INFINIBAND_IPATH=${CONFIG_INFINIBAND_IPATH}
 CONFIG_INFINIBAND_QIB=${CONFIG_INFINIBAND_QIB}
 CONFIG_INFINIBAND_RDMAVT=${CONFIG_INFINIBAND_RDMAVT}
@@ -1005,11 +995,6 @@ if [ "X${CONFIG_INFINIBAND_IPOIB_CM}" == "Xy" ]; then
 else
         DEFINE_INFINIBAND_IPOIB_CM="#undef CONFIG_INFINIBAND_IPOIB_CM"
 fi
-if [ "X${CONFIG_INFINIBAND_SDP}" == "Xm" ]; then
-        DEFINE_INFINIBAND_SDP="#undef CONFIG_INFINIBAND_SDP\n#define CONFIG_INFINIBAND_SDP 1"
-else
-        DEFINE_INFINIBAND_SDP="#undef CONFIG_INFINIBAND_SDP"
-fi
 if [ "X${CONFIG_INFINIBAND_SRP}" == "Xm" ]; then
         DEFINE_INFINIBAND_SRP="#undef CONFIG_INFINIBAND_SRP\n#define CONFIG_INFINIBAND_SRP 1"
 else
@@ -1040,6 +1025,11 @@ if [ "X${CONFIG_INFINIBAND_ADDR_TRANS}" == "Xy" ]; then
 else
         DEFINE_INFINIBAND_ADDR_TRANS="#undef CONFIG_INFINIBAND_ADDR_TRANS"
 fi
+if [ "X${CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS}" == "Xy" ]; then
+        DEFINE_INFINIBAND_ADDR_TRANS_CONFIGFS="#undef CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS\n#define CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS 1"
+else
+        DEFINE_INFINIBAND_ADDR_TRANS_CONFIGFS="#undef CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS"
+fi
 if [ "X${CONFIG_INFINIBAND_USER_MEM}" == "Xy" ]; then
         DEFINE_INFINIBAND_USER_MEM="#undef CONFIG_INFINIBAND_USER_MEM\n#define CONFIG_INFINIBAND_USER_MEM 1"
 else
@@ -1058,7 +1048,17 @@ fi
 if [ "X${CONFIG_MLX5_CORE}" == "Xm" ]; then
         DEFINE_MLX5_CORE="#undef CONFIG_MLX5_CORE\n#define CONFIG_MLX5_CORE 1"
 else
-        DEFINE_MLX4_CORE="#undef CONFIG_MLX5_CORE"
+        DEFINE_MLX5_CORE="#undef CONFIG_MLX5_CORE"
+fi
+if [ "X${CONFIG_MLX5_CORE_EN}" == "Xy" ]; then
+        DEFINE_MLX5_CORE_EN="#undef CONFIG_MLX5_CORE_EN\n#define CONFIG_MLX5_CORE_EN 1"
+else
+        DEFINE_MLX5_CORE_EN="#undef CONFIG_MLX5_CORE_EN"
+fi
+if [ "X${CONFIG_MLX5_CORE_EN_DCB}" == "Xy" ]; then
+        DEFINE_MLX5_CORE_EN_DCB="#undef CONFIG_MLX5_CORE_EN_DCB\n#define CONFIG_MLX5_CORE_EN_DCB 1"
+else
+        DEFINE_MLX5_CORE_EN_DCB="#undef CONFIG_MLX5_CORE_EN_DCB"
 fi
 if [ "X${CONFIG_MLX4_EN}" == "Xm" ]; then
         DEFINE_MLX4_EN="#undef CONFIG_MLX4_EN\n#define CONFIG_MLX4_EN 1"
@@ -1158,26 +1158,6 @@ if [ "X${CONFIG_INFINIBAND_IPOIB_DEBUG_DATA}" == "Xy" ]; then
 else
         DEFINE_INFINIBAND_IPOIB_DEBUG_DATA="#undef CONFIG_INFINIBAND_IPOIB_DEBUG_DATA"
 fi
-if [ "X${CONFIG_INFINIBAND_SDP_SEND_ZCOPY}" == "Xy" ]; then
-        DEFINE_INFINIBAND_SDP_SEND_ZCOPY="#undef CONFIG_INFINIBAND_SDP_SEND_ZCOPY\n#define CONFIG_INFINIBAND_SDP_SEND_ZCOPY 1"
-else
-        DEFINE_INFINIBAND_SDP_SEND_ZCOPY="#undef CONFIG_INFINIBAND_SDP_SEND_ZCOPY"
-fi
-if [ "X${CONFIG_INFINIBAND_SDP_RECV_ZCOPY}" == "Xy" ]; then
-        DEFINE_INFINIBAND_SDP_RECV_ZCOPY="#undef CONFIG_INFINIBAND_SDP_RECV_ZCOPY\n#define CONFIG_INFINIBAND_SDP_RECV_ZCOPY 1"
-else
-        DEFINE_INFINIBAND_SDP_RECV_ZCOPY="#undef CONFIG_INFINIBAND_SDP_RECV_ZCOPY"
-fi
-if [ "X${CONFIG_INFINIBAND_SDP_DEBUG}" == "Xy" ]; then
-        DEFINE_INFINIBAND_SDP_DEBUG="#undef CONFIG_INFINIBAND_SDP_DEBUG\n#define CONFIG_INFINIBAND_SDP_DEBUG 1"
-else
-        DEFINE_INFINIBAND_SDP_DEBUG="#undef CONFIG_INFINIBAND_SDP_DEBUG"
-fi
-if [ "X${CONFIG_INFINIBAND_SDP_DEBUG_DATA}" == "Xy" ]; then
-        DEFINE_INFINIBAND_SDP_DEBUG_DATA="#undef CONFIG_INFINIBAND_SDP_DEBUG_DATA\n#define CONFIG_INFINIBAND_SDP_DEBUG_DATA 1"
-else
-        DEFINE_INFINIBAND_SDP_DEBUG_DATA="#undef CONFIG_INFINIBAND_SDP_DEBUG_DATA"
-fi
 if [ "X${CONFIG_INFINIBAND_IPATH}" == "Xm" ]; then
         DEFINE_INFINIBAND_IPATH="#undef CONFIG_INFINIBAND_IPATH\n#define CONFIG_INFINIBAND_IPATH 1"
 else
@@ -1299,7 +1279,6 @@ cat > ${AUTOCONF_H} << EOFAUTOCONF
 $(echo -e "${DEFINE_INFINIBAND}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_IPOIB}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_IPOIB_CM}" | grep -v undef)
-$(echo -e "${DEFINE_INFINIBAND_SDP}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_SRP}" | grep -v undef)
 $(echo -e "${DEFINE_SCSI_SRP_ATTRS}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_SRPT}" | grep -v undef)
@@ -1339,6 +1318,8 @@ $(echo -e "${DEFINE_INFINIBAND_NES_DEBUG}" | grep -v undef)
 
 $(echo -e "${DEFINE_MLX4_CORE}" | grep -v undef)
 $(echo -e "${DEFINE_MLX5_CORE}" | grep -v undef)
+$(echo -e "${DEFINE_MLX5_CORE_EN}" | grep -v undef)
+$(echo -e "${DEFINE_MLX5_CORE_EN_DCB}" | grep -v undef)
 $(echo -e "${DEFINE_MLX4_EN}" | grep -v undef)
 $(echo -e "${DEFINE_MLX4_INFINIBAND}" | grep -v undef)
 $(echo -e "${DEFINE_MLX5_INFINIBAND}" | grep -v undef)
@@ -1352,10 +1333,6 @@ $(echo -e "${DEFINE_IBP_DEBUG}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_SCIF}" | grep -v undef)
 
 $(echo -e "${DEFINE_INFINIBAND_IPOIB_DEBUG_DATA}" | grep -v undef)
-$(echo -e "${DEFINE_INFINIBAND_SDP_SEND_ZCOPY}" | grep -v undef)
-$(echo -e "${DEFINE_INFINIBAND_SDP_RECV_ZCOPY}" | grep -v undef)
-$(echo -e "${DEFINE_INFINIBAND_SDP_DEBUG}" | grep -v undef)
-$(echo -e "${DEFINE_INFINIBAND_SDP_DEBUG_DATA}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_IPATH}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_QIB}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_RDMAVT}" | grep -v undef)
@@ -1369,7 +1346,6 @@ $(echo -e "${DEFINE_INFINIBAND_AMSO1100}" | grep -v undef)
 #undef CONFIG_INFINIBAND
 #undef CONFIG_INFINIBAND_IPOIB
 #undef CONFIG_INFINIBAND_IPOIB_CM
-#undef CONFIG_INFINIBAND_SDP
 #undef CONFIG_INFINIBAND_SRP
 #undef CONFIG_INFINIBAND_SRPT
 #undef CONFIG_SCSI_SRP_ATTRS
@@ -1377,11 +1353,14 @@ $(echo -e "${DEFINE_INFINIBAND_AMSO1100}" | grep -v undef)
 #undef CONFIG_INFINIBAND_USER_MAD
 #undef CONFIG_INFINIBAND_USER_ACCESS
 #undef CONFIG_INFINIBAND_ADDR_TRANS
+#undef CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS
 #undef CONFIG_INFINIBAND_USER_MEM
 #undef CONFIG_INFINIBAND_MTHCA
 
 #undef CONFIG_MLX4_CORE
 #undef CONFIG_MLX5_CORE
+#undef CONFIG_MLX5_CORE_EN
+#undef CONFIG_MLX5_CORE_EN_DCB
 #undef CONFIG_MLX4_DEBUG
 #undef CONFIG_MLX5_DEBUG
 #undef CONFIG_MLX4_EN
@@ -1425,10 +1404,6 @@ $(echo -e "${DEFINE_INFINIBAND_AMSO1100}" | grep -v undef)
 
 
 #undef CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
-#undef CONFIG_INFINIBAND_SDP_SEND_ZCOPY
-#undef CONFIG_INFINIBAND_SDP_RECV_ZCOPY
-#undef CONFIG_INFINIBAND_SDP_DEBUG
-#undef CONFIG_INFINIBAND_SDP_DEBUG_DATA
 #undef CONFIG_INFINIBAND_IPATH
 #undef CONFIG_INFINIBAND_QIB
 #undef CONFIG_INFINIBAND_RDMAVT
@@ -1440,7 +1415,6 @@ $(echo -e "${DEFINE_INFINIBAND_AMSO1100}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND}")
 $(echo -e "${DEFINE_INFINIBAND_IPOIB}")
 $(echo -e "${DEFINE_INFINIBAND_IPOIB_CM}")
-$(echo -e "${DEFINE_INFINIBAND_SDP}")
 $(echo -e "${DEFINE_INFINIBAND_SRP}")
 $(echo -e "${DEFINE_INFINIBAND_SRPT}")
 
@@ -1479,6 +1453,8 @@ $(echo -e "${DEFINE_INFINIBAND_NES_DEBUG}")
 
 $(echo -e "${DEFINE_MLX4_CORE}")
 $(echo -e "${DEFINE_MLX5_CORE}")
+$(echo -e "${DEFINE_MLX5_CORE_EN}")
+$(echo -e "${DEFINE_MLX5_CORE_EN_DCB}")
 $(echo -e "${DEFINE_MLX4_EN}")
 $(echo -e "${DEFINE_MLX4_INFINIBAND}")
 $(echo -e "${DEFINE_MLX5_INFINIBAND}")
@@ -1492,10 +1468,6 @@ $(echo -e "${DEFINE_IBP_DEBUG}")
 $(echo -e "${DEFINE_INFINIBAND_SCIF}")
 
 $(echo -e "${DEFINE_INFINIBAND_IPOIB_DEBUG_DATA}")
-$(echo -e "${DEFINE_INFINIBAND_SDP_SEND_ZCOPY}")
-$(echo -e "${DEFINE_INFINIBAND_SDP_RECV_ZCOPY}")
-$(echo -e "${DEFINE_INFINIBAND_SDP_DEBUG}")
-$(echo -e "${DEFINE_INFINIBAND_SDP_DEBUG_DATA}")
 $(echo -e "${DEFINE_INFINIBAND_IPATH}")
 $(echo -e "${DEFINE_INFINIBAND_QIB}")
 $(echo -e "${DEFINE_INFINIBAND_RDMAVT}")

diff --git a/makefile b/makefile
index aee4e5a6d6d472a7f0b75c9842bbda45370ff625..0fcabd5849a577d36293cd89bad2299cd7911b42 100644 (file)
--- a/makefile
+++ b/makefile
@@ -79,7 +79,6 @@ kernel: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF)
                CONFIG_INFINIBAND=$(CONFIG_INFINIBAND) \
                CONFIG_INFINIBAND_IPOIB=$(CONFIG_INFINIBAND_IPOIB) \
                CONFIG_INFINIBAND_IPOIB_CM=$(CONFIG_INFINIBAND_IPOIB_CM) \
-               CONFIG_INFINIBAND_SDP=$(CONFIG_INFINIBAND_SDP) \
                CONFIG_INFINIBAND_SRP=$(CONFIG_INFINIBAND_SRP) \
                CONFIG_INFINIBAND_SRPT=$(CONFIG_INFINIBAND_SRPT) \
                CONFIG_SCSI_SRP_ATTRS=$(CONFIG_SCSI_SRP_ATTRS) \
@@ -87,6 +86,7 @@ kernel: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF)
                CONFIG_INFINIBAND_USER_ACCESS=$(CONFIG_INFINIBAND_USER_ACCESS) \
                CONFIG_INFINIBAND_USER_MEM=$(CONFIG_INFINIBAND_USER_MEM) \
                CONFIG_INFINIBAND_ADDR_TRANS=$(CONFIG_INFINIBAND_ADDR_TRANS) \
+               CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=$(CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS) \
                CONFIG_INFINIBAND_MTHCA=$(CONFIG_INFINIBAND_MTHCA) \
                CONFIG_INFINIBAND_IPOIB_DEBUG=$(CONFIG_INFINIBAND_IPOIB_DEBUG) \
                CONFIG_INFINIBAND_ISERT=$(CONFIG_INFINIBAND_ISERT) \
@@ -124,6 +124,8 @@ kernel: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF)
                CONFIG_INFINIBAND_NES_DEBUG=$(CONFIG_INFINIBAND_NES_DEBUG) \
                CONFIG_MLX4_CORE=$(CONFIG_MLX4_CORE) \
                CONFIG_MLX5_CORE=$(CONFIG_MLX5_CORE) \
+               CONFIG_MLX5_CORE_EN=$(CONFIG_MLX5_CORE_EN) \
+               CONFIG_MLX5_CORE_EN_DCB=$(CONFIG_MLX5_CORE_EN_DCB) \
                CONFIG_MLX4_EN=$(CONFIG_MLX4_EN) \
                CONFIG_MLX4_EN_DCB=$(CONFIG_MLX4_EN_DCB) \
                CONFIG_MLX4_INFINIBAND=$(CONFIG_MLX4_INFINIBAND) \

diff --git a/ofed_scripts/check_ofed_kernel.sh b/ofed_scripts/check_ofed_kernel.sh
index e03df813e9bc1216e21c12ddcd720c1e6b659000..80eaceae67f4d8fc576fa7b27c05f2bf169cdbb1 100755 (executable)
--- a/ofed_scripts/check_ofed_kernel.sh
+++ b/ofed_scripts/check_ofed_kernel.sh
@@ -65,7 +65,8 @@ if [ -z "$configure_options" ]; then
        configure_options=" \
                --with-mthca-mod --with-mthca_debug-mod \
                --with-mlx4-mod --with-mlx4_debug-mod --with-ipoib-mod \
-               --with-ipoib_debug-mod --with-sdp-mod --with-sdp_debug-mod \
+               --with-ipoib_debug-mod \
+               --with-mlx5-mod \
                --with-rds-mod --with-cxgb3-mod --with-cxgb4-mod \
                 --with-nes-mod \
                ${custom_options} \

diff --git a/ofed_scripts/ib_sdp.conf b/ofed_scripts/ib_sdp.conf
deleted file mode 100644 (file)
index fa4720b..0000000
--- a/ofed_scripts/ib_sdp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-alias net-pf-27 ib_sdp
-alias net-pf-28 ib_sdp

diff --git a/ofed_scripts/openibd b/ofed_scripts/openibd
index 389c28e623d5a4a19a80cac52f6af83cc3dc21b3..55c55b951dfd92a46754ce314126eccc6897f27c 100644 (file)
--- a/ofed_scripts/openibd
+++ b/ofed_scripts/openibd
@@ -223,11 +223,6 @@ POST_LOAD_MODULES=""
 
 RUN_SYSCTL=${RUN_SYSCTL:-"no"}
 
-if [ "X${SDP_LOAD}" == "Xyes" ]; then
-    POST_LOAD_MODULES="$POST_LOAD_MODULES ib_sdp"
-    IPOIB_LOAD="yes"
-fi
-
 IPOIB=0
 IPOIB_MTU=${IPOIB_MTU:-65520}
 if [ "X${IPOIB_LOAD}" == "Xyes" ]; then
@@ -266,16 +261,16 @@ if [ "X${RDMA_UCM_LOAD}" == "Xyes" ]; then
     POST_LOAD_MODULES="$POST_LOAD_MODULES rdma_ucm"
 fi
 
-GEN1_UNLOAD_MODULES="ib_srp_target scsi_target ib_srp kdapltest_module ib_kdapl ib_sdp ib_useraccess ib_useraccess_cm ib_cm ib_dapl_srv ib_ip2pr ib_ipoib ib_tavor mod_thh mod_rhh ib_dm_client ib_sa_client ib_client_query ib_poll ib_mad ib_core ib_services"
+GEN1_UNLOAD_MODULES="ib_srp_target scsi_target ib_srp kdapltest_module ib_kdapl ib_useraccess ib_useraccess_cm ib_cm ib_dapl_srv ib_ip2pr ib_ipoib ib_tavor mod_thh mod_rhh ib_dm_client ib_sa_client ib_client_query ib_poll ib_mad ib_core ib_services"
 
 UNLOAD_MODULES="ib_mthca mlx5_ib mlx5_core mlx4_ib ib_ipath ipath_core ib_ehca iw_nes iw_cxgb3 cxgb3 iw_cxgb4 cxgb4 ocrdma"
 UNLOAD_MODULES="$UNLOAD_MODULES ib_qib"
 UNLOAD_MODULES="$UNLOAD_MODULES ib_ipoib ib_madeye ib_rds"
-UNLOAD_MODULES="$UNLOAD_MODULES rds_rdma rds_tcp rds ib_ucm kdapl ib_srp_target scsi_target ib_srpt ib_srp ib_iser ib_sdp"
+UNLOAD_MODULES="$UNLOAD_MODULES rds_rdma rds_tcp rds ib_ucm kdapl ib_srp_target scsi_target ib_srpt ib_srp ib_iser"
 UNLOAD_MODULES="$UNLOAD_MODULES rdma_ucm rdma_cm iw_cm ib_cm ib_local_sa findex"
 UNLOAD_MODULES="$UNLOAD_MODULES ib_sa ib_uverbs ib_umad ib_mad ib_core ib_addr"
 
-STATUS_MODULES="rdma_ucm ib_rds rds rds_rdma rds_tcp ib_srpt ib_srp qlgc_vnic ib_sdp rdma_cm ib_addr ib_local_sa findex ib_ipoib ib_ehca ib_ipath ipath_core mlx4_core mlx4_ib mlx4_en mlx5_core mlx5_ib ib_mthca ib_uverbs ib_umad ib_ucm ib_sa ib_cm ib_mad ib_core iw_cxgb3 iw_cxgb4 iw_nes pvrdma"
+STATUS_MODULES="rdma_ucm ib_rds rds rds_rdma rds_tcp ib_srpt ib_srp qlgc_vnic rdma_cm ib_addr ib_local_sa findex ib_ipoib ib_ehca ib_ipath ipath_core mlx4_core mlx4_ib mlx4_en mlx5_core mlx5_ib ib_mthca ib_uverbs ib_umad ib_ucm ib_sa ib_cm ib_mad ib_core iw_cxgb3 iw_cxgb4 iw_nes pvrdma"
 STATUS_MODULES="$STATUS_MODULES ib_qib ocrdma"
 
 if (modinfo scsi_transport_srp 2>/dev/null | grep depends: | grep -q compat 2>/dev/null) ||