summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Gupta <sgupta2m@in.ibm.com>2017-05-31 01:47:00 -0500
committerSachin Gupta <sgupta2m@in.ibm.com>2017-05-31 05:20:09 -0400
commitbcbe74a0770581a51e827291d93201d0fd1f8251 (patch)
treed1eb893b2c9b11f1b030b8bae50c072ffc3cc005
parent59c8bfeec459b3508d5d8a1662518a4032f9c239 (diff)
downloadtalos-sbe-bcbe74a0770581a51e827291d93201d0fd1f8251.tar.gz
talos-sbe-bcbe74a0770581a51e827291d93201d0fd1f8251.zip
Enable tools to take fsp-trace from system path
fsp-trace is not created as part of sbe build output. So will use system path for fsp-trace. It can be overridden by manually putting fsp-trace in sbe build output. Change-Id: Ia27de410f3c705e7fc9f6d0604977e0074849a46 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41154 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: RAJA DAS <rajadas2@in.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Shakeeb A. Pasha B K <shakeebbk@in.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
-rwxr-xr-xsrc/tools/debug/sbe-debug.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/tools/debug/sbe-debug.py b/src/tools/debug/sbe-debug.py
index db3b424e..f4359b95 100755
--- a/src/tools/debug/sbe-debug.py
+++ b/src/tools/debug/sbe-debug.py
@@ -32,6 +32,7 @@ import sys
import binascii
err = False
+baseAddr = 0xfffe8000
syms = {};
if 'SBE_TOOLS_PATH' in os.environ:
SBE_TOOLS_PATH = os.environ['SBE_TOOLS_PATH'];
@@ -39,7 +40,12 @@ else:
print "SBE_TOOLS_PATH not defined"
exit(1)
-baseAddr = 0xfffe8000
+def getTraceFilePath():
+ fspTrace = SBE_TOOLS_PATH + "/fsp-trace"
+ if(not os.path.isfile(fspTrace)):
+ fspTrace = "fsp-trace"
+ return fspTrace
+
def fillSymTable(sbeObjDir, target, ddsuffix ):
if (target == 'AWAN'):
@@ -84,7 +90,7 @@ def collectTrace( sbeObjDir, target, node, proc, ddsuffix, file_path ):
print "ERROR running %s: %d " % ( cmd1, rc )
return 1
cmd2 = sbeObjDir + "/ppe2fsp DumpPIBMEM sbetrace.bin "
- cmd3 = (sbeObjDir + "/fsp-trace -s " + sbeObjDir +\
+ cmd3 = (getTraceFilePath() + " -s " + sbeObjDir +\
"/sbeStringFile_"+ddsuffix+" sbetrace.bin > "+\
"sbe_"+str(proc)+"_tracMERG")
cmd4 = "mv DumpPIBMEM dumpPibMem_trace"
@@ -150,7 +156,8 @@ def forcedCollectTrace( sbeObjDir, target, node, proc, ddsuffix, file_path ):
len = "0x1000"
createPibmemDumpFile("DumpPIBMEM", offset, len);
cmd2 = sbeObjDir + "/ppe2fsp DumpPIBMEM sbetrace.bin "
- cmd3 = (sbeObjDir + "/fsp-trace -s " + sbeObjDir +\
+
+ cmd3 = (getTraceFilePath() + " -s " + sbeObjDir +\
"/sbeStringFile_"+ddsuffix+" sbetrace.bin > "+\
"sbe_"+str(proc)+"_tracMERG")
cmd4 = "mv DumpPIBMEM dumpPibMem_trace"
OpenPOWER on IntegriCloud