L3 RAS for draminit_training, eff_config, lib

Change-Id: I1981cd809b109f32869e4ec98c5cdfd7fb375af9
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41204
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41277
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>

3 files changed, 362 insertions, 309 deletions

diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_draminit_training.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_draminit_training.xml
index 435c3c1f9..a9c92df3b 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_draminit_training.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_draminit_training.xml
@@ -99,27 +99,33 @@
 
 <hwpError>
   <rc>RC_MSS_DRAMINIT_TRAINING_MULTIPLE_ERRORS</rc>
-  <description>Multiple training stesp failed for a given position within this calibration.</description>
+  <description>Multiple training steps failed for a given position within this calibration.</description>
   <ffdc>FAILED_STEPS</ffdc>
   <ffdc>PORT_POSITION</ffdc>
   <ffdc>RANKGROUP_POSITION</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
+    <target>DIMM_TARGET</target>
+    <priority>HIGH</priority>
   </callout>
+ <deconfigure>
+    <target>DIMM_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>DIMM_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>MEDIUM</priority>
   </callout>
 </hwpError>
 
@@ -130,21 +136,27 @@
   <ffdc>RANKGROUP_POSITION</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
+    <target>DIMM_TARGET</target>
+    <priority>HIGH</priority>
   </callout>
+ <deconfigure>
+    <target>DIMM_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>DIMM_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>MEDIUM</priority>
   </callout>
 </hwpError>
 
@@ -155,21 +167,27 @@
   <ffdc>RANKGROUP_POSITION</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
+    <target>DIMM_TARGET</target>
+    <priority>HIGH</priority>
   </callout>
+ <deconfigure>
+    <target>DIMM_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>DIMM_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>MEDIUM</priority>
   </callout>
 </hwpError>
 
@@ -180,21 +198,27 @@
   <ffdc>RANKGROUP_POSITION</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
+    <target>DIMM_TARGET</target>
+    <priority>HIGH</priority>
   </callout>
+ <deconfigure>
+    <target>DIMM_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>DIMM_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>MEDIUM</priority>
   </callout>
 </hwpError>
 
@@ -221,6 +245,12 @@
     <target>MCA_TARGET</target>
     <priority>HIGH</priority>
   </callout>
+ <deconfigure>
+    <target>MCA_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>MCA_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
     <priority>MEDIUM</priority>
@@ -234,21 +264,27 @@
   <ffdc>RANKGROUP_POSITION</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
+    <target>DIMM_TARGET</target>
+    <priority>HIGH</priority>
   </callout>
+ <deconfigure>
+    <target>DIMM_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>DIMM_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>MEDIUM</priority>
   </callout>
 </hwpError>
 
@@ -259,21 +295,27 @@
   <ffdc>RANKGROUP_POSITION</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
+    <target>DIMM_TARGET</target>
+    <priority>HIGH</priority>
   </callout>
+ <deconfigure>
+    <target>DIMM_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>DIMM_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>MEDIUM</priority>
   </callout>
 </hwpError>
 
@@ -284,21 +326,27 @@
   <ffdc>RANKGROUP_POSITION</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
+    <target>DIMM_TARGET</target>
+    <priority>HIGH</priority>
   </callout>
+ <deconfigure>
+    <target>DIMM_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>DIMM_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>MEDIUM</priority>
   </callout>
 </hwpError>
 
@@ -309,21 +357,27 @@
   <ffdc>RANKGROUP_POSITION</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
+    <target>DIMM_TARGET</target>
+    <priority>HIGH</priority>
   </callout>
+ <deconfigure>
+    <target>DIMM_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>DIMM_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>MEDIUM</priority>
   </callout>
 </hwpError>
 
@@ -334,21 +388,27 @@
   <ffdc>RANKGROUP_POSITION</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
+    <target>DIMM_TARGET</target>
+    <priority>HIGH</priority>
   </callout>
+ <deconfigure>
+    <target>DIMM_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>DIMM_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>MEDIUM</priority>
   </callout>
 </hwpError>
 
@@ -359,21 +419,27 @@
   <ffdc>RANKGROUP_POSITION</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
+    <target>DIMM_TARGET</target>
+    <priority>HIGH</priority>
   </callout>
+ <deconfigure>
+    <target>DIMM_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>DIMM_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>LOW</priority>
   </callout>
 </hwpError>
 
@@ -384,21 +450,27 @@
   <ffdc>RANKGROUP_POSITION</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
+    <target>DIMM_TARGET</target>
+    <priority>HIGH</priority>
   </callout>
+ <deconfigure>
+    <target>DIMM_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>DIMM_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>LOW</priority>
   </callout>
 </hwpError>
 
@@ -409,21 +481,27 @@
   <ffdc>RANKGROUP_POSITION</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
+    <target>DIMM_TARGET</target>
+    <priority>HIGH</priority>
   </callout>
+ <deconfigure>
+    <target>DIMM_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>DIMM_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>LOW</priority>
   </callout>
 </hwpError>
 
@@ -434,67 +512,59 @@
   <ffdc>RANKGROUP_POSITION</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
-  </callout>
-  <callout>
-    <procedure>CODE</procedure>
+    <target>DIMM_TARGET</target>
     <priority>HIGH</priority>
   </callout>
-</hwpError>
-
-<hwpError>
-  <rc>RC_MSS_DRAMINIT_PC_ERROR_INFO</rc>
-  <description>
-    The PHY control has noted an error. The details of the error are contianed
-    in this error log. If these errors caused an operation to fail, a subsequent
-    error will be logged indicating the failure.
-  </description>
-  <ffdc>PC_ERROR0</ffdc>
-  <collectRegisterFfdc>
-    <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_INFO</id>
-    <target>TARGET_IN_ERROR</target>
-    <targetType>TARGET_TYPE_MCA</targetType>
-  </collectRegisterFfdc>
-  <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
-  </callout>
+ <deconfigure>
+    <target>DIMM_TARGET</target>
+  </deconfigure>
+  <gard>
+    <target>DIMM_TARGET</target>
+  </gard>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>LOW</priority>
   </callout>
 </hwpError>
 
 <hwpError>
   <rc>RC_MSS_DISABLED_BITS</rc>
   <description>
-    The PHY has disabled too many bits to continue
+    The PHY has disabled too many bits to continue (6 bits)
   </description>
+  <ffdc>DP</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_INFO</id>
-    <target>TARGET_IN_ERROR</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_IN_ERROR</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
+  <callout>
+    <target>MCA_TARGET</target>
+    <priority>HIGH</priority>
+  </callout>
+  <callout>
+    <target>DIMM_TARGET</target>
+    <priority>MEDIUM</priority>
+  </callout>
   <deconfigure>
-    <target>TARGET_IN_ERROR</target>
+    <target>DIMM_TARGET</target>
   </deconfigure>
   <gard>
-    <target>TARGET_IN_ERROR</target>
+    <target>DIMM_TARGET</target>
   </gard>
 </hwpError>
 
@@ -507,19 +577,23 @@
   <ffdc>VALUE</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_INFO</id>
-    <target>TARGET_IN_ERROR</target>
+    <target>DIMM_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_IN_ERROR</target>
+    <target>DIMM_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
+  <callout>
+    <target>DIMM_TARGET</target>
+    <priority>HIGH</priority>
+  </callout>
   <deconfigure>
-    <target>TARGET_IN_ERROR</target>
+    <target>DIMM_TARGET</target>
   </deconfigure>
   <gard>
-    <target>TARGET_IN_ERROR</target>
+    <target>DIMM_TARGET</target>
   </gard>
 </hwpError>
 
@@ -529,17 +603,11 @@
     Tried to map rank pairs on a port without any DIMMS
   </description>
   <ffdc>FUNCTION</ffdc>
+  <ffdc>MCA_TARGET</ffdc>
   <callout>
     <procedure>CODE</procedure>
-    <priority>MEDIUM</priority>
-  </callout>
-  <callout>
-    <target>MCA_TARGET</target>
     <priority>HIGH</priority>
   </callout>
-  <deconfigure>
-    <target>MCA_TARGET</target>
-  </deconfigure>
 </hwpError>
 
 <hwpError>
@@ -549,23 +617,11 @@
   </description>
   <ffdc>FUNCTION</ffdc>
   <ffdc>RANK_SIZE</ffdc>
+  <ffdc>MCA_TARGET</ffdc>
   <callout>
     <procedure>CODE</procedure>
-    <priority>MEDIUM</priority>
-  </callout>
-  <callout>
-    <childTargets>
-        <parent>MCA_TARGET</parent>
-        <childType>TARGET_TYPE_DIMM</childType>
-    </childTargets>
     <priority>HIGH</priority>
   </callout>
-  <deconfigure>
-     <childTargets>
-        <parent>MCA_TARGET</parent>
-        <childType>TARGET_TYPE_DIMM</childType>
-    </childTargets>
-  </deconfigure>
 </hwpError>
 
 <hwpError>
@@ -575,23 +631,11 @@
   </description>
   <ffdc>FUNCTION</ffdc>
   <ffdc>RANK</ffdc>
+  <ffdc>MCA_TARGET</ffdc>
   <callout>
     <procedure>CODE</procedure>
-    <priority>MEDIUM</priority>
-  </callout>
-  <callout>
-    <childTargets>
-        <parent>MCA_TARGET</parent>
-        <childType>TARGET_TYPE_DIMM</childType>
-    </childTargets>
     <priority>HIGH</priority>
   </callout>
-  <deconfigure>
-     <childTargets>
-        <parent>MCA_TARGET</parent>
-        <childType>TARGET_TYPE_DIMM</childType>
-    </childTargets>
-  </deconfigure>
 </hwpError>
 
 <hwpError>
@@ -601,23 +645,11 @@
   </description>
   <ffdc>RANK_PAIR</ffdc>
   <ffdc>FUNCTION</ffdc>
+  <ffdc>MCA_TARGET</ffdc>
   <callout>
     <procedure>CODE</procedure>
-    <priority>MEDIUM</priority>
-  </callout>
-  <callout>
-    <childTargets>
-        <parent>MCA_TARGET</parent>
-        <childType>TARGET_TYPE_DIMM</childType>
-    </childTargets>
     <priority>HIGH</priority>
   </callout>
-  <deconfigure>
-     <childTargets>
-        <parent>MCA_TARGET</parent>
-        <childType>TARGET_TYPE_DIMM</childType>
-    </childTargets>
-  </deconfigure>
 </hwpError>
 
 <hwpError>
@@ -626,23 +658,11 @@
     No primary rank in rank pair
   </description>
   <ffdc>RANK_PAIR</ffdc>
+  <ffdc>MCA_TARGET</ffdc>
   <callout>
     <procedure>CODE</procedure>
-    <priority>MEDIUM</priority>
-  </callout>
-  <callout>
-    <childTargets>
-        <parent>MCA_TARGET</parent>
-        <childType>TARGET_TYPE_DIMM</childType>
-    </childTargets>
     <priority>HIGH</priority>
   </callout>
-  <deconfigure>
-     <childTargets>
-        <parent>MCA_TARGET</parent>
-        <childType>TARGET_TYPE_DIMM</childType>
-    </childTargets>
-  </deconfigure>
 </hwpError>
 
 <hwpError>
@@ -655,19 +675,19 @@
   <ffdc>MASK</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_INFO</id>
-    <target>TARGET_IN_ERROR</target>
+    <target>DIMM_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_IN_ERROR</target>
+    <target>DIMM_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <deconfigure>
-    <target>TARGET_IN_ERROR</target>
+    <target>DIMM_TARGET</target>
   </deconfigure>
   <gard>
-    <target>TARGET_IN_ERROR</target>
+    <target>DIMM_TARGET</target>
   </gard>
 </hwpError>
 
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_eff_config.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_eff_config.xml
index 4d042fa81..0183c3fd5 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_eff_config.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_eff_config.xml
@@ -37,12 +37,11 @@
 <hwpErrors>
 
   <hwpError>
-    <rc>RC_MSS_INVALID_TEMP_REF_RANGE</rc>
+    <rc>RC_MSS_INVALID_FINE_REFRESH_MODE</rc>
     <description>
-      Invalid Temperature refresh range recieved
-      from platform.
+      Invalid fine refresh mode received from the mrw
     </description>
-    <ffdc>TEMP_REF_RANGE</ffdc>
+    <ffdc>FINE_REF_MODE</ffdc>
     <callout>
       <procedure>CODE</procedure>
       <priority>HIGH</priority>
@@ -50,18 +49,9 @@
   </hwpError>
 
   <hwpError>
-    <rc>RC_MSS_INVALID_FINE_REFRESH_MODE</rc>
-    <description>
-      Invalid fine refresh mode recieved
-      from platform.
-    </description>
-    <ffdc>FINE_REF_MODE</ffdc>
-  </hwpError>
-
-  <hwpError>
     <rc>RC_MSS_INVALID_FINE_REFRESH_MODE_WITH_TEMP_REFRESH_MODE_ENABLED</rc>
     <description>
-        Invalid fine refresh mode recieved due to temperature fresh mode being enabled
+        Invalid fine refresh mode received due to temperature refresh mode being enabled
         If ATTR_MSS_MRW_TEMP_REFRESH_MODE is enabled, only NORMAL mode is allowed for FINE_REFRESH_MODE
     </description>
     <ffdc>FINE_REF_MODE</ffdc>
@@ -79,47 +69,11 @@
     </description>
     <ffdc>KEY</ffdc>
     <ffdc>DATA</ffdc>
+    <ffdc>DIMM_TARGET</ffdc>
     <callout>
       <procedure>CODE</procedure>
       <priority>HIGH</priority>
     </callout>
-    <callout>
-        <target>TARGET</target>
-      <priority>HIGH</priority>
-    </callout>
-    <deconfigure>
-      <target>TARGET</target>
-    </deconfigure>
-  </hwpError>
-
-  <hwpError>
-    <rc>RC_MSS_VPD_MT_LOAD_FAIL</rc>
-    <description>
-      Loading of VPD MT keyword failed. Could be due to an invalid port configuration.
-    </description>
-    <ffdc>MCA_TARGET</ffdc>
-    <callout>
-      <target>MCA_TARGET</target>
-      <priority>HIGH</priority>
-    </callout>
-    <deconfigure>
-      <target>MCA_TARGET</target>
-    </deconfigure>
-  </hwpError>
-
-  <hwpError>
-    <rc>RC_MSS_VPD_MR_LOAD_FAIL</rc>
-    <description>
-      Loading of VPD MR keyword failed. Could be due to an invalid port configuration.
-    </description>
-    <ffdc>MCA_TARGET</ffdc>
-    <callout>
-      <target>MCA_TARGET</target>
-      <priority>HIGH</priority>
-    </callout>
-    <deconfigure>
-      <target>MCA_TARGET</target>
-    </deconfigure>
   </hwpError>
 
   <hwpError>
@@ -130,7 +84,10 @@
     <ffdc>MAX</ffdc>
     <ffdc>VALUE</ffdc>
     <callout>
-      <procedure>CODE</procedure>
+      <hw>
+        <hwid>VPD_PART</hwid>
+        <refTarget>MCS_TARGET</refTarget>
+      </hw>
       <priority>HIGH</priority>
     </callout>
   </hwpError>
@@ -141,12 +98,12 @@
       Value in the VPD for PREAMBLE is not 0 or 1.
     </description>
     <ffdc>VALUE</ffdc>
+    <ffdc>DIMM_TARGET</ffdc>
     <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-    <callout>
-      <target>MCA_TARGET</target>
+      <hw>
+        <hwid>VPD_PART</hwid>
+        <refTarget>MCS_TARGET</refTarget>
+      </hw>
       <priority>HIGH</priority>
     </callout>
 </hwpError>
@@ -174,12 +131,15 @@
       <priority>HIGH</priority>
     </callout>
     <callout>
-      <target>TARGET</target>
-      <priority>HIGH</priority>
+      <target>DIMM_TARGET</target>
+      <priority>MEDIUM</priority>
     </callout>
     <deconfigure>
-      <target>TARGET</target>
+      <target>DIMM_TARGET</target>
     </deconfigure>
+    <gard>
+      <target>DIMM_TARGET</target>
+    </gard>
   </hwpError>
 
   <hwpError>
@@ -189,12 +149,20 @@
     </description>
     <ffdc>DATA_BUFFER_GEN</ffdc>
     <callout>
-      <target>DIMM_TARGET</target>
+      <procedure>MEMORY_PLUGGING_ERROR</procedure>
       <priority>HIGH</priority>
     </callout>
+    <callout>
+      <target>DIMM_TARGET</target>
+      <priority>MEDIUM</priority>
+    </callout>
     <deconfigure>
       <target>DIMM_TARGET</target>
     </deconfigure>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>MEDIUM</priority>
+    </callout>
   </hwpError>
 
   <hwpError>
@@ -206,12 +174,20 @@
     <ffdc>DIMM_TYPE</ffdc>
     <ffdc>DRAM_GEN</ffdc>
     <callout>
-      <target>DIMM_TARGET</target>
+      <procedure>MEMORY_PLUGGING_ERROR</procedure>
       <priority>HIGH</priority>
     </callout>
+    <callout>
+      <target>DIMM_TARGET</target>
+      <priority>MEDIUM</priority>
+    </callout>
     <deconfigure>
       <target>DIMM_TARGET</target>
     </deconfigure>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>MEDIUM</priority>
+    </callout>
   </hwpError>
 
   <hwpError>
@@ -233,13 +209,11 @@
         An invalid Freq value has been set
     </description>
     <ffdc>FREQ</ffdc>
+    <ffdc>DIMM_TARGET</ffdc>
     <callout>
       <target>DIMM_TARGET</target>
       <priority>HIGH</priority>
     </callout>
-    <deconfigure>
-      <target>DIMM_TARGET</target>
-    </deconfigure>
   </hwpError>
 
   <hwpError>
@@ -249,17 +223,11 @@
     </description>
     <ffdc>FREQ</ffdc>
     <ffdc>BC_NUM</ffdc>
+    <ffdc>DIMM_TARGET</ffdc>
     <callout>
       <procedure>CODE</procedure>
       <priority>HIGH</priority>
     </callout>
-    <callout>
-      <target>TARGET</target>
-      <priority>HIGH</priority>
-    </callout>
-    <deconfigure>
-      <target>TARGET</target>
-    </deconfigure>
   </hwpError>
 
   <hwpError>
@@ -269,17 +237,11 @@
     </description>
     <ffdc>FREQ</ffdc>
     <ffdc>RC_NUM</ffdc>
+    <ffdc>DIMM_TARGET</ffdc>
     <callout>
       <procedure>CODE</procedure>
       <priority>HIGH</priority>
     </callout>
-    <callout>
-      <target>TARGET</target>
-      <priority>HIGH</priority>
-    </callout>
-    <deconfigure>
-      <target>TARGET</target>
-    </deconfigure>
   </hwpError>
 
   <hwpError>
@@ -289,56 +251,36 @@
     </description>
     <ffdc>FREQ</ffdc>
     <ffdc>FUNCTION</ffdc>
+    <ffdc>DIMM_TARGET</ffdc>
     <callout>
       <procedure>CODE</procedure>
       <priority>HIGH</priority>
     </callout>
-    <callout>
-      <target>TARGET</target>
-      <priority>HIGH</priority>
-    </callout>
-    <deconfigure>
-      <childTargets>
-        <parent>TARGET</parent>
-        <childType>TARGET_TYPE_DIMM</childType>
-      </childTargets>
-    </deconfigure>
-  </hwpError>
-
-  <hwpError>
-      <rc>RC_MSS_INVALID_SPEED_FOR_TSV</rc>
-    <description>
-        As of 2/2017 no JEDEC timing values for 2666 3DS dram stack type
-    </description>
-    <ffdc>FREQ</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-    <callout>
-      <target>TARGET</target>
-      <priority>HIGH</priority>
-    </callout>
-    <deconfigure>
-      <target>TARGET</target>
-    </deconfigure>
   </hwpError>
 
   <hwpError>
     <rc>RC_MSS_ERROR_CREATING_EFF_CONFIG_DIMM_OBJECT</rc>
     <description>
-        Failed to create a dimm object, probably due to bad attribute settings
+        Failed to create a dimm object, probably due to bad data from SPD (ie code doesn't support)
     </description>
     <ffdc>DIMM_TYPE</ffdc>
     <ffdc>DRAM_GEN</ffdc>
     <ffdc>REG_AND_BUFF_TYPE</ffdc>
     <callout>
-      <target>DIMM_TARGET</target>
+      <procedure>MEMORY_PLUGGING_ERROR</procedure>
       <priority>HIGH</priority>
     </callout>
+    <callout>
+      <target>DIMM_TARGET</target>
+      <priority>MEDIUM</priority>
+    </callout>
     <deconfigure>
       <target>DIMM_TARGET</target>
     </deconfigure>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>MEDIUM</priority>
+    </callout>
   </hwpError>
 
   <hwpError>
@@ -348,12 +290,20 @@
     </description>
     <ffdc>STACK_TYPE</ffdc>
     <callout>
-      <target>DIMM_TARGET</target>
+      <procedure>MEMORY_PLUGGING_ERROR</procedure>
       <priority>HIGH</priority>
     </callout>
+    <callout>
+      <target>DIMM_TARGET</target>
+      <priority>MEDIUM</priority>
+    </callout>
     <deconfigure>
       <target>DIMM_TARGET</target>
     </deconfigure>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>MEDIUM</priority>
+    </callout>
   </hwpError>
 
   <hwpError>
@@ -365,34 +315,46 @@
     <ffdc>NUM_TOTAL_RANKS</ffdc>
     <ffdc>NUM_MASTER_RANKS</ffdc>
     <callout>
-      <procedure>CODE</procedure>
+      <procedure>MEMORY_PLUGGING_ERROR</procedure>
       <priority>HIGH</priority>
     </callout>
     <callout>
-      <target>TARGET</target>
+      <target>DIMM_TARGET</target>
       <priority>HIGH</priority>
     </callout>
     <deconfigure>
-      <target>TARGET</target>
+      <target>DIMM_TARGET</target>
     </deconfigure>
+    <gard>
+        <target>DIMM_TARGET</target>
+    </gard>
   </hwpError>
 
   <hwpError>
     <rc>RC_MSS_INVALID_CALCULATED_DIMM_SIZE</rc>
     <description>
-        Error calculating DIMM size
+        Error calculating DIMM size. Size is not supported
     </description>
+    <ffdc>CALCULATED_SIZE</ffdc>
     <ffdc>SDRAM_WIDTH</ffdc>
     <ffdc>BUS_WIDTH</ffdc>
     <ffdc>DRAM_DENSITY</ffdc>
     <ffdc>LOGICAL_RANKS</ffdc>
     <callout>
-      <target>TARGET</target>
+      <procedure>MEMORY_PLUGGING_ERROR</procedure>
       <priority>HIGH</priority>
     </callout>
+    <callout>
+      <target>DIMM_TARGET</target>
+      <priority>MEDIUM</priority>
+    </callout>
     <deconfigure>
-      <target>TARGET</target>
+      <target>DIMM_TARGET</target>
     </deconfigure>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>MEDIUM</priority>
+    </callout>
   </hwpError>
 
   <hwpError>
@@ -427,11 +389,11 @@
     <ffdc>SDRAM_DENSITY</ffdc>
     <ffdc>REFRESH_MODE</ffdc>
     <callout>
-      <target>TARGET</target>
-      <priority>HIGH</priority>
+      <target>DIMM_TARGET</target>
+      <priority>MEDIUM</priority>
     </callout>
     <deconfigure>
-      <target>TARGET</target>
+      <target>DIMM_TARGET</target>
     </deconfigure>
     <callout>
       <procedure>CODE</procedure>
@@ -446,16 +408,20 @@
     </description>
     <ffdc>DRAM_WIDTH</ffdc>
     <callout>
-      <procedure>CODE</procedure>
+      <procedure>MEMORY_PLUGGING_ERROR</procedure>
       <priority>HIGH</priority>
     </callout>
      <callout>
-      <target>TARGET</target>
-      <priority>HIGH</priority>
+      <target>DIMM_TARGET</target>
+      <priority>MEDIUM</priority>
     </callout>
     <deconfigure>
-      <target>TARGET</target>
+      <target>DIMM_TARGET</target>
     </deconfigure>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>MEDIUM</priority>
+    </callout>
   </hwpError>
 
   <hwpError>
@@ -465,12 +431,20 @@
     </description>
     <ffdc>DRAM_WIDTH</ffdc>
     <callout>
-      <target>TARGET</target>
+      <procedure>MEMORY_PLUGGING_ERROR</procedure>
       <priority>HIGH</priority>
     </callout>
+    <callout>
+      <target>DIMM_TARGET</target>
+      <priority>MEDIUM</priority>
+    </callout>
     <deconfigure>
-      <target>TARGET</target>
+      <target>DIMM_TARGET</target>
     </deconfigure>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>MEDIUM</priority>
+    </callout>
   </hwpError>
 
   <hwpError>
@@ -481,8 +455,12 @@
     <ffdc>RANK</ffdc>
     <ffdc>RTT_NOM_INDEX</ffdc>
     <ffdc>RTT_NOM_FROM_VPD</ffdc>
+    <ffdc>DIMM_TARGET</ffdc>
     <callout>
-      <procedure>CODE</procedure>
+      <hw>
+        <hwid>VPD_PART</hwid>
+        <refTarget>MCS_TARGET</refTarget>
+      </hw>
       <priority>HIGH</priority>
     </callout>
   </hwpError>
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_lib.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_lib.xml
index c55868f1e..9e4c29e8d 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_lib.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_lib.xml
@@ -27,7 +27,7 @@
 <!-- @file memory_mss_lib.xml -->
 <!-- @brief Error xml for MSS library routines -->
 <!-- -->
-<!-- *HWP HWP Owner:  Andre Marin <aamarin@us.ibm.com> -->
+<!-- *HWP HWP Owner: Jacob Harvey <jlharvey@us.ibm.com> -->
 <!-- *HWP FW Owner: Brian Silver <bsilver@us.ibm.com> -->
 <!-- *HWP Team: Memory -->
 <!-- *HWP Level: 1 -->
@@ -164,7 +164,9 @@
 
   <hwpError>
     <rc>RC_MSS_CCS_READ_MISCOMPARE</rc>
-    <description>CCS reports a read miscompare.</description>
+    <description>
+        CCS reports a read miscompare.
+    </description>
     <ffdc>REG_CONTENTS</ffdc>
     <collectRegisterFfdc>
       <id>REG_FFDC_MSS_CCS_FAILURE</id>
@@ -172,17 +174,23 @@
       <targetType>TARGET_TYPE_MCBIST</targetType>
     </collectRegisterFfdc>
     <callout>
-      <target>TARGET_IN_ERROR</target>
+      <target>MCA_TARGET</target>
       <priority>HIGH</priority>
     </callout>
     <deconfigure>
-      <target>TARGET_IN_ERROR</target>
+      <target>MCA_TARGET</target>
     </deconfigure>
+    <gard>
+        <target>MCA_TARGET</target>
+    </gard>
   </hwpError>
 
   <hwpError>
     <rc>RC_MSS_CCS_UE_SUE</rc>
-    <description>CCS reports a UE or SUE</description>
+    <description>
+        CCS reports a UE or SUE in the CCS program array
+        Chould be an indicator of corruption in the CCS program
+    </description>
     <ffdc>REG_CONTENTS</ffdc>
     <collectRegisterFfdc>
       <id>REG_FFDC_MSS_CCS_FAILURE</id>
@@ -196,11 +204,16 @@
     <deconfigure>
       <target>TARGET_IN_ERROR</target>
     </deconfigure>
+    <gard>
+        <target>TARGET_IN_ERROR</target>
+    </gard>
   </hwpError>
 
   <hwpError>
     <rc>RC_MSS_CCS_CAL_TIMEOUT</rc>
-    <description>CCS reports a calibration operation timeout</description>
+    <description>
+        CCS reports never getting a response back from the PHY on a calibration command
+    </description>
     <ffdc>REG_CONTENTS</ffdc>
     <collectRegisterFfdc>
       <id>REG_FFDC_MSS_CCS_FAILURE</id>
@@ -208,17 +221,22 @@
       <targetType>TARGET_TYPE_MCBIST</targetType>
     </collectRegisterFfdc>
     <callout>
-      <target>TARGET_IN_ERROR</target>
+      <target>MCA_TARGET</target>
       <priority>HIGH</priority>
     </callout>
     <deconfigure>
-      <target>TARGET_IN_ERROR</target>
+      <target>MCA_TARGET</target>
     </deconfigure>
+    <gard>
+        <target>MCA_TARGET</target>
+    </gard>
   </hwpError>
 
   <hwpError>
     <rc>RC_MSS_CCS_HUNG</rc>
-    <description>CCS failed to return from in-progress status and failed to describe an error further</description>
+    <description>
+        Software reported that the machine is not seeing the CCS finish in the alloted time
+    </description>
     <collectRegisterFfdc>
       <id>REG_FFDC_MSS_CCS_FAILURE</id>
       <target>TARGET_IN_ERROR</target>
@@ -231,11 +249,17 @@
     <deconfigure>
       <target>TARGET_IN_ERROR</target>
     </deconfigure>
+    <gard>
+        <target>TARGET_IN_ERROR</target>
+    </gard>
   </hwpError>
 
   <hwpError>
     <rc>RC_MSS_CCS_HUNG_TRYING_TO_STOP</rc>
-    <description>CCS failed to return from in-progress status while trying to stop a previous program</description>
+    <description>
+        CCS failed to return from in-progress status while trying to stop a previous program
+        Software reported that CCS did not finish in alloted time after manually triggering stop
+    </description>
     <collectRegisterFfdc>
       <id>REG_FFDC_MSS_CCS_FAILURE</id>
       <target>TARGET_IN_ERROR</target>
@@ -248,11 +272,17 @@
     <deconfigure>
       <target>TARGET_IN_ERROR</target>
     </deconfigure>
+    <gard>
+        <target>TARGET_IN_ERROR</target>
+    </gard>
   </hwpError>
 
   <hwpError>
     <rc>RC_MSS_MCBIST_TIMEOUT</rc>
-    <description>MCBIST program failed to return in the time allowed</description>
+    <description>
+        MCBIST program failed to return in the time allowed
+        Software timer, MCBIST has not finished in the time allowed
+    </description>
     <collectRegisterFfdc>
       <id>REG_FFDC_MSS_CCS_FAILURE</id>
       <target>TARGET_IN_ERROR</target>
@@ -262,11 +292,19 @@
       <target>TARGET_IN_ERROR</target>
       <priority>HIGH</priority>
     </callout>
+    <deconfigure>
+      <target>TARGET_IN_ERROR</target>
+    </deconfigure>
+    <gard>
+        <target>TARGET_IN_ERROR</target>
+    </gard>
   </hwpError>
 
   <hwpError>
-    <rc>RC_MSS_MCBIST_MULTIPLE_FAIL_BITS</rc>
-    <description>MCBIST program appeared to have failed, but set conflicting bits in the status register</description>
+    <rc>RC_MSS_MCBIST_DATA_FAIL</rc>
+    <description>
+        MCBIST program appeared to have failed, but set conflicting bits in the status register
+    </description>
     <ffdc>STATUS_REGISTER</ffdc>
     <collectRegisterFfdc>
       <id>REG_FFDC_MSS_CCS_FAILURE</id>
@@ -277,6 +315,12 @@
       <target>TARGET_IN_ERROR</target>
       <priority>HIGH</priority>
     </callout>
+    <deconfigure>
+      <target>TARGET_IN_ERROR</target>
+    </deconfigure>
+    <gard>
+        <target>TARGET_IN_ERROR</target>
+    </gard>
   </hwpError>
 
   <hwpError>
@@ -292,12 +336,22 @@
       <target>TARGET_IN_ERROR</target>
       <priority>HIGH</priority>
     </callout>
+    <deconfigure>
+      <target>TARGET_IN_ERROR</target>
+    </deconfigure>
+    <gard>
+        <target>TARGET_IN_ERROR</target>
+    </gard>
   </hwpError>
 
   <hwpError>
     <rc>RC_MSS_MCBIST_PROGRAM_TOO_BIG</rc>
     <description>MCBIST program larger than currently supported size</description>
     <ffdc>PROGRAM_LENGTH</ffdc>
+    <callout>
+        <procedure>CODE</procedure>
+        <priority>HIGH</priority>
+    </callout>
   </hwpError>
 
   <hwpError>
@@ -402,8 +456,13 @@
     <ffdc>DIMM_TYPE</ffdc>
     <ffdc>ROWS</ffdc>
     <ffdc>SIZE</ffdc>
+    <ffdc>DIMM_IN_ERROR</ffdc>
+    <callout>
+      <procedure>MEMORY_PLUGGING_ERROR</procedure>
+      <priority>MEDIUM</priority>
+    </callout>
     <callout>
-      <target>DIMM_IN_ERROR</target>
+      <procedure>CODE</procedure>
       <priority>HIGH</priority>
     </callout>
   </hwpError>
@@ -413,13 +472,11 @@
     <description>Indicates a fail when attempting to get a DIMM index for a given rank</description>
     <ffdc>RANK</ffdc>
     <ffdc>DIMM_INDEX</ffdc>
+    <ffdc>MCA_TARGET</ffdc>
     <callout>
-      <target>TARGET</target>
+      <procedure>CODE</procedure>
       <priority>HIGH</priority>
     </callout>
-    <deconfigure>
-      <target>TARGET</target>
-    </deconfigure>
   </hwpError>
 
   <hwpError>
@@ -427,13 +484,11 @@
     <description>Indicates a fail when attempting to get a DIMM target for a given DIMM index</description>
     <ffdc>RANK</ffdc>
     <ffdc>DIMM_INDEX</ffdc>
+    <ffdc>MCA_TARGET</ffdc>
     <callout>
-      <target>TARGET</target>
+      <procedure>CODE</procedure>
       <priority>HIGH</priority>
     </callout>
-    <deconfigure>
-      <target>TARGET</target>
-    </deconfigure>
   </hwpError>
 
 </hwpErrors>