bnxt_re: Enable bnxt_re building
authorSelvin Xavier <selvin.xavier@broadcom.com>
Sat, 12 Aug 2017 02:30:07 +0000 (19:30 -0700)
committerSelvin Xavier <selvin.xavier@broadcom.com>
Tue, 22 Aug 2017 21:06:54 +0000 (14:06 -0700)
Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
Makefile
Module.supported
compat-rdma.spec
configure
makefile
ofed_scripts/checkout_files

index 98a213c..dd23147 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,3 +12,4 @@ 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_BNXT)            += drivers/net/ethernet/broadcom/bnxt/
index 6eaac34..ec03af8 100644 (file)
@@ -47,3 +47,5 @@ compat.ko external
 qed.ko external
 qede.ko external
 qedr.ko external
+bnxt_en.ko external
+bnxt_re.ko external
index f931081..ac3582b 100755 (executable)
@@ -59,6 +59,7 @@
 %define build_ibscif %(if ( echo %{configure_options} | grep "with-ibscif-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define build_vmw_pvrdma %(if ( echo %{configure_options} | grep "with-vmw_pvrdma-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define build_qedr %(if ( echo %{configure_options} | grep "with-qedr-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
+%define build_bnxt_re %(if ( echo %{configure_options} | grep "with-bnxt_re-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define build_compat_rdma_firmware %(if ( echo %{configure_options} | grep "with-firmware" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 
 %{!?LIB_MOD_DIR: %define LIB_MOD_DIR /lib/modules/%{KVERSION}/updates}
index 3c99e22..341c890 100755 (executable)
--- a/configure
+++ b/configure
@@ -169,6 +169,12 @@ Usage:  `basename $0` [options]
     --with-be2net-mod    make CONFIG_BE2NET=m [no]
     --without-be2net-mod    [yes]
 
+    --with-bnxt_en-mod    make CONFIG_BNXT=m [no]
+    --without-bnxt_en-mod    [yes]
+
+    --with-bnxt_re-mod    make CONFIG_INFINIBAND_BNXT_RE=m [no]
+    --without-bnxt_re-mod    [yes]
+
     --with-nes_debug-mod    make CONFIG_INFINIBAND_NES_DEBUG=y [no]
     --without-nes_debug-mod    [yes]
 
@@ -713,6 +719,21 @@ main()
                         --without-be2net-mod)
                             CONFIG_BE2NET=
                         ;;
+                       --with-bnxt_re-mod)
+                            CONFIG_INFINIBAND_BNXT_RE="m"
+                            CONFIG_BNXT="y"
+                            add_conf "# Load BNXT_RE modules" "BNXT_RE_LOAD=yes"
+                        ;;
+                        --without-bnxt_re-mod)
+                            CONFIG_INFINIBAND_BNXT_RE=
+                        ;;
+                        --with-bnxt_en-mod)
+                            CONFIG_BNXT="m"
+                        ;;
+                        --without-bnxt_en-mod)
+                            CONFIG_BNXT=
+                        ;;
+
                         --with-nfsrdma-mod)
                             CONFIG_SUNRPC_XPRT_RDMA="m"
                             CONFIG_SUNRPC_XPRT_RDMA_CLIENT="m"
@@ -901,6 +922,8 @@ CONFIG_I40E=${CONFIG_I40E:-''}
 CONFIG_INFINIBAND_NES=${CONFIG_INFINIBAND_NES:-''}
 CONFIG_INFINIBAND_OCRDMA=${CONFIG_INFINIBAND_OCRDMA:-''}
 CONFIG_BE2NET=${CONFIG_BE2NET:-''}
+CONFIG_INFINIBAND_BNXT_RE=${CONFIG_INFINIBAND_BNXT_RE:-''}
+CONFIG_BNXT=${CONFIG_BNXT:-''}
 CONFIG_INFINIBAND_VMWARE_PVRDMA=${CONFIG_INFINIBAND_VMWARE_PVRDMA:-''}
 
 CONFIG_SUNRPC_XPRT_RDMA=${CONFIG_SUNRPC_XPRT_RDMA:-''}
@@ -1045,6 +1068,8 @@ CONFIG_I40E=${CONFIG_I40E}
 CONFIG_INFINIBAND_NES=${CONFIG_INFINIBAND_NES}
 CONFIG_INFINIBAND_OCRDMA=${CONFIG_INFINIBAND_OCRDMA}
 CONFIG_BE2NET=${CONFIG_BE2NET}
+CONFIG_INFINIBAND_BNXT_RE=${CONFIG_INFINIBAND_BNXT_RE}
+CONFIG_BNXT=${CONFIG_BNXT}
 CONFIG_INFINIBAND_VMWARE_PVRDMA=${CONFIG_INFINIBAND_VMWARE_PVRDMA}
 
 CONFIG_SUNRPC_XPRT_RDMA=${CONFIG_SUNRPC_XPRT_RDMA}
@@ -1360,6 +1385,16 @@ if [ "X${CONFIG_BE2NET}" == "Xm" ]; then
 else
         DEFINE_BE2NET="#undef CONFIG_BE2NET"
 fi
+if [ "X${CONFIG_INFINIBAND_BNXT_RE}" == "Xm" ]; then
+        DEFINE_INFINIBAND_BNXT_RE="#undef CONFIG_INFINIBAND_BNXT_RE\n#define CONFIG_INFINIBAND_BNXT_RE 1"
+else
+        DEFINE_INFINIBAND_BNXT_RE="#undef CONFIG_INFINIBAND_BNXT_RE"
+fi
+if [ "X${CONFIG_BNXT}" == "Xm" ]; then
+        DEFINE_BNXT="#undef CONFIG_BNXT\n#define CONFIG_BNXT 1"
+else
+        DEFINE_BNXT="#undef CONFIG_BNXT"
+fi
 if [ "X${CONFIG_INFINIBAND_NES_DEBUG}" == "Xy" ]; then
         DEFINE_INFINIBAND_NES_DEBUG="#undef CONFIG_INFINIBAND_NES_DEBUG\n#define CONFIG_INFINIBAND_NES_DEBUG 1"
 else
@@ -1466,6 +1501,8 @@ $(echo -e "${DEFINE_I40E}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_NES}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_OCRDMA}" | grep -v undef)
 $(echo -e "${DEFINE_BE2NET}" | grep -v undef)
+$(echo -e "${DEFINE_INFINIBAND_BNXT_RE}" | grep -v undef)
+$(echo -e "${DEFINE_BNXT}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_VMWARE_PVRDMA}" | grep -v undef)
 
 $(echo -e "${DEFINE_SUNRPC_XPRT_RDMA}" | grep -v undef)
@@ -1581,6 +1618,8 @@ else
 #undef CONFIG_INFINIBAND_NES_DEBUG
 #undef CONFIG_INFINIBAND_OCRDMA
 #undef CONFIG_BE2NET
+#undef CONFIG_INFINIBAND_BNXT_RE
+#undef CONFIG_BNXT
 #undef CONFIG_INFINIBAND_VMWARE_PVRDMA
 
 #undef CONFIG_SUNRPC_XPRT_RDMA
@@ -1631,6 +1670,8 @@ $(echo -e "${DEFINE_I40E}")
 $(echo -e "${DEFINE_INFINIBAND_NES}")
 $(echo -e "${DEFINE_INFINIBAND_OCRDMA}")
 $(echo -e "${DEFINE_BE2NET}")
+$(echo -e "${DEFINE_INFINIBAND_BNXT_RE}")
+$(echo -e "${DEFINE_BNXT}")
 $(echo -e "${DEFINE_INFINIBAND_VMWARE_PVRDMA}")
 
 $(echo -e "${DEFINE_SUNRPC_XPRT_RDMA}")
index 54319ed..95bc522 100644 (file)
--- a/makefile
+++ b/makefile
@@ -159,6 +159,7 @@ kernel: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF)
                CONFIG_QED_LL2=$(CONFIG_INFINIBAND_QEDR) \
                CONFIG_QED_RDMA=$(CONFIG_INFINIBAND_QEDR) \
                CONFIG_INFINIBAND_QEDR=$(CONFIG_INFINIBAND_QEDR) \
+               CONFIG_INFINIBAND_BNXT_RE=$(CONFIG_INFINIBAND_BNXT_RE) \
                LINUXINCLUDE=' \
                -D__OFED_BUILD__ \
                -D__KERNEL__ \
index c54a381..21bc220 100644 (file)
@@ -5,6 +5,7 @@ drivers/net/ethernet/emulex/benet/
 drivers/net/ethernet/mellanox/
 drivers/net/ethernet/intel/i40e/
 drivers/net/ethernet/qlogic/
+drivers/net/ethernet/broadcom/bnxt/
 include/linux/mlx4/
 include/linux/mlx5/
 include/linux/qed/