wrap_test: targeting fixups

We currently do not support attribute overrides for enum based
attributes. Therefore, change the type of
ATTR_MFG_WRAP_TEST_ABUS_LINK_SET_ENABLE to uint8_t and add
PROC_EFF_FABRIC_GROUP/CHIP_ID attributes to processMrw.

Change-Id: I4991e19ab5ceac8e8cf0fbd826b68d7e0fd9ab1d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/58527
Reviewed-by: Richard Ward <rward15@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: Roland Veloz <rveloz@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

src/usr/hwas/common/hwas.C

@@ -253,7 +253,7 @@ errlHndl_t disableOBUSes()
         //only if MFG_WRAP_TEST_ABUS_LINKS_SET_ENABLE was overidden
         //because that means we are trying to run in wrap mode.
         //Otherwise, it will be defaulted to SET_NONE
-        if (l_links_set_enable != MFG_WRAP_TEST_ABUS_LINKS_SET_ENABLE_SET_NONE)
+        if (l_links_set_enable)
         {
             TargetHandleList l_procList;
             getAllChips(l_procList, TYPE_PROC);

src/usr/targeting/common/processMrw.pl

@@ -1129,6 +1129,8 @@ sub processProcessor
 
         $targetObj->setAttribute($target,"FABRIC_GROUP_ID",$grp_id);
         $targetObj->setAttribute($target,"FABRIC_CHIP_ID",$chip_id);
+        $targetObj->setAttribute($target,"PROC_EFF_FABRIC_GROUP_ID",$grp_id);
+        $targetObj->setAttribute($target,"PROC_EFF_FABRIC_CHIP_ID",$chip_id);
     }
 
     setupBars($targetObj,$target);

src/usr/targeting/common/xmltohb/attribute_types.xml

@@ -7288,23 +7288,6 @@ Selects which voltage level to place the Core and ECO domain PFETs upon Winkle e
     <readable/>
 </attribute>
 
-<enumerationType>
-    <id>MFG_WRAP_TEST_ABUS_LINKS_SET_ENABLE</id>
-    <description>Enum for MFG_WRAP_TEST_ABUS_LINKS_SET_ENABLE</description>
-    <enumerator>
-        <name>SET_NONE</name>
-        <value>0x0</value>
-    </enumerator>
-    <enumerator>
-        <name>SET_1</name>
-        <value>0x1</value>
-    </enumerator>
-    <enumerator>
-        <name>SET_2</name>
-        <value>0x2</value>
-    </enumerator>
-</enumerationType>
-
 <attribute>
     <id>MFG_WRAP_TEST_ABUS_LINKS_SET_ENABLE</id>
     <description>
@@ -7316,10 +7299,9 @@ Selects which voltage level to place the Core and ECO domain PFETs upon Winkle e
       OBUSes configured. Otherwise, we deconfigure them.
     </description>
     <simpleType>
-        <enumeration>
-            <default>SET_NONE</default>
-            <id>MFG_WRAP_TEST_ABUS_LINKS_SET_ENABLE</id>
-        </enumeration>
+        <uint8_t>
+            <default>0</default>
+        </uint8_t>
     </simpleType>
     <persistency>volatile-zeroed</persistency>
     <readable/>