Modifying ATTRs for memory power thermal

  Added MSS_MRW_ATTRs to base_hwp_file, implemented bulk_pwr and
  utils_to_throttle APIs for the OCC team. Added simple structural changes

Change-Id: I9483be7f06c95c8c4dfe4823443052efde6fa776
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28916
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Brian R. Silver <bsilver@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
CMVC-Prereq: 995208
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28989
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>

2 files changed, 55 insertions, 25 deletions

diff --git a/src/import/chips/p9/procedures/xml/attribute_info/memory_mcs_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/memory_mcs_attributes.xml
index 29ea1984b..4c714e317 100644
--- a/src/import/chips/p9/procedures/xml/attribute_info/memory_mcs_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/memory_mcs_attributes.xml
@@ -23,7 +23,7 @@
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
 <attributes>
-
+    <!-- MCS attribute array indexes are always [port][dimm] -->
     <attribute>
         <id>ATTR_MSS_VOLT_VDDR</id>
         <targetType>TARGET_TYPE_MCBIST</targetType>
@@ -1228,21 +1228,52 @@
         <id>ATTR_MSS_MEM_WATT_TARGET</id>
         <targetType>TARGET_TYPE_MCS</targetType>
         <description>
-          Total memory power limit in cW for the dimms on the memory channel pair.
-          Used to compute the throttles on the channel and/or dimms.
-          creator: unknown.
-          consumer: mss_eff_config.
+          Total memory power used to throttle for each dimm
+          Used to compute the throttles on the channel and/or dimms for OCC
+          OCC sets after IPL
+          creator: mss_eff_config
+          consumer: mss_bulk_pwr_throttle, mss_utils_to_throttle
           firmware notes: none.
         </description>
         <initToZero></initToZero>
+        <mssUnit>cW</mssUnit>
         <valueType>uint32</valueType>
         <writeable/>
-        <array>2</array>
-
+        <array>2 2</array>
         <mssAccessorName>mem_watt_target</mssAccessorName>
     </attribute>
 
     <attribute>
+        <id>ATTR_MSS_TOTAL_PWR_SLOPE</id>
+        <targetType>TARGET_TYPE_MCS</targetType>
+        <description>
+            VDDR+VPP Power slope value for dimm
+            creator: mss_eff_config
+            consumer: mss_bulk_pwr_throttles
+        </description>
+        <initToZero></initToZero>
+        <valueType>uint32</valueType>
+        <writeable/>
+        <array> 2 2</array>
+        <mssAccessorName>total_pwr_slope</mssAccessorName>
+    </attribute>
+
+    <attribute>
+        <id>ATTR_MSS_TOTAL_PWR_INTERCEPT</id>
+        <targetType>TARGET_TYPE_MCS</targetType>
+        <description>
+            VDDR+VPP Power intercept value for dimm
+            creator: mss_eff_config
+            consumer: mss_bulk_pwr_throttles
+        </description>
+        <initToZero></initToZero>
+        <valueType>uint32</valueType>
+        <writeable/>
+        <array> 2 2</array>
+        <mssAccessorName>total_pwr_intercept</mssAccessorName>
+    </attribute>
+
+    <attribute>
         <id>ATTR_MSS_MASTER_PWR_SLOPE</id>
         <targetType>TARGET_TYPE_MCS</targetType>
         <description>Master Power slope value for dimm</description>
@@ -1342,14 +1373,29 @@
     </attribute>
 
     <attribute>
-        <id>ATTR_MSS_CHANNEL_PAIR_MAXPOWER</id>
+        <id>ATTR_MSS_DATABUS_UTIL</id>
+        <targetType>TARGET_TYPE_MCS</targetType>
+        <description>
+            Databus utilization limit used to calculate memory throttles and power limit
+            creator: OCC
+            consumer: mss_utils_to_throttle
+        </description>
+        <initToZero></initToZero>
+        <valueType>uint32</valueType>
+        <array>2</array>
+        <writeable/>
+        <mssAccessorName>databus_util</mssAccessorName>
+    </attribute>
+
+    <attribute>
+        <id>ATTR_MSS_PORT_MAXPOWER</id>
         <targetType>TARGET_TYPE_MCS</targetType>
         <description>Channel Pair Max Power output from thermal procedures</description>
         <initToZero></initToZero>
         <valueType>uint32</valueType>
         <writeable/>
         <array>2</array>
-        <mssAccessorName>channel_pair_maxpower</mssAccessorName>
+        <mssAccessorName>port_maxpower</mssAccessorName>
     </attribute>
 
     <attribute>
@@ -2121,20 +2167,6 @@
     </attribute>
 
     <attribute>
-      <id>ATTR_MSS_OCC_THROTTLED_N_CMDS</id>
-      <targetType>TARGET_TYPE_MCS</targetType>
-      <!-- TK Do we need an attr per port & dimm ? P8 only had an attr per port AAM -->
-      <description>
-        cfg_nm_n_per_port throttle N value that was calculated from MSS_DATABUS_UTIL
-      </description>
-      <initToZero></initToZero>
-      <valueType>uint32</valueType>
-      <writeable/>
-      <array>2</array>
-      <mssAccessorName>occ_throttled_n_cmds</mssAccessorName>
-    </attribute>
-
-    <attribute>
         <id>ATTR_EFF_DRAM_MAC</id>
         <targetType>TARGET_TYPE_MCS</targetType>
         <description>
diff --git a/src/import/chips/p9/procedures/xml/attribute_info/memory_mrw_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/memory_mrw_attributes.xml
index 79eb711ca..b3680f6a5 100755
--- a/src/import/chips/p9/procedures/xml/attribute_info/memory_mrw_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/memory_mrw_attributes.xml
@@ -88,7 +88,6 @@
     <valueType>uint32</valueType>
     <platInit/>
     <initToZero/>
-    <!-- little comment to tell us this might change during power/thermal implemetation -->
     <!-- little comment to tell us we implemented - will remove before flight TODO RTC:159145 -->
     <mssAccessorName>mrw_mem_m_dram_clocks</mssAccessorName>
   </attribute>
@@ -103,7 +102,6 @@
     <valueType>uint32</valueType>
     <platInit/>
     <initToZero/>
-    <!-- little comment to tell us this might change during power/thermal implemetation -->
     <!-- little comment to tell us we implemented - will remove before flight TODO RTC:159145 -->
     <mssAccessorName>mrw_max_dram_databus_util</mssAccessorName>
   </attribute>