diff options
author | Santosh Puranik <santosh.puranik@in.ibm.com> | 2016-04-19 04:27:45 -0500 |
---|---|---|
committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-04-21 00:17:15 -0400 |
commit | 94e7c34c8e0ebae291c29f5034542d6266e54828 (patch) | |
tree | 10bfcc741d56f7ba0c1f2fe15e586b08600a359c /sbe | |
parent | 6beab01552fcc6251bed1b41b3cf4d46b9ba7709 (diff) | |
download | talos-sbe-94e7c34c8e0ebae291c29f5034542d6266e54828.tar.gz talos-sbe-94e7c34c8e0ebae291c29f5034542d6266e54828.zip |
Update backing build
-- Move to b0415a_1618
-- Add patch for standalone.simics
Change-Id: Ib087778372cd1b8bb0ed1a15f3258a564cb3405c
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23405
Tested-by: Jenkins Server
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'sbe')
-rw-r--r-- | sbe/build/citest/etc/patches/standalone.simics.patch | 4 | ||||
-rwxr-xr-x | sbe/build/citest/etc/workarounds.postsimsetup | 9 | ||||
-rwxr-xr-x | sbe/test/test.xml | 4 |
3 files changed, 13 insertions, 4 deletions
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> |