From 04dca06e57ea9f8dac4300537665700b2a503271 Mon Sep 17 00:00:00 2001
From: David Kauer <dmkauer@us.ibm.com>
Date: Mon, 18 Sep 2017 20:53:24 -0500
Subject: [PATCH] Added Nimbus & Cumulus attributes for INT initfiles

Change-Id: Iabb14846f0cde49bfa1c5cc90ef6007df76c2140
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46430
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>
Reviewed-by: Jenny Huynh <jhuynh@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: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Kevin F. Reick <reick@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46440
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
---
 .../xml/attribute_info/chip_ec_attributes.xml | 44 ++++++++++++++++---
 1 file changed, 38 insertions(+), 6 deletions(-)

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 d0d69ba71..db1233bcd 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
@@ -1979,8 +1979,8 @@
       <chip>
         <name>ENUM_ATTR_NAME_NIMBUS</name>
         <ec>
-          <value>0x20</value>
-          <test>LESS_THAN_OR_EQUAL</test>
+          <value>0x10</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
       </chip>
     </chipEcFeature>
@@ -4696,14 +4696,14 @@
     <id>ATTR_CHIP_EC_FEATURE_HW411637</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      Mask INT SUE FIR bit for Nimbus DD2.0 only
+      Mask INT SUE FIR bit for Nimbus DD2.0
     </description>
     <chipEcFeature>
       <chip>
         <name>ENUM_ATTR_NAME_NIMBUS</name>
         <ec>
           <value>0x20</value>
-          <test>EQUAL</test>
+          <test>LESS_THAN_OR_EQUAL</test>
         </ec>
       </chip>
     </chipEcFeature>
@@ -5098,10 +5098,10 @@
   </attribute>
   <!-- ******************************************************************** -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_INT_DD1</id>
+    <id>ATTR_CHIP_EC_FEATURE_P9N_INT_DD10</id> 
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-      Common Attribute for INT DD1 spys
+      Common Attribute for INT DD10 spys
     </description>
     <chipEcFeature>
       <chip>
@@ -5113,6 +5113,38 @@
       </chip>
     </chipEcFeature>
   </attribute>
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_P9N_INT_DD20</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      Common Attribute for INT DD20 spys
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_NIMBUS</name>
+        <ec>
+          <value>0x20</value>
+          <test>EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_P9N_INT_DD21</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      Common Attribute for INT DD21+ spys
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_NIMBUS</name>
+        <ec>
+          <value>0x21</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
   <!-- ******************************************************************** -->
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_DD1_FBC_SETTINGS</id>