Use SBE for scoms to slave chips

Change-Id: I31a33c62ae502d8045882a1a4df5bcaf9f2f34ac
RTC:132655
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23785
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Tested-by: FSP CI Jenkins
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

8 files changed, 22 insertions, 18 deletions

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index bb7a67041..7bae10cdb 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -3123,10 +3123,7 @@ sub generate_proc
     my $affinityPath = "affinity:sys-$sys/node-$node/proc-$proc";
 
     my $mruData = get_mruid($ipath);
-
-    # If we don't have an FSP (open-power) then we want to use Xscom
-    my $UseXscom   = $haveFSPs ? 0 : 1;
-    my $UseFsiScom = $haveFSPs ? 1 : 0;
+    
     my $fapi_name = sprintf("pu:k0:n%d:s0:p%02d", $node, $proc);
     print "
     <!-- $SYSNAME n${node}p${proc} processor chip -->
@@ -3137,14 +3134,6 @@ 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>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>
diff --git a/src/usr/targeting/common/processMrw.pl b/src/usr/targeting/common/processMrw.pl
index 9d21ec101..c938550b6 100644
--- a/src/usr/targeting/common/processMrw.pl
+++ b/src/usr/targeting/common/processMrw.pl
@@ -549,7 +549,8 @@ sub processProcessor
 
     ## these are hardcoded because code sets them properly
     $targetObj->setAttributeField($target, "SCOM_SWITCHES", "reserved",   "0");
-    $targetObj->setAttributeField($target, "SCOM_SWITCHES", "useFsiScom", "1");
+    $targetObj->setAttributeField($target, "SCOM_SWITCHES", "useSbeScom", "1");
+    $targetObj->setAttributeField($target, "SCOM_SWITCHES", "useFsiScom", "0");
     $targetObj->setAttributeField($target, "SCOM_SWITCHES", "useInbandScom",
         "0");
     $targetObj->setAttributeField($target, "SCOM_SWITCHES", "useXscom", "0");
diff --git a/src/usr/targeting/common/targetservice.C b/src/usr/targeting/common/targetservice.C
index a89a1fd9b..b47b4a6b7 100644
--- a/src/usr/targeting/common/targetservice.C
+++ b/src/usr/targeting/common/targetservice.C
@@ -1009,6 +1009,7 @@ void TargetService::dump() const
             TARG_INF("Use FSI SCOM = %d",l_switches.useFsiScom);
             TARG_INF("Use XSCOM = %d",l_switches.useXscom);
             TARG_INF("Use inband SCOM = %d",l_switches.useInbandScom);
+            TARG_INF("Use SBE SCOM = %d",l_switches.useSbeScom);
         }
 
         uint64_t l_xscomBaseAddr = 0;
diff --git a/src/usr/targeting/common/test/testcommontargeting.H b/src/usr/targeting/common/test/testcommontargeting.H
index 56a6e3961..d766cd8b1 100644
--- a/src/usr/targeting/common/test/testcommontargeting.H
+++ b/src/usr/targeting/common/test/testcommontargeting.H
@@ -111,11 +111,12 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         if(   l_switches.useFsiScom != 0
               || l_switches.useXscom != 1
               || l_switches.useInbandScom != 0
+              || l_switches.useSbeScom != 0
               || l_switches.reserved != 0)
         {
-            TARG_TS_FAIL("SCOM Switches stuct was not correct (%d, %d, %d, %d)",
+            TARG_TS_FAIL("SCOM Switches stuct was not correct (%d, %d, %d, %d, %d)",
                     l_switches.useFsiScom, l_switches.useXscom,
-                    l_switches.useInbandScom ,
+                    l_switches.useInbandScom,l_switches.useSbeScom,
                     l_switches.reserved);
         }
 
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index fd30a4c5c..7196d1fdd 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -1108,10 +1108,18 @@
             <default>0</default>
         </field>
         <field>
+            <name>useSbeScom</name>
+            <description>0b0: Do not use SBE SCOM at this time.  0b1: Use
+            SBE SCOM at this time</description>
+            <type>uint8_t</type>
+            <bits>1</bits>
+            <default>0</default>
+        </field>
+        <field>
             <name>reserved</name>
             <description>Reserved for future expansion</description>
             <type>uint8_t</type>
-            <bits>5</bits>
+            <bits>4</bits>
             <default>0</default>
         </field>
     </complexType>
diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
index 2eab9e3ce..a3ea47d9d 100644
--- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
@@ -156,6 +156,7 @@
             <field><id>useFsiScom</id><value>0</value></field>
             <field><id>useXscom</id><value>1</value></field>
             <field><id>useInbandScom</id><value>0</value></field>
+            <field><id>useSbeScom</id><value>0</value></field>
             <field><id>reserved</id><value>0</value></field>
         </default>
     </attribute>
@@ -4279,7 +4280,8 @@
     <attribute><id>POSITION</id><default>1</default></attribute>
     <attribute><id>SCOM_SWITCHES</id>
         <default>
-            <field><id>useFsiScom</id><value>1</value></field>
+            <field><id>useFsiScom</id><value>0</value></field>
+            <field><id>useSbeScom</id><value>1</value></field>
             <field><id>useXscom</id><value>0</value></field>
             <field><id>useInbandScom</id><value>0</value></field>
             <field><id>reserved</id><value>0</value></field>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index efbe257b1..050a7e7e4 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -1540,7 +1540,8 @@
     <attribute>
         <id>SCOM_SWITCHES</id>
         <default>
-            <field><id>useFsiScom</id><value>1</value></field>
+            <field><id>useSbeScom</id><value>1</value></field>
+            <field><id>useFsiScom</id><value>0</value></field>
             <field><id>useXscom</id><value>0</value></field>
             <field><id>useInbandScom</id><value>0</value></field>
             <field><id>reserved</id><value>0</value></field>
diff --git a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
index baa5f9cef..25bf54e0f 100644
--- a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
@@ -150,6 +150,7 @@
     <attribute><id>POSITION</id><default>4</default></attribute>
     <attribute><id>SCOM_SWITCHES</id>
         <default>
+            <field><id>useSbeScom</id><value>0</value></field>
             <field><id>useFsiScom</id><value>0</value></field>
             <field><id>useXscom</id><value>1</value></field>
             <field><id>useInbandScom</id><value>0</value></field>