Revert "Add HW425526 and HW425027"

This reverts commit cf1f011.

Change-Id: I546b4faa6b9f8f2c8b9de070f0bbe34329f15ef7
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49462
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Christian R. Geddes <crgeddes@us.ibm.com>

src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml

@@ -672,19 +672,17 @@
   </attribute>
   <!-- ******************************************************************** -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_EMQ_DIS_TRACKER</id>
+    <id>ATTR_CHIP_EC_FEATURE_HW416227</id>
     <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      Nimbus DD1.0: HW393929 / HW394578
-      Nimbus DD2.0 / Cumulus DD1.0: HW416227
-      Nimbus DD2.1 / Nimbus DD2.2: HW425027
+      Nimbus DD2.0, Cumulus DD1.0: HW416227 - Disable Tracker
     </description>
     <chipEcFeature>
       <chip>
         <name>ENUM_ATTR_NAME_NIMBUS</name>
         <ec>
-          <value>0x22</value>
-          <test>LESS_THAN_OR_EQUAL</test>
+          <value>0x20</value>
+          <test>EQUAL</test>
         </ec>
       </chip>
       <chip>
@@ -698,26 +696,17 @@
   </attribute>
   <!-- ******************************************************************** -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_HW425526</id>
-    <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
+    <id>ATTR_CHIP_EC_FEATURE_HW393929_HW394578</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      HW425526 - Force H-Bit in the TLB
-      Nimbus DD1.0 / DD2.0 / DD2.1 / DD2.2
-      Cumulus DD1.0
+      Nimbus DD1 only: HW393929 / HW394578
     </description>
     <chipEcFeature>
       <chip>
         <name>ENUM_ATTR_NAME_NIMBUS</name>
         <ec>
-          <value>0x22</value>
-          <test>LESS_THAN_OR_EQUAL</test>
-        </ec>
-      </chip>
-      <chip>
-        <name>ENUM_ATTR_NAME_CUMULUS</name>
-        <ec>
-          <value>0x10</value>
-          <test>EQUAL</test>
+          <value>0x20</value>
+          <test>LESS_THAN</test>
         </ec>
       </chip>
     </chipEcFeature>
@@ -2607,6 +2596,23 @@
     </chipEcFeature>
   </attribute>
   <!-- ******************************************************************** -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_HW398269</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      Nimbus DD1: Reckless Carpenter
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_NIMBUS</name>
+        <ec>
+          <value>0x20</value>
+          <test>LESS_THAN</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <!-- ******************************************************************** -->
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_HW399765</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
@@ -2937,6 +2943,23 @@
     </chipEcFeature>
   </attribute>
   <!-- ******************************************************************** -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_HW408628</id>>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      HW408628
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_NIMBUS</name>
+        <ec>
+          <value>0x20</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <!-- ******************************************************************** -->
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_HW408876</id>>
     <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>