HW415883 applies to NDD2.1, Add JellyVector WAT, add HW422495, add HW421831

- WAT replaces original workaround for HW419818; two dials removed

Change-Id: I540aead6556278a1da3774eba2d96cb685c4e3c1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/47181
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Jenny Huynh <jhuynh@us.ibm.com>
Dev-Ready: James N. Klazynski <jklazyns@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/47958
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

2 files changed, 16 insertions, 15 deletions

diff --git a/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scominit.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scominit.C
index 9275e520..0817c28d 100644
--- a/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scominit.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scominit.C
@@ -119,7 +119,7 @@ p9_hcd_core_scominit(
     else
     {
         l_data64.insertFromRight<C_HANG_CONTROL_CORE_LIMIT,
-                                 C_HANG_CONTROL_CORE_LIMIT_LEN>(CORE_HANG_LIMIT_3_HANG_PULSES);
+                                 C_HANG_CONTROL_CORE_LIMIT_LEN>(CORE_HANG_LIMIT_10_HANG_PULSES);
     }
 
     l_data64.insertFromRight<C_HANG_CONTROL_NEST_LIMIT,
diff --git a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
index 99a0f3ab..5d176451 100644
--- a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
@@ -32,11 +32,12 @@
 
   <!-- ********************************************************************* -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_HW416934</id>
+    <id>ATTR_CHIP_EC_FEATURE_HW416934_HW419818</id>
     <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      Nimbus DD1, DD2.0, DD2.1, Cumulus DD1 only:
+      Nimbus DD1, DD2.0, DD2.1, Cumulus DD1 only; Combined into a single WAT solution
       HW416934 - Cache Inhibited (I=1) lxvd2x load sends 8 byte load to NCU instead of 16 byte
+      HW419818 - stcx bug in the S2QA / S2Q drain stall
     </description>
     <chipEcFeature>
       <chip>
@@ -3204,10 +3205,10 @@
   </attribute>
   <!-- ******************************************************************** -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_HW421426</id>
+    <id>ATTR_CHIP_EC_FEATURE_HW421831</id>
     <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      HW421426 - SMT2 prefetch issue
+      HW421831 - ltptr hang issue
     </description>
     <chipEcFeature>
       <chip>
@@ -3228,10 +3229,10 @@
   </attribute>
   <!-- ******************************************************************** -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_HW420860</id>
+    <id>ATTR_CHIP_EC_FEATURE_HW421426</id>
     <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      HW420860 - Serialize lqarx
+      HW421426 - SMT2 prefetch issue
     </description>
     <chipEcFeature>
       <chip>
@@ -3252,17 +3253,17 @@
   </attribute>
   <!-- ******************************************************************** -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_HW415883</id>
+    <id>ATTR_CHIP_EC_FEATURE_HW420860</id>
     <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      HW415883 - serialize ldcix
+      HW420860 - Serialize lqarx
     </description>
     <chipEcFeature>
       <chip>
         <name>ENUM_ATTR_NAME_NIMBUS</name>
         <ec>
-          <value>0x20</value>
-          <test>EQUAL</test>
+          <value>0x21</value>
+          <test>LESS_THAN_OR_EQUAL</test>
         </ec>
       </chip>
       <chip>
@@ -3276,10 +3277,10 @@
   </attribute>
   <!-- ******************************************************************** -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_HW420948</id>
+    <id>ATTR_CHIP_EC_FEATURE_HW415883</id>
     <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      HW420948 - SRQ/S2Q issue
+      HW415883 - serialize ldcix
     </description>
     <chipEcFeature>
       <chip>
@@ -3300,10 +3301,10 @@
   </attribute>
   <!-- ******************************************************************** -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_HW419818</id>
+    <id>ATTR_CHIP_EC_FEATURE_HW420948</id>
     <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      HW419818 - SRQ/S2Q issue
+      HW420948 - SRQ/S2Q issue
     </description>
     <chipEcFeature>
       <chip>