Only Calculate ISDIMM Power Curves if needed

Calculate ISDIMM power curve value if the calcuation algorithm or calculation
dependenices change or if there is a hw change.

Change-Id: I74826c2d9079a7c35271671626ee1dc922a9d552
RTC: 67641
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12968
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 79 insertions, 3 deletions

diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index e9fa7eb11..2cdd0bcc7 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -985,6 +985,10 @@
     <enumerator>
        <name>HOSTSVC_HBEL</name>
        <value>0x00000008</value>
+    </enumerator>
+    <enumerator>
+       <name>DIMM_POWER_TEST</name>
+       <value>0x00000010</value>
    </enumerator>
 </enumerationType>
 
@@ -8602,6 +8606,22 @@ bits6:7  will be consumed together to form COARSE_LVL. </description>
 </attribute>
 
 <attribute>
+    <id>MSS_DRAMINIT_RESET_DISABLE</id>
+    <description>A disable switch for resetting the phy delay values at the beginning of calling mss_draminit_training.</description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_MSS_DRAMINIT_RESET_DISABLE</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
     <id>MSS_MEM_IPL_COMPLETE</id>
     <description>A numerical number indicating if the memory procedures are complete.  written by mss_setup_bars when the bars are now functional in the processor.  </description>
     <simpleType>
@@ -14267,4 +14287,58 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript
     <writeable/>
 </attribute>
 
+<!-- TODO RTC: 113491 ISDIMM DQ data decompression -->
+<attribute>
+    <id>ATTR_VPD_ISDIMMTOC4DQ</id>
+    <description>
+        ISDIMM DQ mapping that comes from QX keyword on the CDIMM VPD.
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+        <array>4, 80</array>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_VPD_ISDIMMTOC4DQ</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<!-- TODO RTC: 113491 ISDIMM DQ data decompression -->
+<attribute>
+    <id>ATTR_VPD_ISDIMMTOC4DQS</id>
+    <description>
+        ISDIMM DQQ mapping that comes from QS keyword on the CDIMM VPD.
+    </description>
+    <simpleType>
+        <uint8_t>
+        </uint8_t>
+        <array>4, 20</array>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_VPD_ISDIMMTOC4DQS</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+    <id>ISDIMM_POWER_CURVE_ALGORITHM_VERSION</id>
+    <description>Version of algorithm used to calculate ISDIMM power curves
+    </description>
+    <simpleType>
+        <uint32_t><default>0</default></uint32_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_ISDIMM_POWER_CURVE_ALGORITHM_VERSION</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
 </attributes>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index acd8f9885..37c06150b 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -123,6 +123,8 @@
     <attribute><id>NOMINAL_FREQ_MHZ</id></attribute>
     <attribute><id>MNFG_FLAGS</id></attribute>
     <attribute><id>FABRIC_TO_PHYSICAL_NODE_MAP</id></attribute>
+    <!-- Start memory_attributes.xml -->
+    <attribute><id>ISDIMM_POWER_CURVE_ALGORITHM_VERSION</id></attribute>
     <!-- Start pm_plat_attributes.xml -->
     <attribute><id>PM_EXTERNAL_VRM_STEPSIZE</id></attribute>
     <attribute><id>PM_EXTERNAL_VRM_STEPDELAY</id></attribute>
@@ -918,7 +920,7 @@
     </attribute>
     <attribute><id>DECONFIG_GARDABLE</id><default>1</default></attribute>
     <attribute><id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id>
-        <default>0x00000001</default> <!--GARD -->
+        <default>0x00000011</default> <!--GARD | DIMM_POWER_TEST -->
     </attribute>
     <attribute><id>MSS_DIMM_MFG_ID_CODE</id></attribute>
     <attribute><id>EFF_DIMM_RANKS_CONFIGED</id></attribute>
@@ -1292,7 +1294,7 @@
     </attribute>
     <attribute><id>DECONFIG_GARDABLE</id><default>1</default></attribute>
     <attribute><id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id>
-        <default>0x00000003</default> <!--GARD | MEMDIAG -->
+        <default>0x00000013</default> <!--GARD | MEMDIAG | DIMM_POWER_TEST -->
     </attribute>
     <attribute>
         <id>SCOM_SWITCHES</id>
@@ -1428,7 +1430,7 @@
     </attribute>
     <attribute><id>DECONFIG_GARDABLE</id><default>1</default></attribute>
     <attribute><id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id>
-        <default>0x00000003</default> <!--GARD | MEMDIAG -->
+        <default>0x00000013</default> <!--GARD | MEMDIAG | DIMM_POWER_TEST -->
     </attribute>
 
     <attribute><id>EEPROM_VPD_PRIMARY_INFO</id></attribute>