Pull in latest axone-simics release

New Features
------------
1- OCMB doorebll mmio and i2c path fix
2- All uchip registers present in the cec-chip and initail values set
3- #V vpd support with fix to PG keyword

Change-Id: Ib302fd1dbe0b80a6d7b3462a0bf77596b0967a42
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77306
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matthew Raybuck <matthew.raybuck@ibm.com>
Reviewed-by: Ilya Smirnov <ismirno@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 43 insertions, 4 deletions

diff --git a/src/build/citest/cxxtest-start.sh b/src/build/citest/cxxtest-start.sh
index d857fd270..ede7845d4 100755
--- a/src/build/citest/cxxtest-start.sh
+++ b/src/build/citest/cxxtest-start.sh
@@ -38,7 +38,7 @@ if [ "$MACHINE" != "NIMBUS" ] && [ "$MACHINE" != "CUMULUS" ] && \
    [ "$MACHINE" != "CUMULUS_CDIMM" ] && [ "$MACHINE" != "FSPBUILD" ];
 then
     export PATH=$PATH:$SANDBOXBASE/simics/
-    export START_SIMICS_CMD="runsim -m $MACHINE hb_script_to_run=$SANDBOXBASE/obj/ppc/simu/scripts/hbfw/startup.simics pnor_img=$SANDBOXBASE/obj/ppc/hbfw/img/axone.pnor sbe_seeprom_img=$SANDBOXBASE/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/93089f4195ff3941cf4e62de103ba902"
+    export START_SIMICS_CMD="runsim -m $MACHINE hb_script_to_run=$SANDBOXBASE/obj/ppc/simu/scripts/hbfw/startup.simics pnor_img=$SANDBOXBASE/obj/ppc/hbfw/img/axone.pnor sbe_seeprom_img=$SANDBOXBASE/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/53e4ec8a5d8439c961a18442bef70102"
 fi
 
 #   Front end to autocitest - script to execute unit tests under simics.
diff --git a/src/build/citest/etc/simbuild b/src/build/citest/etc/simbuild
index 59bc920a4..50830468e 100644
--- a/src/build/citest/etc/simbuild
+++ b/src/build/citest/etc/simbuild
@@ -1 +1 @@
-/gsa/ausgsa/projects/h/hostboot/simbuild/05_01_19_a9c398_simics.tar.gz
+/gsa/ausgsa/projects/h/hostboot/simbuild/05_13_19_51fe0c_simics.tar.gz
diff --git a/src/build/simics/standalone.simics b/src/build/simics/standalone.simics
index 39a382303..ec6bab9cb 100755
--- a/src/build/simics/standalone.simics
+++ b/src/build/simics/standalone.simics
@@ -108,3 +108,42 @@ if ($hb_mode == 1) {
     ($hb_masterproc_cecchip).invoke parallel_store FSIMBOX 0x01 "80000000" 32
     ($hb_masterproc_cecchip).invoke parallel_store FSIMBOX 0x08 "00080000" 32
 }
+
+###############################
+#Initialize Explorer Registers
+###############################
+if ($hb_mode == 0) { #Only do this on Axone and later models that have Explorer chip
+
+    # IDEC register consumed by Hostboot
+    # UCHIP(0x2134)=0x100600D2
+    set-class-attr ocmb  mscc_regs_xcbi_chip_info 0x100600D2
+
+    # Loop over all explorer chips
+    foreach $obj in (get-object-list ocmb -all){
+
+        # RAM1 image ID consumed by Hostboot
+        # UCHIP(0x2200)=0x00000000
+        $obj->mscc_regs_xcbi_ram1[0] = 0x00000000
+
+        # RAM1 hash value registers consumed by Hostboot
+        # This matches the hash of zero-filled 4k file.
+        $obj->mscc_regs_xcbi_ram1[1] = 0x2D23913D
+        $obj->mscc_regs_xcbi_ram1[2] = 0x3759EF01
+        $obj->mscc_regs_xcbi_ram1[3] = 0x704A86B4
+        $obj->mscc_regs_xcbi_ram1[4] = 0xBEE3AC8A
+        $obj->mscc_regs_xcbi_ram1[5] = 0x29002313
+        $obj->mscc_regs_xcbi_ram1[6] = 0xECC98A74
+        $obj->mscc_regs_xcbi_ram1[7] = 0x24425A78
+        $obj->mscc_regs_xcbi_ram1[8] = 0x170F2195
+        $obj->mscc_regs_xcbi_ram1[9] = 0x77822FD7
+        $obj->mscc_regs_xcbi_ram1[10] = 0x7E4AE963
+        $obj->mscc_regs_xcbi_ram1[11] = 0x13547696
+        $obj->mscc_regs_xcbi_ram1[12] = 0xAD7D5949
+        $obj->mscc_regs_xcbi_ram1[13] = 0xB58E12D5
+        $obj->mscc_regs_xcbi_ram1[14] = 0x063EF2EE
+        $obj->mscc_regs_xcbi_ram1[15] = 0x063B5957
+        $obj->mscc_regs_xcbi_ram1[16] = 0x40A3A12D
+    }
+}
+
+
diff --git a/src/build/tools/hb b/src/build/tools/hb
index 41caa5a8b..bbb8a7880 100755
--- a/src/build/tools/hb
+++ b/src/build/tools/hb
@@ -424,8 +424,8 @@ hb_startsimics()
         #export MYDIR=$bb/obj/ppc/hbfw/simics/startup.simics
         #then /runsim -m axone -o hb_script_to_run=$MYDIR
         export MY_DIR="${SANDBOXBASE}/obj/ppc/simu/scripts/hbfw"
-        echo "cd ${SANDBOXBASE}/simics/ && ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor sbe_seeprom_img=${SANDBOXBASE}/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/93089f4195ff3941cf4e62de103ba902"
-        execute_in_sandbox "cd ${SANDBOXBASE}/simics/ && ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor sbe_seeprom_img=${SANDBOXBASE}/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/93089f4195ff3941cf4e62de103ba902" "ppc"
+        echo "cd ${SANDBOXBASE}/simics/ && ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor sbe_seeprom_img=${SANDBOXBASE}/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/53e4ec8a5d8439c961a18442bef70102"
+        execute_in_sandbox "cd ${SANDBOXBASE}/simics/ && ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor sbe_seeprom_img=${SANDBOXBASE}/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/53e4ec8a5d8439c961a18442bef70102" "ppc"
     else
         execute_in_sandbox \
             "start_simics -machine ${MACHINE} ${SIMICSOPTIONS} $*"  "ppc"