From: Jay Sternberg <jay.e.sternberg@intel.com>
Date: Fri, 5 Sep 2014 17:36:13 +0000 (-0700)
Subject: xeon-phi: updates to ofed-mic script
X-Git-Tag: vofed-3.18~109
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ca07cd57165a528671a39641fa3c4ba7429aeeef;p=~emulex%2Ftmp%2Fcompat-rdma%2F.git

xeon-phi: updates to ofed-mic script

Changes include:
 - Start the ibp daemon (ibpd) since udev is not longer being used.
 - Always try to unload ipoib/kmtest on the card
 - Try using another hostname when starting services on the cards
   (i.e. hostname.domain).
---

diff --git a/ofed_scripts/ofed-mic b/ofed_scripts/ofed-mic
index 0f6d487..238b46d 100755
--- a/ofed_scripts/ofed-mic
+++ b/ofed_scripts/ofed-mic
@@ -66,7 +66,7 @@ foreach_card()
 		# Try host-cardN, cardN, host-cardN.domain, in order:
 		for card_hostname in ${names[@]} ; do
 			for cmd in $@; do
-				$cmd $card_hostname $card
+				$cmd $card_hostname $card 2> /dev/null
 			done
 
 			[ $? == 0 ] && break
@@ -196,7 +196,7 @@ start()
 		modprobe ibp_sa_server &&
 		modprobe ibscif
 
-		retval+=$?
+		retval=$?
 		[ $retval -eq 0 ] && eval $_success || eval $_failure
 	fi
 
@@ -204,6 +204,10 @@ start()
 	foreach_card copy_numa_map start_mic
 	retval+=$?
 
+	# set up the special address "mic0:ib" for supporting RDMA CM over
+	# the emulated IB interface (ibscif). this is used for address
+	# resolution only. there is no need to set up "mic1:ib" even if
+	# more than one cards are installed.
 	ip address add 192.0.2.100/24 dev mic0 label mic0:ib
 
 	return $retval
@@ -235,7 +239,7 @@ stop()
 		stop_module ibp_cm_server
 		retval+=$?
 
-		killall -q /usr/sbin/ibpd
+		kill $(pidof /usr/sbin/ibpd) &>/dev/null
 		stop_module ibp_server
 		retval+=$?