Generalize set fields in pre_data_init

Added a definition file for data engine traits for
specialization purposes.  Moved pre_data_engine
definitions into a common templated version.

Change-Id: Ic3ac995c55d909e0556cac300d1e26698200323d
Original-Change-Id: Ifb204da9cc6eb9d5d36b6eaeb1e1a5e99c97544e
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/69411
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Dev-Ready: ANDRE A. MARIN <aamarin@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>

2 files changed, 99 insertions, 2 deletions

diff --git a/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H b/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H
index 136aa237..808ad4f0 100644
--- a/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H
+++ b/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H
@@ -123,8 +123,6 @@ enum generic_ffdc_codes
     BASE_MODULE_TYPE = 0x101C,
     BAD_SPD_DATA = 0x101D,
     SET_FIELD = 0x101E,
-
-    // mss_freq functions
     SELECT_SUPPORTED_FREQ = 0x101F,
     FREQ_SCOREBOARD_REMOVE_FREQS_ABOVE_LIMIT = 0x1020,
     FREQ_SCOREBOARD_REMOVE_FREQS_ABOVE_LIMIT_VECTOR = 0x1021,
@@ -132,6 +130,12 @@ enum generic_ffdc_codes
     FREQ_SCOREBOARD_MAX_SUPPORTED_FREQ = 0x1023,
     FREQ_SCOREBOARD_SUPPORTED_FREQS = 0x1024,
     LIMIT_FREQ_BY_VPD = 0x1025,
+    SET_DIMM_TYPE = 0x1026,
+    SET_DRAM_GEN = 0x1027,
+    SET_HYBRID = 0x1027,
+    SET_HYBRID_MEDIA = 0x1028,
+    SET_MRANKS = 0x1029,
+    SET_DIMM_RANKS_CNFG = 0x1039,
 };
 
 ///
@@ -255,6 +259,31 @@ enum nibble_mask
 };
 
 
+///
+/// @brief Trait classes for proc_type
+///
+template< proc_type P >
+class procTraits;
+
+///
+/// @brief Trait classes for proc_type - NIMBUS specialization
+///
+template< >
+struct procTraits<proc_type::NIMBUS>
+{
+    enum
+    {
+        MC_PER_MODULE = 2,
+        MCS_PER_MC = 2,
+        MCS_PER_PROC = MC_PER_MODULE * MCS_PER_MC,
+        PORTS_PER_MCBIST = 4,
+        PORTS_PER_MCS = 2,
+        DIMMS_PER_PORT = 2,
+        DIMMS_PER_MCS = PORTS_PER_MCS * DIMMS_PER_PORT,
+        DIMMS_PER_MCBIST = PORTS_PER_MCBIST * DIMMS_PER_PORT,
+    };
+};
+
 }// mss
 
 #endif
diff --git a/src/import/generic/procedures/xml/error_info/generic_error.xml b/src/import/generic/procedures/xml/error_info/generic_error.xml
index 59882a66..be4c148c 100644
--- a/src/import/generic/procedures/xml/error_info/generic_error.xml
+++ b/src/import/generic/procedures/xml/error_info/generic_error.xml
@@ -330,4 +330,72 @@
     </callout>
   </hwpError>
 
+  <hwpError>
+    <rc>RC_MSS_UNEXPECTED_VALUE_SEEN</rc>
+    <description> Invalid value seen versus the expected value wanted </description>
+    <ffdc>TARGET</ffdc>
+    <ffdc>EXPECTED</ffdc>
+    <ffdc>ACTUAL</ffdc>
+    <ffdc>FUNCTION</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>LOW</priority>
+    </callout>
+  </hwpError>
+
+  <hwpError>
+    <rc>RC_MSS_OUT_OF_BOUNDS_INDEXING</rc>
+    <description>
+      Desired index is larger than list (std::vector, array, etc.) size.
+      Likely a programming error.
+    </description>
+    <ffdc>TARGET</ffdc>
+    <ffdc>INDEX</ffdc>
+    <ffdc>LIST_SIZE</ffdc>
+    <ffdc>FUNCTION</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>LOW</priority>
+    </callout>
+  </hwpError>
+
+  <hwpError>
+    <rc>RC_MSS_CONVERSION_ERROR</rc>
+    <description>
+      Overflow or underflow occured converting one integral type to another.
+      This is a programming error.
+    </description>
+    <ffdc>TARGET</ffdc>
+    <ffdc>ORIGINAL_VAL</ffdc>
+    <ffdc>CONVERTED_VAL</ffdc>
+    <ffdc>FUNCTION</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>LOW</priority>
+    </callout>
+  </hwpError>
+
+  <hwpError>
+    <rc>RC_MSS_FAILED_DATA_INTEGRITY_CHECK</rc>
+    <description>
+        Bad data received.
+        Settings are incorrect for received data.
+        This could be code problem (decoding) or bad data.
+    </description>
+    <ffdc>VALUE</ffdc>
+    <ffdc>BYTE</ffdc>
+    <ffdc>FFDC_CODE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>MEDIUM</priority>
+    </callout>
+    <callout>
+      <target>TARGET</target>
+      <priority>HIGH</priority>
+    </callout>
+    <deconfigure>
+      <target>TARGET</target>
+    </deconfigure>
+  </hwpError>
+
 </hwpErrors>