Updated VPO tools and proc_start_clock_chiplets v1.10

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

2 files changed, 28 insertions, 42 deletions

diff --git a/src/build/debug/Hostboot/ContTrace.pm b/src/build/debug/Hostboot/ContTrace.pm
index da1b8112d..89a7472ff 100755
--- a/src/build/debug/Hostboot/ContTrace.pm
+++ b/src/build/debug/Hostboot/ContTrace.pm
@@ -1,26 +1,26 @@
 #!/usr/bin/perl
-#  IBM_PROLOG_BEGIN_TAG
-#  This is an automatically generated prolog.
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
 #
-#  $Source: src/build/debug/Hostboot/ContTrace.pm $
+# $Source: src/build/debug/Hostboot/ContTrace.pm $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2012
+# COPYRIGHT International Business Machines Corp. 2012,2013
 #
-#  p1
+# p1
 #
-#  Object Code Only (OCO) source materials
-#  Licensed Internal Code Source Materials
-#  IBM HostBoot Licensed Internal Code
+# Object Code Only (OCO) source materials
+# Licensed Internal Code Source Materials
+# IBM HostBoot Licensed Internal Code
 #
-#  The source code for this program is not published or other-
-#  wise divested of its trade secrets, irrespective of what has
-#  been deposited with the U.S. Copyright Office.
+# The source code for this program is not published or otherwise
+# divested of its trade secrets, irrespective of what has been
+# deposited with the U.S. Copyright Office.
 #
-#  Origin: 30
+# Origin: 30
 #
-#  IBM_PROLOG_END_TAG
+# IBM_PROLOG_END_TAG
 use strict;
 
 package Hostboot::ContTrace;
@@ -91,7 +91,7 @@ sub main
         return;
     }
 
-    my $trigger = ::readScom(0x00050038,8);
+    my $trigger = ::readScom(0x00050038);
     if ($dbgMsg)
     {
         ::userDisplay("$trigger...\n");
@@ -129,7 +129,7 @@ sub main
         ::userDisplay("$cycles\n");
     }
 
-    ::writeScom(0x00050038, 8, 0x0);
+    ::writeScom(0x00050038, 0x0);
 
     open TRACE, ($args->{"fsp-trace"}." -s ".::getImgPath().
                 "hbotStringFile $fsptrace_options $fname |") || die;
diff --git a/src/build/debug/vpo-debug-framework.pl b/src/build/debug/vpo-debug-framework.pl
index 983fb19db..b13ca0a99 100755
--- a/src/build/debug/vpo-debug-framework.pl
+++ b/src/build/debug/vpo-debug-framework.pl
@@ -814,7 +814,6 @@ sub translateAddr
 #   Scom size is always 64-bit
 #
 # @param[in]    scom address to read
-# @param[in]    data size IN BYTES - currently ignored, assumed to be 8
 #
 # @return   hex string containing data read
 #
@@ -823,10 +822,10 @@ sub translateAddr
 sub readScom
 {
     my $addr = shift;
-    my $size = shift;
 
     my  $vpoaddr    =   ::translateAddr( $addr );
 
+    # Use simGETFAC to speed up VPO
     my  $cmd    =   "simGETFAC " .
                     "B0.C0.S0.P0.E8.TPC.FSI.FSI_MAILBOX.FSXCOMP." .
                     "FSXLOG.LBUS_MAILBOX.Q_$vpoaddr.NLC.L2  32";
@@ -839,18 +838,20 @@ sub readScom
     $result =~ s/\n//g;
 
     ## debug
-    ## ::userDisplay  "--- readScom: ",
-    ##     (sprintf("0x%x-->%s, 0x%x : %s", $addr,$vpoaddr,$size,$result)), "\n";
+    #::userDisplay  "--- readScom: ",
+    #    (sprintf("0x%x-->%s, %s", $addr,$vpoaddr,$result)), "\n";
 
     ##  comes in as a 32-bit #, need to shift 32 to match simics
-    return (hex ( "0x" . $result . "00000000" ));
+    my $scomvalue = "0x" . $result;
+    $scomvalue = hex($scomvalue);
+    $scomvalue <<= 32;
+    return ($scomvalue);
 }
 
 # @sub writeScom
 # @brief Write a scom address in VPO.
 #
 # @param[in] - scom address
-# @param[in] - data size IN BYTES - ignored, assumed to be 8
 # @param[in] - binary data value.  Scom value is aways assumed to be 64bits
 #
 # @return none
@@ -860,28 +861,13 @@ sub readScom
 sub writeScom
 {
     my $addr = shift;
-    my $size = shift;
     my $value = shift;
 
-    my $cmd =   "";
-
-    my  $vpoaddr    =   ::translateAddr( $addr );
-
-    ## vpo takes a 32 bit value in the lower 32 bits
-    my  $value32    =   ( ( $value >> 32 ) & 0x00000000ffffffff );
-    my  $valuestr   =   sprintf( "0x%x", $value32 );
-
-    ## debug
-    ## ::userDisplay  "--- writeScom: ",
-    ##     (sprintf("0x%x-->%s, 0x%x, %s",$addr,$vpoaddr,$size,$valuestr)), "\n";
-
-    ##  now go ahead and write the real value
-    $cmd    =   "simSTKFAC " .
-                 "B0.C0.S0.P0.E8.TPC.FSI.FSI_MAILBOX.FSXCOMP." .
-                 "FSXLOG.LBUS_MAILBOX.Q_$vpoaddr.NLC.L2 $valuestr 32 -quiet";
+    my  $addrstr = sprintf( "%08x", $addr );
+    my  $valuestr = sprintf( "%016x", $value );
 
-    ( system( $cmd ) == 0 )
-        or die "$cmd failed, $? : $! \n";
+    # Use putscom because simPUTFAC doesn't work consistenly
+    system("putscom pu $addrstr $valuestr -cft -quiet");
 
     return;
 }
@@ -898,7 +884,7 @@ sub checkContTrace()
     my  $SCRATCH_MBOX0  =   0x00050038;
     my  $contTrace      =   "";
 
-    $contTrace  =   ::readScom( $SCRATCH_MBOX0, 8 );
+    $contTrace  =   ::readScom( $SCRATCH_MBOX0 );
     if ( $contTrace != 0  )
     {
         ##  activate continuous trace