[openfabrics-ewg] [PATCH 3/3] Integrate VNIC into the OFED build process
Ramachandra K
ramachandra.kuchimanchi at qlogic.com
Tue Dec 19 08:42:43 PST 2006
Add the VNIC driver to the OFED build process
Signed-off-by: Ramachandra K <ramachandra.kuchimanchi at qlogic.com>
---
drivers/infiniband/Kconfig | 2 +
drivers/infiniband/Makefile | 1 +
ofed_scripts/Makefile | 3 ++
ofed_scripts/configure | 60 +++++++++++++++++++++++++++++++++++++++----
4 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 6c1cc69..62233cd 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -47,4 +47,6 @@ source "drivers/infiniband/ulp/iser/Kcon
source "drivers/infiniband/ulp/sdp/Kconfig"
+source "drivers/infiniband/ulp/vnic/Kconfig"
+
endmenu
diff --git a/drivers/infiniband/Makefile b/drivers/infiniband/Makefile
index 6cc7e4a..2bd27b5 100644
--- a/drivers/infiniband/Makefile
+++ b/drivers/infiniband/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/i
obj-$(CONFIG_INFINIBAND_SRP) += ulp/srp/
obj-$(CONFIG_INFINIBAND_ISER) += ulp/iser/
obj-$(CONFIG_INFINIBAND_SDP) += ulp/sdp/
+obj-$(CONFIG_INFINIBAND_VNIC) += ulp/vnic/
diff --git a/ofed_scripts/Makefile b/ofed_scripts/Makefile
index d82bc60..34a24b7 100644
--- a/ofed_scripts/Makefile
+++ b/ofed_scripts/Makefile
@@ -61,6 +61,9 @@ kernel:
CONFIG_INFINIBAND_IPATH=$(CONFIG_INFINIBAND_IPATH) \
CONFIG_INFINIBAND_MTHCA_DEBUG=$(CONFIG_INFINIBAND_MTHCA_DEBUG) \
CONFIG_INFINIBAND_MADEYE=$(CONFIG_INFINIBAND_MADEYE) \
+ CONFIG_INFINIBAND_VNIC=$(CONFIG_INFINIBAND_VNIC) \
+ CONFIG_INFINIBAND_VNIC_DEBUG=$(CONFIG_INFINIBAND_VNIC_DEBUG) \
+ CONFIG_INFINIBAND_VNIC_STATS=$(CONFIG_INFINIBAND_VNIC_STATS) \
LINUXINCLUDE=' \
$(BACKPORT_INCLUDES) \
-I$(CWD)/include \
diff --git a/ofed_scripts/configure b/ofed_scripts/configure
index 5e03775..db78d38 100755
--- a/ofed_scripts/configure
+++ b/ofed_scripts/configure
@@ -117,6 +117,15 @@ Usage: `basename $0` [options]
--with-madeye-mod make CONFIG_INFINIBAND_MADEYE=m [no]
--without-madeye-mod [yes]
+ --with-vnic-mod make CONFIG_INFINIBAND_VNIC=m [no]
+ --without-vnic-mod [yes]
+
+ --with-vnic_debug-mod make CONFIG_INFINIBAND_VNIC_DEBUG=y [no]
+ --without-vnic_debug-mod [yes]
+
+ --with-vnic_stats-mod make CONFIG_INFINIBAND_VNIC_STATS=y [no]
+ --without-vnic_stats-mod [yes]
+
--help - print out options
@@ -629,6 +638,24 @@ main()
--without-madeye-mod)
CONFIG_INFINIBAND_MADEYE=
;;
+ --with-vnic-mod)
+ CONFIG_INFINIBAND_VNIC="m"
+ ;;
+ --without-vnic-mod)
+ CONFIG_INFINIBAND_VNIC=
+ ;;
+ --with-vnic_debug-mod)
+ CONFIG_INFINIBAND_VNIC_DEBUG="y"
+ ;;
+ --without-vnic-mod)
+ CONFIG_INFINIBAND_VNIC_DEBUG=
+ ;;
+ --with-vnic_stats-mod)
+ CONFIG_INFINIBAND_VNIC_STATS="y"
+ ;;
+ --without-vnic_stats-mod)
+ CONFIG_INFINIBAND_VNIC_STATS=
+ ;;
--with-modprobe|--without-modprobe)
;;
-h | --help)
@@ -698,7 +725,7 @@ CONFIG_INFINIBAND_EHCA_SCALING=${CONFIG_
CONFIG_INFINIBAND_RDS=${CONFIG_INFINIBAND_RDS:-''}
CONFIG_INFINIBAND_RDS_DEBUG=${CONFIG_INFINIBAND_RDS_DEBUG:-''}
CONFIG_INFINIBAND_MADEYE=${CONFIG_INFINIBAND_MADEYE:-''}
-
+CONFIG_INFINIBAND_VNIC=${CONFIG_INFINIBAND_VNIC:-''}
CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=${CONFIG_INFINIBAND_IPOIB_DEBUG_DATA:-''}
CONFIG_INFINIBAND_SDP_SEND_ZCOPY=${CONFIG_INFINIBAND_SDP_SEND_ZCOPY:-''}
@@ -707,7 +734,8 @@ CONFIG_INFINIBAND_SDP_DEBUG=${CONFIG_INF
CONFIG_INFINIBAND_SDP_DEBUG_DATA=${CONFIG_INFINIBAND_SDP_DEBUG_DATA:-''}
CONFIG_INFINIBAND_IPATH=${CONFIG_INFINIBAND_IPATH:-''}
CONFIG_INFINIBAND_MTHCA_DEBUG=${CONFIG_INFINIBAND_MTHCA_DEBUG:-''}
-
+CONFIG_INFINIBAND_VNIC_DEBUG=${CONFIG_INFINIBAND_VNIC_DEBUG:-''}
+CONFIG_INFINIBAND_VNIC_STATS=${CONFIG_INFINIBAND_VNIC_STATS:-''}
# Check for minimal supported kernel version
if ! check_kerver ${KVERSION} ${MIN_KVERSION}; then
@@ -758,6 +786,7 @@ CONFIG_INFINIBAND_EHCA_SCALING=${CONFIG_
CONFIG_INFINIBAND_RDS=${CONFIG_INFINIBAND_RDS}
CONFIG_INFINIBAND_RDS_DEBUG=${CONFIG_INFINIBAND_RDS_DEBUG}
CONFIG_INFINIBAND_MADEYE=${CONFIG_INFINIBAND_MADEYE}
+CONFIG_INFINIBAND_VNIC=${CONFIG_INFINIBAND_VNIC}
CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=${CONFIG_INFINIBAND_IPOIB_DEBUG_DATA}
CONFIG_INFINIBAND_SDP_SEND_ZCOPY=${CONFIG_INFINIBAND_SDP_SEND_ZCOPY}
@@ -766,7 +795,8 @@ CONFIG_INFINIBAND_SDP_DEBUG=${CONFIG_INF
CONFIG_INFINIBAND_SDP_DEBUG_DATA=${CONFIG_INFINIBAND_SDP_DEBUG_DATA}
CONFIG_INFINIBAND_IPATH=${CONFIG_INFINIBAND_IPATH}
CONFIG_INFINIBAND_MTHCA_DEBUG=${CONFIG_INFINIBAND_MTHCA_DEBUG}
-
+CONFIG_INFINIBAND_VNIC_DEBUG=${CONFIG_INFINIBAND_VNIC_DEBUG}
+CONFIG_INFINIBAND_VNIC_STATS=${CONFIG_INFINIBAND_VNIC_STATS}
EOFCONFIG
echo "Created ${CONFIG}:"
@@ -883,8 +913,21 @@ if [ "X${CONFIG_INFINIBAND_MTHCA_DEBUG}"
else
DEFINE_INFINIBAND_MTHCA_DEBUG="#undef CONFIG_INFINIBAND_MTHCA_DEBUG"
fi
-
-
+if [ "X${CONFIG_INFINIBAND_VNIC}" == "Xm" ]; then
+ DEFINE_INFINIBAND_VNIC="#define CONFIG_INFINIBAND_VNIC 1"
+else
+ DEFINE_INFINIBAND_VNIC="#undef CONFIG_INFINIBAND_VNIC"
+fi
+if [ "X${CONFIG_INFINIBAND_VNIC_DEBUG}" == "Xy" ]; then
+ DEFINE_INFINIBAND_VNIC_DEBUG="#define CONFIG_INFINIBAND_VNIC_DEBUG 1"
+else
+ DEFINE_INFINIBAND_VNIC_DEBUG="#undef CONFIG_INFINIBAND_VNIC_DEBUG"
+fi
+if [ "X${CONFIG_INFINIBAND_VNIC_STATS}" == "Xy" ]; then
+ DEFINE_INFINIBAND_VNIC_STATS="#define CONFIG_INFINIBAND_VNIC_STATS 1"
+else
+ DEFINE_INFINIBAND_VNIC_STATS="#undef CONFIG_INFINIBAND_VNIC_STATS"
+fi
cat >> ${AUTOCONF_H} << EOFAUTOCONF
#undef CONFIG_INFINIBAND
#undef CONFIG_INFINIBAND_IPOIB
@@ -903,6 +946,9 @@ cat >> ${AUTOCONF_H} << EOFAUTOCONF
#undef CONFIG_INFINIBAND_RDS
#undef CONFIG_INFINIBAND_RDS_DEBUG
#undef CONFIG_INFINIBAND_MADEYE
+#undef CONFIG_INFINIBAND_VNIC
+#undef CONFIG_INFINIBAND_VNIC_DEBUG
+#undef CONFIG_INFINIBAND_VNIC_STATS
#undef CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
#undef CONFIG_INFINIBAND_SDP_SEND_ZCOPY
@@ -921,13 +967,15 @@ ${DEFINE_INFINIBAND_USER_MAD}
${DEFINE_INFINIBAND_USER_ACCESS}
${DEFINE_INFINIBAND_ADDR_TRANS}
${DEFINE_INFINIBAND_MTHCA}
+${DEFINE_INFINIBAND_VNIC}
${DEFINE_INFINIBAND_IPOIB_DEBUG}
${DEFINE_INFINIBAND_ISER}
${DEFINE_INFINIBAND_EHCA}
${DEFINE_INFINIBAND_RDS}
${DEFINE_INFINIBAND_RDS_DEBUG}
-
+${DEFINE_INFINIBAND_VNIC_DEBUG}
+${DEFINE_INFINIBAND_VNIC_STATS}
${DEFINE_INFINIBAND_IPOIB_DEBUG_DATA}
${DEFINE_INFINIBAND_SDP_SEND_ZCOPY}
More information about the ewg
mailing list