Integrate proc_start_clocks_chiplets hw procedure

RTC: 39854
Change-Id: I0e6f51a41e5543beca1f97482aa0494bf067a7a3
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/913
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Tested-by: Jenkins Server

3 files changed, 87 insertions, 82 deletions

diff --git a/src/build/vpo/Setup_Env b/src/build/vpo/Setup_Env
index 85687c80b..8cfd9af7a 100644
--- a/src/build/vpo/Setup_Env
+++ b/src/build/vpo/Setup_Env
@@ -3,7 +3,10 @@
 # Setup intialization source script for HostBoot Sprint Release VPO/VBU model testing with cronus tools
 #
 #
-# Version 1.0   Copy from Jim's on 03/21/2012, tested on VBU & VPO
+# Version 1.0  Copy from   Jim's on 03/21/2012, tested on VBU & VPO
+# Version 1.1  04-16-2012  Update to run with sprint 11 image
+#                          Sync with Jim's version.
+#                
 #
 ################################################################################
 
@@ -15,11 +18,18 @@ export JD=$JP/auto/dev
 export JT=$JP/auto/tmp
 export JS=$JP/HBI/scripts
 
+# Process arguments so they can be passed down to automated tools
+. $JR/autotest.args
+
+# Pick up any user specified command, otherwise default to no test
+export AUTOVBU_USER_CMD="`echo \"$my_arg_list\" | sed -n -e 's/[ ]*-- / -|- /' -e 's/.* -|- //p'`"
+test "$AUTOVBU_USER_CMD" = "" && AUTOVBU_USER_CMD=NO_TEST
+
 # Local values used in this script
 
 AUTOVBU_HBRELEASE_BASEDIR=/gsa/ausgsa/projects/h/hostboot/release
-AUTOVBU_HBTOOLS_BASEDIR=$JP/HBI/hbtools
-AUTOVBU_HBVBUTOOLS_BASEDIR=$JP/HBI/vbutools
+AUTOVBU_HBTOOLS_BASEDIR=/afs/apd.pok.ibm.com/u/thi/hbtools
+AUTOVBU_HBVBUTOOLS_BASEDIR=/gsa/ausgsa/projects/h/hostboot/vbutools
 	
 # Remove any previous test definitions for HostBoot values - force everything to default if not set
 # by Setup_MyEnv function or user specifed argument(s)
@@ -38,16 +48,17 @@ Setup_MyEnv() {
 	
 	# Default Sprint release
 
-	sprint=Sprint10
+	sprint=hb0406a_1214.810
 	
 	# Initialize HostBoot environment/cronus/tools - note new naming convention
 	
-	export AUTOVBU_CRONUS_SIM=rel.20120312
-	export HB_TOOLS=$AUTOVBU_HBTOOLS_BASEDIR/rel.20120320
+	export AUTOVBU_CRONUS_SIM=rel.20120409
+	export GLOBAL_DEBUG=8.VW.Vc.dG.F3.0I.E8.V
+	export HB_TOOLS=$AUTOVBU_HBTOOLS_BASEDIR/rel.04162012
 
 	# Select default model -- choose either VBU or VPO versions
 
-	export VPO_MODEL=m_1_c; unset VBU_MODEL; VBUVPO=VPO
+	export VPO_MODEL=m_2_a; unset VBU_MODEL; VBUVPO=VPO
 	#export VBU_MODEL=p1_e8056_c1000_cen1_cen054_unopt_2_gfw; unset VPO_MODEL; VBUVPO=VBU
 	#export VBU_MODEL=p1_e8062_wafer_nomem_c1000_opt_4; unset VPO_MODEL; VBUVPO=VBU
 	#export VBU_MODEL=p1_e8062_c1000_cen1_cen061_unopt_1; unset VPO_MODEL; VBUVPO=VBU
@@ -66,7 +77,6 @@ Setup_MyEnv() {
 	
 	# Values used internally by automated tools
 
-	export AUTOVBU_USER_CMD=NO_TEST
 	export AUTOVPO_ROOTDIR=/afs/apd/func/awanng/vpo/vpo1/mur
 
 	test "$MY_BSO_ID" = "" && echo "Warning: Set MY_BSO_ID to IBM intranet ID if BSO firewall required"
@@ -88,8 +98,6 @@ Setup_MyArgs() {
 	# Set argument defaults
 
 	get_awan=
-	eval_list=
-	set_usercmd=
 	load_hb_img=
 	
 	# Argument parse loop
@@ -157,25 +165,15 @@ Setup_MyArgs() {
 			--)
 				;;
 			*=*)
-				eval_list="$eval_list; export $1"
+				# Add 'export' to each variable specified so it gets passed to test specific functions
+				eval "export `echo \"$1\" | sed -e \"s/=/='/\" -e \"s/$/'/\"`"
 				;;
 			*)
-				test "$set_usercmd" = "" && AUTOVBU_USER_CMD="$*" && set_usercmd=yes
 				;;
 		esac
+                 
 		shift
 	done
-	
-	# Any additional arguments are assumed to be for a user specified test script
-	
-	test "$1" = "--" && shift
-	test "$*" != "" && AUTOVBU_USER_CMD="$*"
-
-	# Now process any command line environmental settings
-
-	test "$eval_list" != "" && eval "$eval_list"
-
-	unset eval_list set_usercmd
 }
 
 # Dynamically set/reset values based upon current model
@@ -232,7 +230,7 @@ Setup_MyDynamic() {
 			;;
 		*)
 			export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1}
-			export AWAN_SCRIPT=${AWAN_SCRIPT-run_script_star8b_p8s1}
+			export AWAN_SCRIPT=${AWAN_SCRIPT-run_script_star8b}
 			export AWAN_CONFIG=${AWAN_CONFIG-star8b}
 			;;
 	esac
@@ -281,6 +279,11 @@ Setup_MyAWAN() {
 	MY_AWAN_KEEP=/afs/apd.pok.ibm.com/u/${MY_AFS_USER-$USER}/awan/awan.KEEP-$VBU_MODEL$VPO_MODEL-${MY_AWAN_DIR-${MY_AFS_USER-$USER}}-$DISPLAY
 		
 	if [ "$get_awan" = "YES" ]; then
+		# Add environmental definitions for automated test
+		eval export P8_${VBUVPO}DD1_${VPO_MODEL}${VBU_MODEL}_AWAN_SCRIPT="$AWAN_SCRIPT"
+		eval export P8_${VBUVPO}DD1_${VPO_MODEL}${VBU_MODEL}_AUTOVBU_ECMD_VER="$AUTOVBU_ECMD_VER"
+		eval export P8_${VBUVPO}DD1_${VPO_MODEL}${VBU_MODEL}_AUTOVBU_CRONUS_SIM="$AUTOVBU_CRONUS_SIM"
+		#export -p | egrep "P8_${VBUVPO}DD1_.*AWAN_SCRIPT"; echo
 		(
 		# Check to see if we must lower BSO firewall
 	
@@ -311,17 +314,19 @@ Setup_MyAWAN() {
 		fi
 
 		# Request AWAN and wait for it to initialize
-		
+
+		echo
+		echo "AUTOVBU_USER_CMD=$AUTOVBU_USER_CMD"
 		echo
 		echo "Requesting an AWAN:"
 		echo
-		eval export P8_${VBUVPO}DD1_${VPO_MODEL}${VBU_MODEL}_AWAN_SCRIPT="$AWAN_SCRIPT"
-		#export -p | egrep "P8_${VBUVPO}DD1_.*AWAN_SCRIPT"; echo
 		vbuvpo=`echo $VBUVPO | tr '[A-Z]' '[a-z]'`
-		echo "$JR/auto${vbuvpo}test $my_bso_cmd --silent --keep_awan SIMDISP_RELEASE=$SIMDISP_RELEASE -- : $VBU_MODEL$VPO_MODEL:$AWAN_CONFIG:HBI=\\\$AUTOVBU_USER_CMD"
+		echo "$JR/auto${vbuvpo}test $my_bso_cmd --silent --keep_awan SIMDISP_RELEASE=$SIMDISP_RELEASE AUTOVBU_ECMD_VER=$AUTOVBU_ECMD_VER AUTOVBU_CRONUS_SIM=$AUTOVBU_CRONUS_SIM \\"
+		echo "			-- : $VBU_MODEL$VPO_MODEL:$AWAN_CONFIG:HBI=\\\$AUTOVBU_USER_CMD"
 		echo
 	
-		$JR/auto${vbuvpo}test $my_bso_cmd --silent --keep_awan SIMDISP_RELEASE=$SIMDISP_RELEASE -- : $VBU_MODEL$VPO_MODEL:$AWAN_CONFIG:HBI=\$AUTOVBU_USER_CMD
+		$JR/auto${vbuvpo}test $my_bso_cmd --silent --keep_awan SIMDISP_RELEASE=$SIMDISP_RELEASE AUTOVBU_ECMD_VER=$AUTOVBU_ECMD_VER AUTOVBU_CRONUS_SIM=$AUTOVBU_CRONUS_SIM \
+					-- : $VBU_MODEL$VPO_MODEL:$AWAN_CONFIG:HBI=\$AUTOVBU_USER_CMD
 		) || return 1
 	fi
 }
@@ -361,13 +366,12 @@ Setup_MyTarget() {
 	
 	if [ -f "$CRONUS_HOME/cnfgs/${my_target}_cnfg" ]; then
 		# Update target cronus config file
-		ed $CRONUS_HOME/cnfgs/${my_target}_cnfg <<__EOF__ >/dev/null 2>&1
-g/^HW_PROCEDURE_PATH/s,.*,HW_PROCEDURE_PATH = $HB_VBUTOOLS,
-w
-q
-__EOF__
-		egrep "^HW_PROCEDURE_PATH" $CRONUS_HOME/cnfgs/${my_target}_cnfg
-	
+
+		setconfig HW_PROCEDURE_PATH $HB_VBUTOOLS  -quiet
+		getconfig HW_PROCEDURE_PATH -quiet
+
+		setconfig GLOBAL_DEBUG $GLOBAL_DEBUG -quiet
+		getconfig GLOBAL_DEBUG -quiet
 	else
 		echo
 		echo "*** WARNING: AWAN target config file was not found"
@@ -439,7 +443,8 @@ Setup_MyEnv || return 1
 
 # Now process any argument overrides
 
-Setup_MyArgs $* || return 1
+eval Setup_MyArgs  "`echo \"$my_arg_list\"`" || return 1
+
 
 # Perform dynamic adjustments based upon current settings
 
diff --git a/src/build/vpo/do_sprint b/src/build/vpo/do_sprint
index d64a1f4f9..1d6690eb6 100755
--- a/src/build/vpo/do_sprint
+++ b/src/build/vpo/do_sprint
@@ -28,10 +28,13 @@
 #
 
 #
-# Version 1.0   Copy from Jim's on 03/21/2012, tested on VBU & VPO
+# Version 1.0   03-21-2012   Copy from Jim's on 03/21/2012, tested on VBU & VPO
+# Version 1.1   04-16-2012   - Update to run with new Sprint 11 image.  Load only these files on L3:
+#                                 hbicore.bin (or hbicore_test.bin if running test image) at address 0
+#                                 vbu.pnor at address 0x400000
+#                            - Sync with Jim's do_sprint'change
 #
 
-
 PGM=`basename $0`
 
 # Include ECMD and autotest aliases
@@ -41,46 +44,47 @@ source $CTEPATH/tools/ecmd/rel/bin/ecmdaliases.ksh
 source $PGM_DIR/autofsp.aliases
 source $PGM_DIR/autovbu.aliases
 
-# Scan argument(s)
-
-set +x
+# Process arguments
+source $PGM_DIR/autotest.args
 
-use_test=
-test_arg=
-
-while [ $# -gt 0 ]
-do
-	case "$1"
-	in
-	-use_dump_l3| \
-	-use_printk|-use_hb_trace|-use_hb_printk| \
-	-run_hb_istep|-chkpt_after_istep| \
-	-stop_after_hbiload|-start_after_hbiload|-start_after_hbitest|-chkpt_after_loops| \
-	-dump_after_hbitest| \
-	-chkpt_after_ipl|-chkpt_after_hbiload|-chkpt_after_hbitest|-chkpt_after_exception)
-		eval "`echo $1|sed -e 's/-//'`=-$1"
+SCAN_ARGS() {
+	use_test=
+	test_arg=
+	
+	while [ $# -gt 0 ]
+	do
+		case "$1"
+		in
+		-use_dump_l3| \
+		-use_printk|-use_hb_trace|-use_hb_printk| \
+		-run_hb_istep|-chkpt_after_istep| \
+		-stop_after_hbiload|-start_after_hbiload|-start_after_hbitest|-chkpt_after_loops| \
+		-dump_after_hbitest| \
+		-chkpt_after_ipl|-chkpt_after_hbiload|-chkpt_after_hbitest|-chkpt_after_exception)
+			eval "`echo $1|sed -e 's/-//'`=-$1"
+				shift
+				;;
+		--use_dump_l3| \
+		--use_printk|--use_hb_trace|--use_hb_printk| \
+		--run_hb_istep|--chkpt_after_istep| \
+		--stop_after_hbiload|--start_after_hbiload|--start_after_hbitest|--chkpt_after_loops| \
+		--dump_after_hbitest| \
+		--chkpt_after_ipl|--chkpt_after_hbiload|--chkpt_after_hbitest|--chkpt_after_exception)
+			eval "`echo $1|sed -e 's/--//'`=$1"
+				shift
+				;;
+		-test|--test)
+			use_test="_test"
+			test_arg="--test"
 			shift
 			;;
-	--use_dump_l3| \
-	--use_printk|--use_hb_trace|--use_hb_printk| \
-	--run_hb_istep|--chkpt_after_istep| \
-	--stop_after_hbiload|--start_after_hbiload|--start_after_hbitest|--chkpt_after_loops| \
-	--dump_after_hbitest| \
-	--chkpt_after_ipl|--chkpt_after_hbiload|--chkpt_after_hbitest|--chkpt_after_exception)
-		eval "`echo $1|sed -e 's/--//'`=$1"
+		*=*)
+			# Add 'export' to each variable specified so it gets passed to test specific functions
+			eval "export `echo \"$1\" | sed -e \"s/=/='/\" -e \"s/$/'/\"`"
 			shift
 			;;
-	-test|--test)
-		use_test="_test"
-		test_arg="--test"
-		shift
-		;;
-	*=*)	# export var=value settings
-		eval "export $1"
-		shift
-		;;
-	*)
-		cat <<__EOF__
+		*)
+	cat <<__EOF__
 USAGE:	$PGM [flags] [env settings]
 
 Where [flags] can be:
@@ -115,6 +119,9 @@ __EOF__
 		;;
 	esac
 done
+}
+
+eval SCAN_ARGS "`echo \"$my_arg_list\"`" || exit 1
 
 # Sanity check our environment
 
@@ -201,12 +208,7 @@ fi
 
 if [ "$start_after_hbiload" != "--start_after_hbiload" -a "$start_after_hbitest" != "--start_after_hbitest" ]; then
 	/afs/awd/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -f ${HB_IMG}/hbicore${use_test}.bin -b ${CORE--c3} || exit 1
-	/afs/awd/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -f ${HB_IMG}/vbu_targeting.bin \
-				-o $vbu_targeting_addr -b ${CORE--c3} || exit 1
-	/afs/awd/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -f ${HB_IMG}/hbicore${use_test}_extended.bin \
-				-o 0x500690 -b ${CORE--c3} || exit 1
-	/afs/awd/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -f ${HB_IMG}/pnor.toc \
-				-o 0x500000 -b ${CORE--c3} || exit 1
+	/afs/awd/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -f ${HB_IMG}/vbu${use_test}.pnor -o 0x400000 -b ${CORE--c3} || exit 1
 fi
 
 
diff --git a/src/build/vpo/hb-istep b/src/build/vpo/hb-istep
index 6f586feac..6bbcae7a3 100755
--- a/src/build/vpo/hb-istep
+++ b/src/build/vpo/hb-istep
@@ -506,8 +506,6 @@ sub getSyncStatus( )
 
         $result      = VBU_Cacheline::CLread( $statusreg );
 
-        printf  STDERR  "===== count=%d, result=0x%lx\n", $count, $result ;
-
         $seqnum      =   ( ( $result & 0x3f00000000000000 ) >> 56 );
         $running     =   ( ( $result & 0x8000000000000000 ) >> 63 );
         ## if (    ( $running == 0 )