Skip to content

Commit

Permalink
cumulus: add simics workarounds to avoid patching
Browse files Browse the repository at this point in the history
- memory creation in istep 14, when we do exit cache
  contained
- copying p9c and centaur action files
- turn on power to the centaur cec-chip
- fixup a few attributes im simics_CUMULUS.system.xml
  to allow scoming the membuf using the fsi engine

Change-Id: I8b731daa7cf086281141073cc79a270e6941dc82
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45246
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: Thomas R. Sand <trsand@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: SWATHI M. BHATTIPROLU <bhmadhur@in.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
Prachi Gupta authored and dcrowell77 committed Sep 8, 2017
1 parent 889247e commit 868418a
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/build/citest/etc/workarounds.postsimsetup
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,10 @@ cd -
#@TODO RTC:178949
echo "Applying SIMICS workaround to support Cumulus"
sbex -t 1031560
sbex -t 1032617
sbex -t 1033442
cd $sb/simu
mk -a

echo "Copying centaur and p9c action files"
sbex -t 1032952
7 changes: 7 additions & 0 deletions src/build/simics/standalone.simics
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ foreach $cc in (get-object-list p9_proc) {
@SIM_get_interface(SIM_get_object(mp),"signal").signal_raise()
}

#Power on cec-chip on centaurs if present
foreach $cp in (get-object-list p9_centaur_cfam -recursive){
echo $cp
@cc="%s.membuf_chip"%simenv.cp
@ignore=SIM_get_interface(SIM_get_object(cc),"signal").signal_raise()
}

system_cmp0.cpu0_0_00_0.enable

###################################
Expand Down
28 changes: 28 additions & 0 deletions src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5487,6 +5487,10 @@



<attribute>
<id>FAPI_NAME</id>
<default>membuf0</default>
</attribute>


<attribute>
Expand Down Expand Up @@ -5560,6 +5564,16 @@
<id>RESOURCE_IS_CRITICAL</id>
<default>0</default>
</attribute>
<attribute>
<id>SCOM_SWITCHES</id>
<default>
<field><id>reserved</id><value>0</value></field>
<field><id>useFsiScom</id><value>1</value></field>
<field><id>useInbandScom</id><value>0</value></field>
<field><id>useSbeScom</id><value>0</value></field>
<field><id>useXscom</id><value>0</value></field>
</default>
</attribute>


<attribute>
Expand Down Expand Up @@ -5863,6 +5877,10 @@



<attribute>
<id>FAPI_NAME</id>
<default>membuf1</default>
</attribute>



Expand Down Expand Up @@ -5937,6 +5955,16 @@
<id>RESOURCE_IS_CRITICAL</id>
<default>0</default>
</attribute>
<attribute>
<id>SCOM_SWITCHES</id>
<default>
<field><id>reserved</id><value>0</value></field>
<field><id>useFsiScom</id><value>1</value></field>
<field><id>useInbandScom</id><value>0</value></field>
<field><id>useSbeScom</id><value>0</value></field>
<field><id>useXscom</id><value>0</value></field>
</default>
</attribute>


<attribute>
Expand Down

0 comments on commit 868418a

Please sign in to comment.