[openib-general] [PATCH 2/2] ofed_1_2 Changes to ofed scripts for Chelsio T3 Support.

[Steve Wise]

Signed-off-by: Steve Wise <swise at opengridcomputing.com>
---

 ofed_scripts/Makefile  |    9 +++++++--
 ofed_scripts/configure |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/ofed_scripts/Makefile b/ofed_scripts/Makefile
index d63b1d2..049e533 100644
--- a/ofed_scripts/Makefile
+++ b/ofed_scripts/Makefile
@@ -46,8 +46,10 @@ kernel:
 	@echo "Kernel sources: $(KSRC)"
 	env EXTRA_CFLAGS="$(OPENIB_KERNEL_EXTRA_CFLAGS) $(KERNEL_MEMTRACK_CFLAGS) -I$(CWD)/include -I$(CWD)/drivers/infiniband/include \
 		-I$(CWD)/drivers/infiniband/ulp/ipoib \
-		-I$(CWD)/drivers/infiniband/debug" \
-    	$(MAKE) -C $(KSRC) SUBDIRS="$(CWD)/drivers/infiniband" KERNELRELEASE=$(KVERSION) \
+		-I$(CWD)/drivers/infiniband/debug \
+		-I$(CWD)/drivers/infiniband/hw/cxgb3/core \
+		-I$(CWD)/drivers/net/cxgb3 " \
+    	$(MAKE) -C $(KSRC) SUBDIRS="$(CWD)/drivers/infiniband $(CWD)/drivers/net" KERNELRELEASE=$(KVERSION) \
 		EXTRAVERSION=$(EXTRAVERSION) V=1 $(WITH_MAKE_PARAMS) \
 		CONFIG_INFINIBAND=$(CONFIG_INFINIBAND) \
 		CONFIG_INFINIBAND_IPOIB=$(CONFIG_INFINIBAND_IPOIB) \
@@ -74,6 +76,9 @@ kernel:
         	CONFIG_INFINIBAND_VNIC=$(CONFIG_INFINIBAND_VNIC) \
         	CONFIG_INFINIBAND_VNIC_DEBUG=$(CONFIG_INFINIBAND_VNIC_DEBUG) \
         	CONFIG_INFINIBAND_VNIC_STATS=$(CONFIG_INFINIBAND_VNIC_STATS) \
+        	CONFIG_INFINIBAND_CXGB3=$(CONFIG_INFINIBAND_CXGB3) \
+        	CONFIG_INFINIBAND_CXGB3_DEBUG=$(CONFIG_INFINIBAND_CXGB3_DEBUG) \
+        	CONFIG_CHELSIO_T3=$(CONFIG_CHELSIO_T3) \
 		LINUXINCLUDE=' \
 		$(BACKPORT_INCLUDES) \
 		-I$(CWD)/include \
diff --git a/ofed_scripts/configure b/ofed_scripts/configure
index a0557e2..08f15f5 100755
--- a/ofed_scripts/configure
+++ b/ofed_scripts/configure
@@ -126,6 +126,12 @@ Usage:  `basename $0` [options]
     --with-vnic_stats-mod    make CONFIG_INFINIBAND_VNIC_STATS=y [no]
     --without-vnic_stats-mod    [yes]
 
+    --with-cxgb3-mod    make CONFIG_INFINIBAND_CXGB3=m [no]
+    --without-cxgb3-mod    [yes]
+
+    --with-cxgb3_debug-mod    make CONFIG_INFINIBAND_CXGB3_DEBUG=y [no]
+    --without-cxgb3_debug-mod    [yes]
+
     --help - print out options
 
 
@@ -607,6 +613,20 @@ main()
                         --without-vnic_stats-mod)
                             CONFIG_INFINIBAND_VNIC_STATS=
                         ;;
+                        --with-cxgb3-mod)
+                            CONFIG_INFINIBAND_CXGB3="m"
+			    CONFIG_CHELSIO_T3="m"
+                        ;;
+                        --without-cxgb3-mod)
+                            CONFIG_INFINIBAND_CXGB3=
+			    CONFIG_CHELSIO_T3=
+                        ;;
+                        --with-cxgb3_debug-mod)
+                            CONFIG_INFINIBAND_CXGB3_DEBUG="y"
+                        ;;
+                        --without-cxgb3_debug-mod)
+                            CONFIG_INFINIBAND_CXGB3_DEBUG=
+                        ;;
                         --with-modprobe|--without-modprobe)
                         ;;
                         -h | --help)
@@ -679,6 +699,8 @@ CONFIG_INFINIBAND_RDS=${CONFIG_INFINIBAN
 CONFIG_INFINIBAND_RDS_DEBUG=${CONFIG_INFINIBAND_RDS_DEBUG:-''}
 CONFIG_INFINIBAND_MADEYE=${CONFIG_INFINIBAND_MADEYE:-''}
 CONFIG_INFINIBAND_VNIC=${CONFIG_INFINIBAND_VNIC:-''}
+CONFIG_INFINIBAND_CXGB3=${CONFIG_INFINIBAND_CXGB3:-''}
+CONFIG_CHELSIO_T3=${CONFIG_CHELSIO_T3:-''}
 
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=${CONFIG_INFINIBAND_IPOIB_DEBUG_DATA:-''}
 CONFIG_INFINIBAND_SDP_SEND_ZCOPY=${CONFIG_INFINIBAND_SDP_SEND_ZCOPY:-''}
@@ -689,6 +711,7 @@ CONFIG_INFINIBAND_IPATH=${CONFIG_INFINIB
 CONFIG_INFINIBAND_MTHCA_DEBUG=${CONFIG_INFINIBAND_MTHCA_DEBUG:-''}
 CONFIG_INFINIBAND_VNIC_DEBUG=${CONFIG_INFINIBAND_VNIC_DEBUG:-''}
 CONFIG_INFINIBAND_VNIC_STATS=${CONFIG_INFINIBAND_VNIC_STATS:-''}
+CONFIG_INFINIBAND_CXGB3_DEBUG=${CONFIG_INFINIBAND_CXGB3_DEBUG:-''}
 
         # Check for minimal supported kernel version
         if ! check_kerver ${KVERSION} ${MIN_KVERSION}; then
@@ -742,6 +765,8 @@ CONFIG_INFINIBAND_RDS=${CONFIG_INFINIBAN
 CONFIG_INFINIBAND_RDS_DEBUG=${CONFIG_INFINIBAND_RDS_DEBUG}
 CONFIG_INFINIBAND_MADEYE=${CONFIG_INFINIBAND_MADEYE}
 CONFIG_INFINIBAND_VNIC=${CONFIG_INFINIBAND_VNIC}
+CONFIG_INFINIBAND_CXGB3=${CONFIG_INFINIBAND_CXGB3}
+CONFIG_CHELSIO_T3=${CONFIG_CHELSIO_T3}
 
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=${CONFIG_INFINIBAND_IPOIB_DEBUG_DATA}
 CONFIG_INFINIBAND_SDP_SEND_ZCOPY=${CONFIG_INFINIBAND_SDP_SEND_ZCOPY}
@@ -752,6 +777,7 @@ CONFIG_INFINIBAND_IPATH=${CONFIG_INFINIB
 CONFIG_INFINIBAND_MTHCA_DEBUG=${CONFIG_INFINIBAND_MTHCA_DEBUG}
 CONFIG_INFINIBAND_VNIC_DEBUG=${CONFIG_INFINIBAND_VNIC_DEBUG}
 CONFIG_INFINIBAND_VNIC_STATS=${CONFIG_INFINIBAND_VNIC_STATS}
+CONFIG_INFINIBAND_CXGB3_DEBUG=${CONFIG_INFINIBAND_CXGB3_DEBUG}
 
 EOFCONFIG
         echo "Created ${CONFIG}:"
@@ -887,6 +913,21 @@ if [ "X${CONFIG_INFINIBAND_VNIC_STATS}" 
 else
         DEFINE_INFINIBAND_VNIC_STATS="#undef CONFIG_INFINIBAND_VNIC_STATS"
 fi
+if [ "X${CONFIG_INFINIBAND_CXGB3}" == "Xm" ]; then
+        DEFINE_INFINIBAND_CXGB3="#define CONFIG_INFINIBAND_CXGB3 1"
+else
+        DEFINE_INFINIBAND_CXGB3="#undef CONFIG_INFINIBAND_CXGB3"
+fi
+if [ "X${CONFIG_INFINIBAND_CXGB3_DEBUG}" == "Xy" ]; then
+        DEFINE_INFINIBAND_CXGB3_DEBUG="#define CONFIG_INFINIBAND_CXGB3_DEBUG 1"
+else
+        DEFINE_INFINIBAND_CXGB3_DEBUG="#undef CONFIG_INFINIBAND_CXGB3_DEBUG"
+fi
+if [ "X${CONFIG_CHELSIO_T3}" == "Xm" ]; then
+        DEFINE_CHELSIO_T3="#define CONFIG_CHELSIO_T3 1"
+else
+        DEFINE_CHELSIO_T3="#undef CONFIG_CHELSIO_T3"
+fi
 cat >> ${AUTOCONF_H} << EOFAUTOCONF
 #undef CONFIG_INFINIBAND
 #undef CONFIG_INFINIBAND_IPOIB
@@ -908,6 +949,9 @@ #undef CONFIG_INFINIBAND_MADEYE
 #undef CONFIG_INFINIBAND_VNIC
 #undef CONFIG_INFINIBAND_VNIC_DEBUG
 #undef CONFIG_INFINIBAND_VNIC_STATS
+#undef CONFIG_INFINIBAND_CXGB3
+#undef CONFIG_INFINIBAND_CXGB3_DEBUG
+#undef CONFIG_CHELSIO_T3
 
 #undef CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
 #undef CONFIG_INFINIBAND_SDP_SEND_ZCOPY
@@ -927,6 +971,8 @@ #undef CONFIG_INFINIBAND_MTHCA_DEBUG
 ${DEFINE_INFINIBAND_ADDR_TRANS}
 ${DEFINE_INFINIBAND_MTHCA}
 ${DEFINE_INFINIBAND_VNIC}
+${DEFINE_INFINIBAND_CXGB3}
+${DEFINE_CHELSIO_T3}
 
 ${DEFINE_INFINIBAND_IPOIB_DEBUG}
 ${DEFINE_INFINIBAND_ISER}
@@ -937,6 +983,7 @@ #undef CONFIG_INFINIBAND_MTHCA_DEBUG
 ${DEFINE_INFINIBAND_RDS_DEBUG}
 ${DEFINE_INFINIBAND_VNIC_DEBUG}
 ${DEFINE_INFINIBAND_VNIC_STATS}
+${DEFINE_INFINIBAND_CXGB3_DEBUG}
 
 ${DEFINE_INFINIBAND_IPOIB_DEBUG_DATA}
 ${DEFINE_INFINIBAND_SDP_SEND_ZCOPY}