Initial support for effective fabric ids

Adding the basic support for the effective fabric ids to allow
integration of the HWPs that handle the remapping of the
address maps.

Change-Id: I951ce75b78d21b78f83b873ce8b5e7b5b236217d
RTC: 149250
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37338
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 64 insertions, 0 deletions

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index d65b19c14..66d8b6450 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -3672,10 +3672,18 @@ sub generate_proc
         <default>$lognode</default>
     </attribute>
     <attribute>
+        <id>PROC_EFF_FABRIC_GROUP_ID</id>
+        <default>$lognode</default>
+    </attribute>
+    <attribute>
         <id>FABRIC_CHIP_ID</id>
         <default>$logid</default>
     </attribute>
     <attribute>
+        <id>PROC_EFF_FABRIC_CHIP_ID</id>
+        <default>$logid</default>
+    </attribute>
+    <attribute>
         <id>FRU_ID</id>
         <default>$fruid</default>
     </attribute>
diff --git a/src/usr/targeting/common/processMrw.pl b/src/usr/targeting/common/processMrw.pl
index 3c804f48e..f4bbaf031 100644
--- a/src/usr/targeting/common/processMrw.pl
+++ b/src/usr/targeting/common/processMrw.pl
@@ -534,6 +534,18 @@ sub processProcessor
         "0");
     $targetObj->setAttributeField($target, "SCOM_SWITCHES", "useXscom", "0");
 
+    ## default effective fabric ids to match regular fabric ids
+    ##  the value will be adjusted based on presence detection later
+    $targetObj->setAttribute($target,
+                             "PROC_EFF_FABRIC_GROUP_ID",
+                             $targetObj->getAttribute($target,
+                                                      "FABRIC_GROUP_ID"));
+    $targetObj->setAttribute($target,
+                             "PROC_EFF_FABRIC_CHIP_ID",
+                             $targetObj->getAttribute($target,
+                                                      "FABRIC_CHIP_ID"));
+
+
     processMembufVpdAssociation($targetObj,$target);
     setupBars($targetObj,$target);
 }
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 5c32ae8e5..92a01f86c 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -2458,6 +2458,27 @@
 </attribute>
 
 <attribute>
+    <id>PROC_EFF_FABRIC_GROUP_ID</id>
+    <description>
+    Effective fabric group ID associated with this chip.
+    Directly drives programming of chip memory map layout.
+    Compared with ATTR_PROC_FABRIC_GROUP_ID to configure FBC XOR masking.
+    </description>
+    <simpleType>
+        <uint8_t>
+            <default>0</default>
+        </uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PROC_EFF_FABRIC_GROUP_ID</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
     <id>FABRIC_CHIP_ID</id>
     <description>
         Chip attribute.
@@ -2480,6 +2501,27 @@
 </attribute>
 
 <attribute>
+    <id>PROC_EFF_FABRIC_CHIP_ID</id>
+    <description>
+    Effective fabric chip ID associated with this chip.
+    Directly drives programming of chip memory map layout.
+    Compared with ATTR_PROC_FABRIC_CHIP_ID to configure FBC XOR masking.
+    </description>
+    <simpleType>
+        <uint8_t>
+            <default>0</default>
+        </uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_PROC_EFF_FABRIC_CHIP_ID</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
     <id>CHIP_HAS_SBE</id>
     <description>
         Chip attribute.
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 7156e1ce5..14c9fb147 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -132,7 +132,9 @@
     </attribute>
     <attribute><id>FABRIC_NODE_ID</id></attribute><!-- DEPRECATED -->
     <attribute><id>FABRIC_GROUP_ID</id></attribute>
+    <attribute><id>PROC_EFF_FABRIC_GROUP_ID</id></attribute>
     <attribute><id>FABRIC_CHIP_ID</id></attribute>
+    <attribute><id>PROC_EFF_FABRIC_CHIP_ID</id></attribute>
     <attribute>
         <!-- Processor chips have an SBE -->
         <id>CHIP_HAS_SBE</id>