nest updates for p9c DD1.3 native and p9c DD1.2 compatibility modes

  HW 446279 - disable update for compat and native modes
  HW 439321 - disable update for compat, enable for native mode
  HW 443004 - disable update for compat and native modes
  HW 446453 - disable update for compat, enable for native mode

Change-Id: I3dd1ed6075ff473adbaf342671dd977c53fb2f06
CQ: HW446279
CQ: HW439321
CQ: HW443004
CQ: HW446453
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64067
Reviewed-by: LUKE MURRAY <murrayl@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: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64082
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

3 files changed, 36 insertions, 14 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
index 3b6a9b28..c8b5ce8c 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
@@ -60,8 +60,8 @@ fapi2::ReturnCode p9_ncu_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
         FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_FABRIC_ADDR_EXTENSION_CHIP_ID, TGT1, l_TGT1_ATTR_FABRIC_ADDR_EXTENSION_CHIP_ID));
         fapi2::ATTR_SMF_CONFIG_Type l_TGT1_ATTR_SMF_CONFIG;
         FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_SMF_CONFIG, TGT1, l_TGT1_ATTR_SMF_CONFIG));
-        fapi2::ATTR_CHIP_EC_FEATURE_HW440920_Type l_TGT2_ATTR_CHIP_EC_FEATURE_HW440920;
-        FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_HW440920, TGT2, l_TGT2_ATTR_CHIP_EC_FEATURE_HW440920));
+        fapi2::ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY_Type l_TGT2_ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY;
+        FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY, TGT2, l_TGT2_ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY));
         fapi2::buffer<uint64_t> l_scom_buffer;
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x1001100aull, l_scom_buffer ));
@@ -166,7 +166,7 @@ fapi2::ReturnCode p9_ncu_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
             l_scom_buffer.insert<0, 1, 63, uint64_t>(l_EXP_NC_NCMISC_NCSCOMS_TLBIE_STALL_EN_ON );
             l_scom_buffer.insert<1, 3, 61, uint64_t>(literal_6 );
 
-            if ((l_TGT2_ATTR_CHIP_EC_FEATURE_HW440920 != literal_0))
+            if ((l_TGT2_ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY != literal_0))
             {
                 l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_15 );
             }
@@ -175,7 +175,7 @@ fapi2::ReturnCode p9_ncu_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
                 l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_4 );
             }
 
-            if ((l_TGT2_ATTR_CHIP_EC_FEATURE_HW440920 != literal_0))
+            if ((l_TGT2_ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY != literal_0))
             {
                 l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x01 );
             }
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 77b0979f..4aa0f286 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
@@ -771,22 +771,22 @@
   </attribute>
   <!-- ********************************************************************* -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_HW446279</id>
+    <id>ATTR_CHIP_EC_FEATURE_HW446279_DISABLE_FIX</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>
       HW446279 SMP Abus Cable Failure
+      Disable HW fixes to rely on PPE SW recovery
     </description>
     <chipEcFeature>
       <chip>
         <name>ENUM_ATTR_NAME_CUMULUS</name>
         <ec>
           <value>0x13</value>
-          <test>LESS_THAN</test>
+          <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
       </chip>
     </chipEcFeature>
   </attribute>
-
   <!-- ********************************************************************* -->
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_HW430944</id>
@@ -7650,17 +7650,43 @@
   </attribute>
   <!-- ******************************************************************** -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_HW440920</id>
+    <id>ATTR_CHIP_EC_FEATURE_HW440920_DISABLE_FIX</id>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>
-     Revert to ordered ("p8") TLBIE mode, disable NMMU snoop of TLBIE.
+     HW fixes for HW440920 are present in chip logic, but
+     revert to ordered ("p8") TLBIE mode, disable NMMU snoop of TLBIE.
+     disable nest TLBIE changes
     </description>
     <chipEcFeature>
       <chip>
         <name>ENUM_ATTR_NAME_CUMULUS</name>
         <ec>
           <value>0x13</value>
-          <test>LESS_THAN</test>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+  <!-- ******************************************************************** -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_HW446453</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+     NCU HW contains design change to address HW446453
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_CUMULUS</name>
+        <ec>
+          <value>0x13</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+      <chip>
+        <name>ENUM_ATTR_NAME_NIMBUS</name>
+        <ec>
+          <value>0x23</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
       </chip>
     </chipEcFeature>
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 64d77a1e..454ce327 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
@@ -562,10 +562,6 @@ attribute tank
         <virtual/>
   </entry>
   <entry>
-        <name>ATTR_CHIP_EC_FEATURE_HW440920</name>
-        <virtual/>
-  </entry>
-  <entry>
         <name>ATTR_CHIP_EC_FEATURE_SW430383</name>
         <virtual/>
   </entry>