Skip to content

Commit 30aba79

Browse files
mabaiocchiwghoffa
authored andcommitted
Fix for simics trace when there is a secure memory section
When simics detects the IPL is in secureboot mode a new secure section of cache memory is added which can change the calculation of where the hostboot trace is saved in memory. This commit looks for this scenario and makes the appropriate correction. Change-Id: I4798b0bfbcc3262c2e7de0ffa437186b5d96d5f5 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28154 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com> Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
1 parent d9ee1a1 commit 30aba79

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

src/build/debug/simics-debug-framework.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,18 @@ def magic_instruction_callback(user_arg, cpu, arg):
564564
if 'cache' not in mem_object:
565565
hb_tracBinaryBuffer = hb_tracBinaryBuffer + hb_hrmor - per_node*node_num
566566

567+
# In 'cache' mode look to see if there is a secure section at HRMOR-8K
568+
# If so, add 8K to hb_tracBinaryBuffer as that is where the memory
569+
# space really starts
570+
else:
571+
for entry in mem_map_entries:
572+
#print ">> %d:%s" % (entry[0], entry[1])
573+
if (entry[0] == (hb_hrmor - 8192)):
574+
#print "cache at HRMOR-8K found: Adding 8k (8192) to "\
575+
# "hb_tracBinaryBuffer (0x%x)"%(hb_tracBinaryBuffer)
576+
hb_tracBinaryBuffer += 8192;
577+
break
578+
567579
tracbin = ["hbTracBINARY","hbTracBINARY1","hbTracBINARY2","hbTracBINARY3"]
568580
tracmerg = ["hbTracMERG","hbTracMERG1","hbTracMERG2","hbTracMERG3"]
569581

0 commit comments

Comments
 (0)