diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2014-04-07 15:03:53 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-04-08 16:55:01 -0500 |
| commit | ed6d7133031da2790f31826f9a5ff99da3a8c963 (patch) | |
| tree | 8b12e5d437a10a2ea5c56f7e6c8a52eb0eeaef52 /src/usr/targeting | |
| parent | 3f7400b8fe83ae55f87f9a630e9d75428ca94f36 (diff) | |
| download | talos-hostboot-ed6d7133031da2790f31826f9a5ff99da3a8c963.tar.gz talos-hostboot-ed6d7133031da2790f31826f9a5ff99da3a8c963.zip | |
Fix bad FSI port usage
The change to support the alt FSI paths introduced a case where
we had a chip with a MFSI master but no port. I changed the code
to force this into a 'no master' setting.
Change-Id: I2f301615f375285ecf28091aea90668f6dc382f1
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10240
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/targeting')
| -rw-r--r-- | src/usr/targeting/common/xmltohb/simics_MURANO.system.xml | 66 |
1 files changed, 57 insertions, 9 deletions
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml index f0f974078..e1f58666f 100644 --- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml @@ -394,6 +394,43 @@ <id>FRU_ID</id> <default>0</default> </attribute> + <!-- FSI connections --> + <!-- FSI is not connected, but stick some values in there + to test alt path code --> + <attribute> + <id>FSI_MASTER_TYPE</id> + <default>MFSI</default> + </attribute> + <attribute> + <id>FSI_SLAVE_CASCADE</id> + <default>0</default> + </attribute> + <attribute> + <id>FSI_OPTION_FLAGS</id> + <default> + <field><id>flipPort</id><value>0</value></field> + <field><id>reserved</id><value>0</value></field> + </default> + </attribute> + <!-- FSI-A is connected via node0:proc0:MFSI-1 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-0</default> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>0xFF</default> + </attribute> + <!-- FSI-B is not connected --> + <attribute> + <id>ALTFSI_MASTER_CHIP</id> + <default>physical:sys</default><!-- no B path --> + </attribute> + <attribute> + <id>ALTFSI_MASTER_PORT</id> + <default>0xFF</default><!-- no B path --> + </attribute> + <!-- End FSI connections --> <attribute> <id>FABRIC_NODE_ID</id> <default>0</default> @@ -1218,20 +1255,12 @@ <id>FRU_ID</id> <default>0</default> </attribute> - <!-- FSI is connected via proc0:MFSI-0 --> - <attribute> - <id>FSI_MASTER_CHIP</id> - <default>physical:sys-0/node-0/proc-0</default> - </attribute> + <!-- FSI connections --> <attribute> <id>FSI_MASTER_TYPE</id> <default>MFSI</default> </attribute> <attribute> - <id>FSI_MASTER_PORT</id> - <default>1</default> - </attribute> - <attribute> <id>FSI_SLAVE_CASCADE</id> <default>0</default> </attribute> @@ -1242,6 +1271,25 @@ <field><id>reserved</id><value>0</value></field> </default> </attribute> + <!-- FSI-A is connected via node0:proc0:MFSI-1 --> + <attribute> + <id>FSI_MASTER_CHIP</id> + <default>physical:sys-0/node-0/proc-0</default> + </attribute> + <attribute> + <id>FSI_MASTER_PORT</id> + <default>1</default> + </attribute> + <!-- FSI-B is not connected --> + <attribute> + <id>ALTFSI_MASTER_CHIP</id> + <default>physical:sys</default><!-- no B path --> + </attribute> + <attribute> + <id>ALTFSI_MASTER_PORT</id> + <default>0xFF</default><!-- no B path --> + </attribute> + <!-- End FSI connections --> <attribute> <id>FABRIC_NODE_ID</id> <default>0</default> |
