diff options
| author | Matt Derksen <v2cibmd@us.ibm.com> | 2016-05-05 17:21:05 -0500 |
|---|---|---|
| committer | Matthew A. Ploetz <maploetz@us.ibm.com> | 2016-05-09 10:35:17 -0400 |
| commit | 7a94c29a82229ae1db2435f1ea540274608bd6e4 (patch) | |
| tree | d030aab6e5506ffe0aeec079fd817419ebeb0caf | |
| parent | 448ce72a1c64cdfcaf97d7fdd4f58ce5a70095e6 (diff) | |
| download | talos-hostboot-7a94c29a82229ae1db2435f1ea540274608bd6e4.tar.gz talos-hostboot-7a94c29a82229ae1db2435f1ea540274608bd6e4.zip | |
Fix for mult-chip scom. Set SCOM_SWITCH defaults
Change-Id: I5606d7bb7e1901d9214fbf3f240d4806ecd13749
RTC:153404
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24152
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
| -rw-r--r-- | src/usr/scom/scom.C | 2 | ||||
| -rwxr-xr-x | src/usr/targeting/common/genHwsvMrwXml.pl | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/usr/scom/scom.C b/src/usr/scom/scom.C index 89a9f89d2..152b8b1ee 100644 --- a/src/usr/scom/scom.C +++ b/src/usr/scom/scom.C @@ -585,7 +585,7 @@ errlHndl_t doScomOp(DeviceFW::OperationType i_opType, } else { - assert(0,"SCOM::scomPerformOp> ATTR_SCOM_SWITCHES does not indicate Xscom, Ibscom, or FSISCOM is supported. i_target=0x%.8x", get_huid(i_target)); + assert(0,"SCOM::scomPerformOp> ATTR_SCOM_SWITCHES does not indicate Xscom, SBESCOM, Ibscom, or FSISCOM is supported. i_target=0x%.8x", get_huid(i_target)); break; } diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index 7bae10cdb..97c5bca6f 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -3123,7 +3123,12 @@ sub generate_proc my $affinityPath = "affinity:sys-$sys/node-$node/proc-$proc"; my $mruData = get_mruid($ipath); - + + # default needed + my $UseXscom = $haveFSPs ? 0 : 1; + my $UseFsiScom = $haveFSPs ? 0 : 1; + my $UseSbeScom = $haveFSPs ? 1 : 0; + my $fapi_name = sprintf("pu:k0:n%d:s0:p%02d", $node, $proc); print " <!-- $SYSNAME n${node}p${proc} processor chip --> @@ -3134,6 +3139,15 @@ sub generate_proc <attribute><id>HUID</id><default>${uidstr}</default></attribute> <attribute><id>FAPI_NAME</id><default>$fapi_name</default></attribute> <attribute><id>POSITION</id><default>${position}</default></attribute> + <attribute><id>SCOM_SWITCHES</id> + <default> + <field><id>useSbeScom</id><value>$UseSbeScom</value></field> + <field><id>useFsiScom</id><value>$UseFsiScom</value></field> + <field><id>useXscom</id><value>$UseXscom</value></field> + <field><id>useInbandScom</id><value>0</value></field> + <field><id>reserved</id><value>0</value></field> + </default> + </attribute> <attribute> <id>PHYS_PATH</id> <default>physical:sys-$sys/node-$node/proc-$proc</default> |
