From 40d3c1667e11183db9d90a34aabab39a823b1810 Mon Sep 17 00:00:00 2001
From: Joe McGill <jmcgill@us.ibm.com>
Date: Sat, 16 Feb 2019 10:11:11 -0500
Subject: cleanup references to chip-centric EC feature attributes

Change-Id: Ib777b27c6013a647ae86e6ff5973bab19faceb56
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71994
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jenny Huynh <jhuynh@us.ibm.com>
Reviewed-by: LUKE MURRAY <murrayl@us.ibm.com>
Reviewed-by: Christopher W. Steffen <cwsteffen@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71999
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
---
 .../xml/attribute_info/chip_ec_attributes.xml      | 131 ++++++++++++++++++++-
 .../xml/attribute_info/p9_sbe_attributes.xml       |   4 +
 2 files changed, 133 insertions(+), 2 deletions(-)

(limited to 'src/import/chips/p9/procedures/xml/attribute_info')

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 e6194c3d..eb60a7f8 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
@@ -847,9 +847,34 @@
     </chipEcFeature>
   </attribute>
   <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_HW446279</id>
+    <targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      HW446279 SMP Abus Cable Failure
+      Use PPE SW recovery
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_CUMULUS</name>
+        <ec>
+          <value>0x10</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+      <chip>
+        <name>ENUM_ATTR_NAME_AXONE</name>
+        <ec>
+          <value>0x10</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <!-- ********************************************************************* -->
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_HW446279_DISABLE_FIX</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP</targetType>
     <description>
       HW446279 SMP Abus Cable Failure
       Disable HW fixes to rely on PPE SW recovery
@@ -862,6 +887,13 @@
           <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
       </chip>
+      <chip>
+        <name>ENUM_ATTR_NAME_AXONE</name>
+        <ec>
+          <value>0x10</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
     </chipEcFeature>
   </attribute>
   <!-- ********************************************************************* -->
@@ -8094,7 +8126,7 @@
   </attribute>
   <!-- ******************************************************************** -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_HW404391_SCAN</id>>
+    <id>ATTR_CHIP_EC_FEATURE_HW404391_SCAN</id>
     <targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP</targetType>
     <description>
       Nimbus DD2.1+: Workaround glxmux xstate issue by adjusting scan flush
@@ -8125,6 +8157,31 @@
     </chipEcFeature>
   </attribute>
   <!-- ******************************************************************** -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_HW404391_SCAN_OB12</id>
+    <targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      Nimbus DD2.1+: Workaround glxmux xstate issue by adjusting scan flush
+      state of selected latches in NVDL and PHY logic
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_CUMULUS</name>
+        <ec>
+          <value>0x11</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+      <chip>
+        <name>ENUM_ATTR_NAME_AXONE</name>
+        <ec>
+          <value>0x10</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <!-- ******************************************************************** -->
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_HW404391_SCOM</id>>
     <targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP</targetType>
@@ -8378,6 +8435,23 @@
     </chipEcFeature>
   </attribute>
   <!-- ******************************************************************** -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_HW440920</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+     Revert to ordered ("p8") TLBIE mode, disable NMMU snoop of TLBIE.
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_CUMULUS</name>
+        <ec>
+          <value>0x10</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <!-- ******************************************************************** -->
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_HW440920_DISABLE_FIX</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
@@ -8698,4 +8772,57 @@
     </chipEcFeature>
   </attribute>
   <!-- ******************************************************************** -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_MEMORY_DIRECT_ATTACHED</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+     The processor supports direct attached memory via DDR interface
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_NIMBUS</name>
+        <ec>
+          <value>0x10</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <!-- ******************************************************************** -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_MEMORY_DMI_ATTACHED</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+     The processor supports memory attached via Centaur memory buffer chip.
+     DMI connection links processor and Centaur chips.
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_CUMULUS</name>
+        <ec>
+          <value>0x10</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <!-- ******************************************************************** -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_MEMORY_OMI_ATTACHED</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+     The processor supports memory attached via OCMB memory buffer chip.
+     OMI connection links processor and OCMB chips.
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_AXONE</name>
+        <ec>
+          <value>0x10</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <!-- ******************************************************************** -->
 </attributes>
diff --git a/src/import/chips/p9/procedures/xml/attribute_info/p9_sbe_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/p9_sbe_attributes.xml
index 841b62b2..9954493a 100644
--- a/src/import/chips/p9/procedures/xml/attribute_info/p9_sbe_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/p9_sbe_attributes.xml
@@ -569,6 +569,10 @@ attribute tank
         <name>ATTR_CHIP_EC_FEATURE_SW430383</name>
         <virtual/>
   </entry>
+  <entry>
+        <name>ATTR_CHIP_EC_FEATURE_HW440920</name>
+        <virtual/>
+  </entry>
   <entry>
            <name>ATTR_SBE_ADDR_KEY_STASH_ADDR</name>
            <value>0x0000000000000000</value>
-- 
cgit v1.2.1