From 2582f47596ade668dac54cf91af02eefab7f4e9c Mon Sep 17 00:00:00 2001
From: Nick Klazynski <jklazyns@us.ibm.com>
Date: Thu, 19 Jul 2018 12:20:16 -0500
Subject: Enable CDD1.3's 4 risklevels (step 1)

Risklevel 0 - DD1.2 compat, non-HANA (variant1/2 secure)
Risklevel 1 - DD1.2 compat, HANA (no security)
Risklevel 2 - Unused
Risklevel 3 - Unused
Risklevel 4 - DD1.3 native, non-HANA (variant1/2 secure)
Risklevel 5 - DD1.3 native, HANA (no security)

Step 2 will involve disabling all fixes to make CDD1.3 RL0/RL1
identical to CDD1.2 RL0/RL1.

Change-Id: Ic7f031c97f2616a0eec0a965c52dcaed3ec698e3
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/62935
Dev-Ready: James N. Klazynski <jklazyns@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: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/62984
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
---
 .../xml/attribute_info/chip_ec_attributes.xml      | 70 ++++++++++++++++++++--
 1 file changed, 64 insertions(+), 6 deletions(-)

(limited to 'src')

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 87928eb1..35b5b19c 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
@@ -291,14 +291,14 @@
         <name>ENUM_ATTR_NAME_NIMBUS</name>
         <ec>
           <value>0x22</value>
-          <test>EQUAL</test>
+          <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
       </chip>
       <chip>
         <name>ENUM_ATTR_NAME_CUMULUS</name>
         <ec>
           <value>0x12</value>
-          <test>EQUAL</test>
+          <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
       </chip>
     </chipEcFeature>
@@ -1465,29 +1465,53 @@
   </attribute>
   <!-- ******************************************************************** -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_HW447585</id>
+    <id>ATTR_CHIP_EC_FEATURE_HW447585_CDD13_NDD23</id>
     <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      HW447585 - disable slbwalk
+      HW447585 - disable slbwalk - dials changed in CDD1.3+/NDD2.3+
     </description>
     <chipEcFeature>
       <chip>
         <name>ENUM_ATTR_NAME_NIMBUS</name>
         <ec>
-          <value>0x20</value>
+          <value>0x23</value>
           <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
       </chip>
       <chip>
         <name>ENUM_ATTR_NAME_CUMULUS</name>
         <ec>
-          <value>0x10</value>
+          <value>0x13</value>
           <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
       </chip>
     </chipEcFeature>
   </attribute>
   <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_HW447585</id>
+    <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      HW447585 - disable slbwalk
+    </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>0x12</value>
+          <test>LESS_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <!-- ********************************************************************* -->
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_HW447589</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
@@ -4753,6 +4777,23 @@
     </chipEcFeature>
   </attribute>
   <!-- ******************************************************************** -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_CORE_CDD12_CDD13_SECURITY</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      Security settings for Cumulus DD1.2 and DD1.3
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_CUMULUS</name>
+        <ec>
+          <value>0x12</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <!-- ******************************************************************** -->
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_CORE_CDD12_SECURITY</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
@@ -4770,6 +4811,23 @@
     </chipEcFeature>
   </attribute>
   <!-- ******************************************************************** -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_CORE_CDD13_SECURITY</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      Security settings for Cumulus DD1.3
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_CUMULUS</name>
+        <ec>
+          <value>0x13</value>
+          <test>EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <!-- ******************************************************************** -->
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_CORE_CDD11_CDD12_SECURITY</id>
     <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
-- 
cgit v1.2.1