change epsilon attribute definitions from arrays to scalars

  PPE platform does not support system scoped array attributes
  Update HB temp defaults to enable CI

Change-Id: If0d0d4ed3248ba4433141bb9715ff544ca84b5f7
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24067
Tested-by: Jenkins Server
Tested-by: PPE CI
Tested-by: Hostboot CI
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24070
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 67 insertions, 15 deletions

diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_fbc_eff_config.C b/src/import/chips/p9/procedures/hwp/nest/p9_fbc_eff_config.C
index 991871df9..1826868e1 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_fbc_eff_config.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_fbc_eff_config.C
@@ -144,8 +144,8 @@ p9_fbc_eff_config_calc_epsilons(
     FAPI_DBG("Start");
 
     // epsilon output attributes
-    fapi2::ATTR_PROC_EPS_READ_CYCLES_Type l_eps_r;
-    fapi2::ATTR_PROC_EPS_WRITE_CYCLES_Type l_eps_w;
+    uint32_t l_eps_r[NUM_EPSILON_READ_TIERS];
+    uint32_t l_eps_w[NUM_EPSILON_WRITE_TIERS];
     fapi2::ATTR_PROC_EPS_GB_PERCENTAGE_Type l_eps_gb;
 
     // fetch epsilon table type/pump mode attributes
@@ -284,11 +284,17 @@ p9_fbc_eff_config_calc_epsilons(
     }
 
     // write attributes
-    FAPI_TRY(FAPI_ATTR_SET(fapi2::ATTR_PROC_EPS_READ_CYCLES, i_target, l_eps_r),
-             "Error from FAPI_ATTR_SET (ATTR_PROC_EPS_READ_CYCLES)");
-
-    FAPI_TRY(FAPI_ATTR_SET(fapi2::ATTR_PROC_EPS_WRITE_CYCLES, i_target, l_eps_w),
-             "Error from FAPI_ATTR_SET (ATTR_PROC_EPS_WRITE_CYCLES)");
+    FAPI_TRY(FAPI_ATTR_SET(fapi2::ATTR_PROC_EPS_READ_CYCLES_T0, i_target, l_eps_r[0]),
+             "Error from FAPI_ATTR_SET (ATTR_PROC_EPS_READ_CYCLES_T0)");
+    FAPI_TRY(FAPI_ATTR_SET(fapi2::ATTR_PROC_EPS_READ_CYCLES_T1, i_target, l_eps_r[1]),
+             "Error from FAPI_ATTR_SET (ATTR_PROC_EPS_READ_CYCLES_T1)");
+    FAPI_TRY(FAPI_ATTR_SET(fapi2::ATTR_PROC_EPS_READ_CYCLES_T2, i_target, l_eps_r[2]),
+             "Error from FAPI_ATTR_SET (ATTR_PROC_EPS_READ_CYCLES_T2)");
+
+    FAPI_TRY(FAPI_ATTR_SET(fapi2::ATTR_PROC_EPS_WRITE_CYCLES_T1, i_target, l_eps_w[0]),
+             "Error from FAPI_ATTR_SET (ATTR_PROC_EPS_WRITE_CYCLES_T1)");
+    FAPI_TRY(FAPI_ATTR_SET(fapi2::ATTR_PROC_EPS_WRITE_CYCLES_T2, i_target, l_eps_w[1]),
+             "Error from FAPI_ATTR_SET (ATTR_PROC_EPS_WRITE_CYCLES_T2)");
 
 fapi_try_exit:
     FAPI_INF("End");
diff --git a/src/import/chips/p9/procedures/xml/attribute_info/nest_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/nest_attributes.xml
index 254bd84e5..a42b52947 100644
--- a/src/import/chips/p9/procedures/xml/attribute_info/nest_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/nest_attributes.xml
@@ -573,26 +573,52 @@
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
-  <id>ATTR_PROC_EPS_READ_CYCLES</id>
+  <id>ATTR_PROC_EPS_READ_CYCLES_T0</id>
   <targetType>TARGET_TYPE_SYSTEM</targetType>
   <description>
-    Calculated read epsilon protection count.
-    Counter tier is index.
+    Calculated read tier0 epsilon protection count.
   </description>
   <valueType>uint32</valueType>
-  <array>3</array>
   <writeable/>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
-  <id>ATTR_PROC_EPS_WRITE_CYCLES</id>
+  <id>ATTR_PROC_EPS_READ_CYCLES_T1</id>
   <targetType>TARGET_TYPE_SYSTEM</targetType>
   <description>
-    Calculated write epsilon protection count.
-    Counter tier is index.
+    Calculated read tier1 epsilon protection count.
+  </description>
+  <valueType>uint32</valueType>
+  <writeable/>
+</attribute>
+<!-- ********************************************************************** -->
+<attribute>
+  <id>ATTR_PROC_EPS_READ_CYCLES_T2</id>
+  <targetType>TARGET_TYPE_SYSTEM</targetType>
+  <description>
+    Calculated read tier2 epsilon protection count.
+  </description>
+  <valueType>uint32</valueType>
+  <writeable/>
+</attribute>
+<!-- ********************************************************************** -->
+<attribute>
+  <id>ATTR_PROC_EPS_WRITE_CYCLES_T1</id>
+  <targetType>TARGET_TYPE_SYSTEM</targetType>
+  <description>
+    Calculated write tier1 epsilon protection count.
+  </description>
+  <valueType>uint32</valueType>
+  <writeable/>
+</attribute>
+<!-- ********************************************************************** -->
+<attribute>
+  <id>ATTR_PROC_EPS_WRITE_CYCLES_T2</id>
+  <targetType>TARGET_TYPE_SYSTEM</targetType>
+  <description>
+    Calculated write tier2 epsilon protection count.
   </description>
   <valueType>uint32</valueType>
-  <array>2</array>
   <writeable/>
 </attribute>
 <!-- ********************************************************************** -->
diff --git a/src/import/hwpf/fapi2/xml/attribute_info/hb_temp_defaults.xml b/src/import/hwpf/fapi2/xml/attribute_info/hb_temp_defaults.xml
index fae0154ad..636813b05 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/hb_temp_defaults.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/hb_temp_defaults.xml
@@ -80,6 +80,26 @@
         <id>ATTR_IO_XBUS_TX_FFE_PRECURSOR</id>
         <default>6</default>
     </attribute>
+    <attribute>
+        <id>ATTR_PROC_EPS_READ_CYCLES_T0</id>
+        <default>0x00000FFF</default>
+    </attribute>
+    <attribute>
+        <id>ATTR_PROC_EPS_READ_CYCLES_T1</id>
+        <default>0x00000FFF</default>
+    </attribute>
+    <attribute>
+        <id>ATTR_PROC_EPS_READ_CYCLES_T2</id>
+        <default>0x00000FFF</default>
+    </attribute>
+    <attribute>
+        <id>ATTR_PROC_EPS_WRITE_CYCLES_T1</id>
+        <default>0x00000FFF</default>
+    </attribute>
+    <attribute>
+        <id>ATTR_PROC_EPS_WRITE_CYCLES_T2</id>
+        <default>0x00000FFF</default>
+    </attribute>
 <!-- =====================================================================
      End of temporary definitions
      ================================================================= -->