From: Tatyana Nikolova <tatyana.e.nikolova@intel.com>
Date: Wed, 17 May 2017 04:15:41 +0000 (-0500)
Subject: compat-rdma: Add i40iw to openibd
X-Git-Tag: vofed-4.8-rc3~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6e3626ca32716d3f3a890f26f821227b7276f707;p=compat-rdma%2Fcompat-rdma.git

compat-rdma: Add i40iw to openibd

Add i40iw to openibd to load the module
at boot, if it is selected.

Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@intel.com>
---

diff --git a/configure b/configure
index f3173b4..d2f8055 100755
--- a/configure
+++ b/configure
@@ -681,6 +681,7 @@ main()
                         --without-i40iw-mod)
                             CONFIG_INFINIBAND_I40IW=
                             CONFIG_I40E=
+                            add_conf "# Load I40IW modules" "I40IW_LOAD=no"
                         ;;
                         --with-nes-mod)
                             CONFIG_INFINIBAND_NES="m"
diff --git a/ofed_scripts/openibd b/ofed_scripts/openibd
index 7d731d0..91ff444 100644
--- a/ofed_scripts/openibd
+++ b/ofed_scripts/openibd
@@ -263,14 +263,14 @@ fi
 
 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="ib_mthca mlx5_ib mlx5_core mlx4_ib ib_ipath ipath_core ib_ehca iw_nes i40iw 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"
 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 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 vmw_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 i40iw vmw_pvrdma"
 STATUS_MODULES="$STATUS_MODULES ib_qib ocrdma"
 
 if (modinfo scsi_transport_srp 2>/dev/null | grep depends: | grep -q compat 2>/dev/null) ||
@@ -755,7 +755,7 @@ start()
     fi
 
     # W/A: inbox drivers are loaded at boot instead of new ones
-    local loaded_modules=$(/sbin/lsmod 2>/dev/null | grep -E '^be2net|^cxgb|^mlx|^iw_nes|^iw_cxgb|^ib_qib|^ib_mthca|^ocrdma|^ib_ipoib|^ib_srp|^ib_iser|^ib_uverbs|^ib_addr|^ib_mad|^ib_sa|^iw_cm|^ib_core|^ib_ucm|^ib_cm|^rdma_ucm|^ib_umad|^rdma_cm|^compat' | awk '{print $1}')
+    local loaded_modules=$(/sbin/lsmod 2>/dev/null | grep -E '^be2net|^cxgb|^mlx|^iw_nes|^i40iw|^iw_cxgb|^ib_qib|^ib_mthca|^ocrdma|^ib_ipoib|^ib_srp|^ib_iser|^ib_uverbs|^ib_addr|^ib_mad|^ib_sa|^iw_cm|^ib_core|^ib_ucm|^ib_cm|^rdma_ucm|^ib_umad|^rdma_cm|^compat' | awk '{print $1}')
     for loaded_module in $loaded_modules
     do
         local loaded_srcver=$(/bin/cat /sys/module/$loaded_module/srcversion 2>/dev/null)
@@ -942,6 +942,17 @@ start()
         RC=$[ $RC + $my_rc ]
     fi
 
+    # Load i40iw driver
+    if [ "X${I40IW_LOAD}" == "Xyes" ]; then
+        fix_location_codes
+        load_module i40iw
+        my_rc=$?
+        if [ $my_rc -ne 0 ]; then
+                echo_failure $"Loading i40iw driver: "
+        fi
+        RC=$[ $RC + $my_rc ]
+    fi
+
     # Load Emulex One Connect driver
     if [ "X${OCRDMA_LOAD}" == "Xyes" ]; then
         load_module ocrdma
@@ -1246,7 +1257,7 @@ unload()
                     unload_rec $mod
                     sleep 2
                     ;;
-                ib_mthca | mlx4_ib | mlx5_ib | ib_ehca | iw_cxgb3 | iw_cxgb4 | iw_nes)
+                ib_mthca | mlx4_ib | mlx5_ib | ib_ehca | iw_cxgb3 | iw_cxgb4 | iw_nes | i40iw)
                     unload_rec $mod
                     sleep 2
                     ;;
@@ -1466,7 +1477,7 @@ status()
 {
     local RC=0
 
-       if is_module ib_mthca || is_module mlx4_core || is_module mlx5_core || is_module ib_qib || is_module ib_ipath || is_module ib_ehca || is_module iw_cxgb3 || is_module iw_cxgb4 || is_module iw_nes; then
+       if is_module ib_mthca || is_module mlx4_core || is_module mlx5_core || is_module ib_qib || is_module ib_ipath || is_module ib_ehca || is_module iw_cxgb3 || is_module iw_cxgb4 || is_module iw_nes || is_module i40iw; then
                echo
                echo "  HCA driver loaded"
                echo