From 3cd93681962894f712d3350e3972443c24fbf8a2 Mon Sep 17 00:00:00 2001
From: Ben Gass <bgass@us.ibm.com>
Date: Wed, 13 Sep 2017 23:20:51 -0500
Subject: [PATCH] Updates for HW416934 and HW417233

Conflicting dd1 only dials for these were removed:
ATTR_CHIP_EC_FEATURE_HW396288
ATTR_CHIP_EC_FEATURE_HW399624
ATTR_CHIP_EC_FEATURE_HW393578
ATTR_CHIP_EC_FEATURE_HW403075
ATTR_CHIP_EC_FEATURE_HW393318
ATTR_CHIP_EC_FEATURE_HW394497

Work around for HW408891 is contained within HW416934 update.

Change-Id: I8cb266893d802f1673f683f17fd231e17de1cfa1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46177
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46180
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
---
 .../procedures/hwp/initfiles/p9_core_scom.C   |  8 +--
 .../xml/attribute_info/chip_ec_attributes.xml | 53 +++++++++++++++++++
 2 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C
index 34d8bf970..d762813f2 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_core_scom.C
@@ -29,9 +29,9 @@
 
 using namespace fapi2;
 
-constexpr uint64_t literal_0x0301D70000AB76F6 = 0x0301D70000AB76F6;
+constexpr uint64_t literal_0x0301D70000AB76FE = 0x0301D70000AB76FE;
 constexpr uint64_t literal_0x0000000000000000 = 0x0000000000000000;
-constexpr uint64_t literal_0xA854009775100008 = 0xA854009775100008;
+constexpr uint64_t literal_0xA854009775100000 = 0xA854009775100000;
 
 fapi2::ReturnCode p9_core_scom(const fapi2::Target<fapi2::TARGET_TYPE_CORE>& TGT0)
 {
@@ -40,7 +40,7 @@ fapi2::ReturnCode p9_core_scom(const fapi2::Target<fapi2::TARGET_TYPE_CORE>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x20010a43ull, l_scom_buffer ));
 
-            l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x0301D70000AB76F6 );
+            l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x0301D70000AB76FE );
             FAPI_TRY(fapi2::putScom(TGT0, 0x20010a43ull, l_scom_buffer));
         }
         {
@@ -52,7 +52,7 @@ fapi2::ReturnCode p9_core_scom(const fapi2::Target<fapi2::TARGET_TYPE_CORE>& TGT
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x20010a47ull, l_scom_buffer ));
 
-            l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0xA854009775100008 );
+            l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0xA854009775100000 );
             FAPI_TRY(fapi2::putScom(TGT0, 0x20010a47ull, l_scom_buffer));
         }
 
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 a23aeb012..8b39f0905 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
@@ -29,6 +29,59 @@
 -->
 
 <attributes>
+
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_HW416934</id>
+    <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      Nimbus DD1, DD2.0, DD2.1, Cumulus DD1 only:
+      HW416934 - Cache Inhibited (I=1) lxvd2x load sends 8 byte load to NCU instead of 16 byte
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_NIMBUS</name>
+        <ec>
+          <value>0x21</value>
+          <test>LESS_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+      <chip>
+        <name>ENUM_ATTR_NAME_CUMULUS</name>
+        <ec>
+          <value>0x10</value>
+          <test>LESS_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_HW417233</id>
+    <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      Nimbus DD1, DD2.0, DD2.1, Cumulus DD1 only:
+      HW417233 - Copy paste lsu bug
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_NIMBUS</name>
+        <ec>
+          <value>0x21</value>
+          <test>LESS_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+      <chip>
+        <name>ENUM_ATTR_NAME_CUMULUS</name>
+        <ec>
+          <value>0x10</value>
+          <test>LESS_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
+
   <!-- ********************************************************************* -->
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_P9_NO_NDL_IOVALID</id>