summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcustomrc2
-rw-r--r--sbe/build/citest/etc/patches/standalone.simics.patch4
-rwxr-xr-xsbe/build/citest/etc/workarounds.postsimsetup9
-rwxr-xr-xsbe/test/test.xml4
4 files changed, 14 insertions, 5 deletions
diff --git a/customrc b/customrc
index f7c46aff..b6d8df41 100755
--- a/customrc
+++ b/customrc
@@ -9,6 +9,6 @@ export SANDBOXNAME=test_sb
#export WORKSPACE=<set it to your root ppe directory. This is required if you
# to use build script locally>
export MACHINE=NIMBUS
-export BACKING_BUILD=/esw/fips910/Builds/b0408a_1616.910/
+export BACKING_BUILD=/esw/fips910/Builds/b0415a_1618.910/
export SIMICSOPTIONS="-nre"
diff --git a/sbe/build/citest/etc/patches/standalone.simics.patch b/sbe/build/citest/etc/patches/standalone.simics.patch
new file mode 100644
index 00000000..2c16527e
--- /dev/null
+++ b/sbe/build/citest/etc/patches/standalone.simics.patch
@@ -0,0 +1,4 @@
+50,52d49
+< # Set mailbox scratch registers so that the SBE starts in plck mode
+< ($hb_masterproc).proc_chip.invoke parallel_store SCOM 0x5003F "20000000_00000000" 64
+< ($hb_masterproc).proc_chip.invoke parallel_store SCOM 0x5003A "00000000_00000000" 64
diff --git a/sbe/build/citest/etc/workarounds.postsimsetup b/sbe/build/citest/etc/workarounds.postsimsetup
index 488db0b9..bea2d5e4 100755
--- a/sbe/build/citest/etc/workarounds.postsimsetup
+++ b/sbe/build/citest/etc/workarounds.postsimsetup
@@ -11,3 +11,12 @@
echo "+++ Add FSIMBOX KW for actions on 50018 register"
patch -p0 $sb/simu/data/cec-chip/pervasive.act $SBEROOT/sbe/build/citest/etc/patches/pervasive.act.patch
+
+# NOTE: The below patch removes mailbox settings in standalone.simics (comes
+# from HB) that cause the SBE to run in plck mode. For our CI, we need the SBE
+# to be in istep mode. This patch is likely never going to be removed as long as
+# we need our CI to run in istep mode.
+echo "+++ Patching standalone.simics"
+mkdir -p $sb/../obj/ppc/simu/scripts/hbfw
+cp $BACKING_BUILD/obj/ppc/simu/scripts/hbfw/standalone.simics $sb/../obj/ppc/simu/scripts/hbfw
+patch -p0 $sb/../obj/ppc/simu/scripts/hbfw/standalone.simics $SBEROOT/sbe/build/citest/etc/patches/standalone.simics.patch
diff --git a/sbe/test/test.xml b/sbe/test/test.xml
index 726f25f0..f5fdb966 100755
--- a/sbe/test/test.xml
+++ b/sbe/test/test.xml
@@ -6,10 +6,6 @@
<test>
<!-- Set IVPR to point to sbe start address -->
- <testcase>
- <simcmd>p9Proc0.proc_chip.invoke parallel_store FSIMBOX 0x01 \"80000000\" 32</simcmd>
- <exitonerror>yes</exitonerror>
- </testcase>
<include>../simics/targets/p9_nimbus/sbeTest/testIstep.xml</include>
<include>../simics/targets/p9_nimbus/sbeTest/testScom.xml</include>
<include>../simics/targets/p9_nimbus/sbeTest/testGeneric.xml</include>
OpenPOWER on IntegriCloud