From 2036874cf4c072c04b96b69e5b965a788fc77a6d Mon Sep 17 00:00:00 2001
From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Mon, 6 Aug 2012 00:43:36 +0300
Subject: [PATCH] connectx_port_config: remove port type restrictions and bug
 fixes

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---
 ofed_scripts/connectx_port_config | 429 +++++++++++++++---------------
 1 file changed, 217 insertions(+), 212 deletions(-)

diff --git a/ofed_scripts/connectx_port_config b/ofed_scripts/connectx_port_config
index 6d026dd..a6b7086 100755
--- a/ofed_scripts/connectx_port_config
+++ b/ofed_scripts/connectx_port_config
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 
 #
 # Copyright (c) 2006 Mellanox Technologies. All rights reserved.
@@ -32,202 +32,208 @@ port_types=( "" "ib" "eth" "auto" )
 
 usage()
 {
-echo "Usage:"
-echo "/sbin/connectx_port_config"
-echo "/sbin/connectx_port_config -s|--show"
-echo "/sbin/connectx_port_config -h|--help"
-echo "/sbin/connectx_port_config [-d|--device <PCI device id>] -c|--conf <port1,port2>"
-echo "Possible port configurations:"
-echo "	eth,eth"
-echo "	ib,ib"
-echo "	ib,eth"
-echo "	ib,auto"
-echo "	auto,auto"
-echo "	auto,eth"
+	echo "Usage:"
+	echo "/sbin/connectx_port_config"
+	echo "/sbin/connectx_port_config -s|--show"
+	echo "/sbin/connectx_port_config -h|--help"
+	echo "/sbin/connectx_port_config [-d|--device <PCI device id>] -c|--conf <port1,port2>"
+	echo "Possible port configurations:"
+	echo "	eth,eth"
+	echo "	eth,ib"
+	echo "	eth,auto"
+	echo "	ib,ib"
+	echo "	ib,eth"
+	echo "	ib,auto"
+	echo "	auto,auto"
+	echo "	auto,eth"
 }
 
 is_integer()
-
 {
-   printf "%s\n" $1 |grep -E "^[+-]?[0-9]+$" > /dev/null
-   return $?
+	printf "%s\n" $1 |grep -E "^[+-]?[0-9]+$" > /dev/null
+	return $?
 }
 
-
-
 # If module $1 is loaded return - 0 else - 1
 is_module()
 {
-local RC
+	local RC
+
+	/sbin/lsmod | grep -w "$1" > /dev/null 2>&1
+	RC=$?
 
-    /sbin/lsmod | grep -w "$1" > /dev/null 2>&1
-    RC=$?
-    
-return $RC        
+	return $RC
 }
 
 # Select PCI device interactively
 select_device()
 {
-printf "Please select device to modify [$dev]: "
-read dev;
-
-if is_integer $dev; then
-    if [ $dev -lt 1 ]; then
-        echo "Illegal index selected, quitting..."; echo
-       exit 1;
-    fi
-
-    if [ -e ${Devices[$dev]}/mlx4_port1 ]; then
-        echo "`echo ${Devices[$dev]} | cut -d '/' -f 6`"; echo
-    else
-        echo "Illegal value selected, quitting..."; echo
-        exit 1			
-    fi
-else
-    echo "Numeric value expected, quitting..."; echo
-    exit 1
-fi
+	printf "Please select device to modify [$dev]: "
+	read dev;
+
+	if is_integer $dev; then
+		if [ $dev -lt 1 ]; then
+			echo "Illegal index selected, quitting..."; echo
+			exit 1;
+		fi
+
+		if [ -e ${Devices[$dev]}/mlx4_port1 ]; then
+			echo "`echo ${Devices[$dev]} | cut -d '/' -f 6`"; echo
+		else
+			echo "Illegal value selected, quitting..."; echo
+			exit 1
+		fi
+	else
+		echo "Numeric value expected, quitting..."; echo
+		exit 1
+	fi
 }
 
 set_device()
 {
-ser=0;
-for d in ${Devices[@]}
-do
-    ser=$(($ser+1))
-    if [ "/sys/bus/pci/devices/${udevice}/" == "$d" ] || [ "/sys/bus/pci/devices/0000:${udevice}/" == "${d}" ] ; then
-    	dev=$ser
-	return
-    fi
-done
+	ser=0;
+	for d in ${Devices[@]}; do
+		ser=$(($ser+1))
+		if [ "/sys/bus/pci/devices/${udevice}/" == "$d" ] || [ "/sys/bus/pci/devices/0000:${udevice}/" == "${d}" ] ; then
+			dev=$ser
+			return
+		fi
+	done
 }
 
 validate_device()
 {
-if [ "$udevice" = "0" ]; then
-    if [ "$comm" != "" ]; then
-            if [ ${#Devices[@]} -gt 1 ]; then
-                echo "More then 1 ConnectX devices found, please specify required device"; echo
-		usage
-		exit 1
-	    fi
-    fi
-    return
-fi
-for d in ${Devices[@]}
-do
-    ser=$(($ser+1))
-    if [ "/sys/bus/pci/devices/${udevice}/" == "$d" ] || [ "/sys/bus/pci/devices/0000:${udevice}/" == "${d}" ] ; then
-        return
-    fi
-done
-echo "Error: illegal device selected."
-exit 1;
+	if [ "$udevice" = "0" ]; then
+		if [ "$comm" != "" ]; then
+			if [ ${#Devices[@]} -gt 1 ]; then
+				echo "More then 1 ConnectX devices found, please specify required device"; echo
+				usage
+				exit 1
+			fi
+		fi
+		return
+	fi
+
+	for d in ${Devices[@]}; do
+		ser=$(($ser+1))
+		if [ "/sys/bus/pci/devices/${udevice}/" == "$d" ] || [ "/sys/bus/pci/devices/0000:${udevice}/" == "${d}" ] ; then
+			return
+		fi
+	done
+	echo "Error: illegal device selected."
+	exit 1;
 }
 
 validate_port_config()
 {
-for conf in "eth,eth" "auto,auto" "auto,eth" "ib,ib" "ib,auto" "ib,eth" "eth" "auto" "ib"; do
-    if [ "$conf" == "$comm" ]; then
-    	return
-    fi
-done
-echo "Error: $comm is not valid port configuration"
-usage
-exit 1;
+	for conf in "eth,eth" "eth,ib" "eth,auto" "auto,auto" "auto,eth" "ib,ib" "ib,auto" "ib,eth" "eth" "auto" "ib"; do
+		if [ "$conf" == "$comm" ]; then
+			return
+		fi
+	done
+	echo "Error: $comm is not valid port configuration"
+	usage
+	exit 1;
 }
 
-prompt_oprtions()
+prompt_options()
 {
-local port=$1
-local options=$2
-if [ "$port" == "2" ]; then
-	if [ -e ${Devices[$dev]}/mlx4_port2 ]; then
-		echo -n ""
+	local port=$1
+	local options=$2
+	if [ "$port" == "2" ]; then
+		if [ -e ${Devices[$dev]}/mlx4_port2 ]; then
+			echo -n ""
+		else
+			return 0
+		fi
+	fi
+
+	printf "Select mode for port $port (${options}): "
+	read mode
+	if is_integer $mode; then
+		if [ $mode -lt 0 ]; then
+			echo "Illegal value selected, quitting..."; echo
+			exit 1
+		fi
+		if [ `echo ${options} | grep ${mode} -wc` == 0 ]; then
+			echo "Illegal value selected, quitting..."; echo
+			exit 1
+		fi
+		return "${mode}"
 	else
-		return 0
+		echo "Illegal value selected, quitting..."; echo
+		exit 1
 	fi
-fi
-printf "Select mode for port $port (${options}): "
-read mode
-if is_integer $mode; then
-    if [ $mode -lt 0 ]; then
-        echo "Illegal value selected, quitting..."; echo
-        exit 1			
-    fi
-    if [ `echo ${options} | grep ${mode} -wc` == 0 ]; then
-        echo "Illegal value selected, quitting..."; echo
-        exit 1			
-    fi
-    return "${mode}"
-else
-    echo "Illegal value selected, quitting..."; echo
-    exit 1
-fi
-}     
+}
 
 show_configuration()
 {
-local cnt=0
-for pci_dev in /sys/bus/pci/devices/*/
-do
-    if [ -e $pci_dev/mlx4_port1 ]; then
-    	echo "--------------------------------"
-	dev=`echo $pci_dev | cut -d '/' -f 6`
-	echo "Port configuration for PCI device: $dev is:"
-	cat ${pci_dev}/mlx4_port1
-	if [ -e $pci_dev/mlx4_port2 ]; then
-		cat ${pci_dev}/mlx4_port2
+	local cnt=0
+	for pci_dev in /sys/bus/pci/devices/*/; do
+		if [ -e $pci_dev/mlx4_port1 ]; then
+			echo "--------------------------------"
+			dev=`echo $pci_dev | cut -d '/' -f 6`
+			echo "Port configuration for PCI device: $dev is:"
+			cat ${pci_dev}/mlx4_port1
+			if [ -e $pci_dev/mlx4_port2 ]; then
+				cat ${pci_dev}/mlx4_port2
+			fi
+			echo "--------------------------------"
+			cnt=$(($cnt+1))
+		fi
+	done
+	if [ $cnt == 0 ]; then
+		echo "No ConnectX devices found or driver not loaded"
 	fi
-    	echo "--------------------------------"
-	cnt=$(($cnt+1))
-    fi
-done
-if [ $cnt == 0 ]; then
-    echo "No ConnectX devices found or driver not loaded"
-fi
 }
 
 save_config()
 {
-if [ -e /etc/infiniband/connectx.conf ]; then
-	perl -ni -e "print unless (/Configuration for $udevice/)" /etc/infiniband/connectx.conf > /dev/null 2>&1
-	perl -ni -e "print unless (/-d $udevice/)" /etc/infiniband/connectx.conf > /dev/null 2>&1
-	echo "# ConnectX Port Configuration for $udevice" >> /etc/infiniband/connectx.conf
-	echo "/sbin/connectx_port_config -d $udevice -c $comm" >> /etc/infiniband/connectx.conf
-fi
+	local configuration_file=/etc/infiniband/connectx.conf
+	local config_comment="# ConnectX Port Configuration for $udevice"
+	local config_line=" -d $udevice -c $comm"
+
+	local add_new_lines=1
+	if [ -e "${configuration_file}" ]; then
+		# check if there is a configuration to the device
+		grep "${udevice}" ${configuration_file} >> /dev/null
+		if [ $? -eq 0 ]; then
+			# replace the configuration lines
+			sed -i "s/#.* ${udevice}/${config_comment}/" ${configuration_file}
+			sed -i "s/.*connectx_port_config.*$udevice.*/\/sbin\/connectx_port_config${config_line}/" ${configuration_file}
+
+			add_new_lines=0
+		fi
+	fi
+
+	# add the configuration lines to the end of the file
+	if [ ${add_new_lines} -ne 0 ]; then
+		echo "${config_comment}" >> ${configuration_file}
+		echo "/sbin/connectx_port_config${config_line}" >> ${configuration_file}
+	fi
 }
 
 set_port_config()
 {
-echo "|----------------------------|"
-echo "| Possible port modes:       |"
-echo "| 1: Infiniband              |"
-echo "| 2: Ethernet                |"
-echo "| 3: AutoSense               |"
-echo "|----------------------------|"
-
-local options="1,2,3"
-prompt_oprtions 1 $options
-comm=${port_types[$?]}
-case "$comm" in
-    "eth")
-    	comm="eth,eth"
-	return
-	;;
-    "ib")
-	prompt_oprtions 2 $options
-    	comm=${comm}","${port_types[$?]}
-	return
-	;;
-    "auto")
-    	options="2,3"
-	prompt_oprtions 2 $options
-    	comm=${comm}","${port_types[$?]}
-	return
-	;;
-esac
+	echo "|----------------------------|"
+	echo "| Possible port modes:       |"
+	echo "| 1: Infiniband              |"
+	echo "| 2: Ethernet                |"
+	echo "| 3: AutoSense               |"
+	echo "|----------------------------|"
+
+	local options="1,2,3"
+
+	prompt_options 1 $options
+	comm=${port_types[$?]}
+	if [ -n "${comm}" ]; then
+		prompt_options 2 $options
+		local port2_conf=${port_types[$?]}
+
+		if [ -n "${port2_conf}" ]; then
+			comm="${comm},${port2_conf}"
+		fi
+	fi
 }
 
 
@@ -237,45 +243,45 @@ comm=""
 #                          Parsing command line                               #
 ###############################################################################
 while [ ! -z "$1" ]; do
-    case "$1" in
-    	-s|--show)
-	    show_configuration
-            if [ -n "$2" ]; then
-		echo "Too many parameters"
-		usage
-		exit 1
-            fi
-	    exit 0
-	    ;;
+	case "$1" in
+	-s|--show)
+		show_configuration
+		if [ -n "$2" ]; then
+			echo "Too many parameters"
+			usage
+			exit 1
+		fi
+		exit 0
+	;;
 	-d|--device)
-            if [ -z "$2" ]; then
-                echo "Error: Illegal input"
-                usage
-                exit 1
-            fi
-	    udevice=$2
-	    shift 2
-	    ;;
+		if [ -z "$2" ]; then
+			echo "Error: Illegal input"
+			usage
+			exit 1
+		fi
+		udevice=$2
+		shift 2
+	;;
 	-c|--conf)
-            if [ -z "$2" ]; then
-                echo "Error: Illegal input"
-                usage
-                exit 1
-            fi
-    	    comm=$2
-	    shift 2;
-	    validate_port_config
-	    ;;
+		if [ -z "$2" ]; then
+			echo "Error: Illegal input"
+			usage
+			exit 1
+		fi
+		comm=$2
+		shift 2;
+		validate_port_config
+	;;
 	-h|--help)
-    	    usage
-	    exit 0
-	    ;;
-        *)
-	    echo "Wrong parameter error: $1"
-	    usage
-	    exit 1
-	    ;;
-    esac
+		usage
+		exit 0
+	;;
+	*)
+		echo "Wrong parameter error: $1"
+		usage
+		exit 1
+	;;
+	esac
 done
 
 #############################################################
@@ -284,9 +290,9 @@ done
 is_module mlx4_core
 RC=$?
 if [ $RC == 1 ]; then
-    echo "Bus driver not loaded, loading..."
-    /sbin/modprobe mlx4_core
-fi   
+	echo "Bus driver not loaded, loading..."
+	/sbin/modprobe mlx4_core
+fi
 
 #############################################################
 # List ConnectX devices                                     #
@@ -294,22 +300,21 @@ fi
 i=0
 echo; echo "ConnectX PCI devices :"
 echo "|----------------------------|"
-for pci_dev in /sys/bus/pci/devices/*/
-do
-    if [ -e $pci_dev/mlx4_port1 ]; then
-	i=`echo "$i + 1" | bc`
-    	Devices[$i]=$pci_dev
-	dev=`echo $pci_dev | cut -d '/' -f 6`
-	echo "| $i             $dev |"
-    fi
+for pci_dev in /sys/bus/pci/devices/*/; do
+	if [ -e $pci_dev/mlx4_port1 ]; then
+		(( i++ ))
+		Devices[$i]=$pci_dev
+		dev=`echo $pci_dev | cut -d '/' -f 6`
+		echo "| $i             $dev |"
+	fi
 done
 echo "|----------------------------|"; echo
 
 validate_device
 
 if [ $i == 0 ]; then
-    echo "No devices found, quiting..."
-    exit 1;
+	echo "No devices found, quiting..."
+	exit 1;
 fi
 
 #############################################################
@@ -317,13 +322,13 @@ fi
 #############################################################
 dev=1
 if [ $i -ne 1 ]; then
-    if [ "$comm" != "" ]; then
-    	if [ "$udevice" != "0" ]; then
-    	    set_device
+	if [ "$comm" != "" ]; then
+		if [ "$udevice" != "0" ]; then
+			set_device
+		fi
+	else
+		select_device
 	fi
-    else
-	select_device
-    fi
 fi
 
 udevice=`echo ${Devices[$dev]} | cut -d '/' -f 6`
@@ -339,11 +344,11 @@ echo
 # Set port configuration for the selected device           #
 ############################################################
 if [ "$comm" == "" ]; then
-    set_port_config
+	set_port_config
 fi
 
-if [ -e ${Devices[$dev]}/mlx4_port2 ]; then
-echo "all" > ${Devices[$dev]}/port_trigger
+if [ -e ${Devices[$dev]}/port_trigger ]; then
+	echo "all" > ${Devices[$dev]}/port_trigger
 fi
 
 comm1=`echo ${comm} | cut -d ',' -f 1`
@@ -354,7 +359,7 @@ echo "${comm1}" > ${Devices[$dev]}/mlx4_port1
 rc=$?
 	if [ -e ${Devices[$dev]}/mlx4_port2 ]; then
 	{
-	echo "${comm2}" > ${Devices[$dev]}/mlx4_port2
+		echo "${comm2}" > ${Devices[$dev]}/mlx4_port2
 	} > /dev/null 2>&1
 	rc=$?
 fi
-- 
2.41.0