From d09e67a0a55418f2878d016f372bc751b549d535 Mon Sep 17 00:00:00 2001 From: Christian Geddes Date: Tue, 12 Mar 2019 16:16:02 -0500 Subject: Update simics release that Axone is using and adjust simics script Simics team has released a new version of simics that adds support for get-master-pnors , support for get-dimms, fixes a TPM issues, and tries to fix an indirect scom issue (not sure its really resolved) Change-Id: I4ba1c249fae2a5428808c4e7682c88ad301f8f1c Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/73206 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW Reviewed-by: Matt Derksen Reviewed-by: William G. Hoffa Reviewed-by: Daniel M. Crowell --- src/build/citest/etc/simbuild | 2 +- src/build/simics/standalone.simics | 47 ++++++++++++++------------------------ 2 files changed, 18 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/build/citest/etc/simbuild b/src/build/citest/etc/simbuild index ead58160a..1df83afb4 100644 --- a/src/build/citest/etc/simbuild +++ b/src/build/citest/etc/simbuild @@ -1 +1 @@ -/gsa/ausgsa/projects/h/hostboot/simbuild/02_26_19_1d473b_simics.tar.gz \ No newline at end of file +/gsa/ausgsa/projects/h/hostboot/simbuild/03_12_19_47bded_simics.tar.gz diff --git a/src/build/simics/standalone.simics b/src/build/simics/standalone.simics index b256e5230..121a67756 100755 --- a/src/build/simics/standalone.simics +++ b/src/build/simics/standalone.simics @@ -7,6 +7,12 @@ # Default value is to preload VPD into PNOR image if not defined hb_skip_vpd_preload {$hb_skip_vpd_preload = 0} + +if ($hb_mode == 0) { + # this number is no longer provided we have to look it up + $num_dimms = (dec (list-length((get-master-procs)[0].get-dimms))) +} + # Preload VPD in PNOR unless told not to if ($hb_skip_vpd_preload == 0) { @@ -14,12 +20,15 @@ if ($hb_skip_vpd_preload == 0) { if (get-object-list proc_hb_standalone) { $procChipType=(get-object-list proc_hb_standalone)[0]->chip_type python "os.environ['HB_PROC_CHIP_TYPE'] = \""+$procChipType+"\"" - } - if (get-object-list p9_proc) { + } else if (get-object-list p9_proc) { $procChipType=(get-object-list p9_proc)[0]->chip_type python "os.environ['HB_PROC_CHIP_TYPE'] = \""+$procChipType+"\"" + } else { + $procChipType=($hb_masterproc)->chip_type + python "os.environ['HB_PROC_CHIP_TYPE'] = \""+$procChipType+"\"" } + try { run-python-file (lookup-file hbfw/hb-pnor-vpd-preload.py) # Must match pnor layout used (see eyecatch in layout) @@ -42,38 +51,16 @@ if ($hb_skip_vpd_preload == 0) { if ($hb_mode == 0){ $dimmSpd = $hb_script_location + "/dimmspd.dat" - proc_hb0.seeprom0_image.load-file $vpd_proc + $hb_masterproc.seeprom0_image.load-file $vpd_proc echo " - loaded MVPD to seeprom0" - proc_hb0.seeprom2_image.load-file $vpd_proc + $hb_masterproc.seeprom2_image.load-file $vpd_proc echo " - loaded MVPD to seeprom2" - ddimm0.VPD_0_image.load-file $dimmSpd - echo " - loaded SPD to DDIMM0" - - ddimm1.VPD_0_image.load-file $dimmSpd - echo " - loaded SPD to DDIMM1" - - ddimm2.VPD_0_image.load-file $dimmSpd - echo " - loaded SPD to DDIMM2" - - ddimm3.VPD_0_image.load-file $dimmSpd - echo " - loaded SPD to DDIMM3" - - ddimm4.VPD_0_image.load-file $dimmSpd - echo " - loaded SPD to DDIMM4" - - ddimm5.VPD_0_image.load-file $dimmSpd - echo " - loaded SPD to DDIMM5" - - ddimm6.VPD_0_image.load-file $dimmSpd - echo " - loaded SPD to DDIMM6" - - ddimm7.VPD_0_image.load-file $dimmSpd - echo " - loaded SPD to DDIMM7" - - ddimm8.VPD_0_image.load-file $dimmSpd - echo " - loaded SPD to DDIMM8" + foreach $dimm in (($hb_masterproc).get-dimms) { + $dimm.VPD_0_image.load-file $dimmSpd + } + echo " - loaded SPD to all dimms on master proc" } # Turn on all processor cec-chips -- cgit v1.2.3