Hostboot Serviceability Review Part 2

Resolving TODOs and ensuring error logs have correct callouts

Change-Id: Ic2e65427487fb91553ffe4ed6e3ed922004963ba
RTC: 92837
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8374
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

11 files changed, 134 insertions, 39 deletions

diff --git a/src/usr/hwpf/hwp/mvpd_accessors/accessMBvpdL4BankDelete.C b/src/usr/hwpf/hwp/mvpd_accessors/accessMBvpdL4BankDelete.C
index cb2ade3ee..f7da89caa 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/accessMBvpdL4BankDelete.C
+++ b/src/usr/hwpf/hwp/mvpd_accessors/accessMBvpdL4BankDelete.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2013              */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: accessMBvpdL4BankDelete.C,v 1.2 2013/11/21 17:17:59 whs Exp $
+// $Id: accessMBvpdL4BankDelete.C,v 1.3 2014/02/12 22:11:26 mjjones Exp $
 /**
  *  @file accessMBvpdL4BankDelete.C
  *
@@ -74,6 +74,7 @@ fapi::ReturnCode accessMBvpdL4BankDelete(
                        l_bufSize, sizeof(l_l4BankDelete));
                 const uint32_t & KEYWORD = sizeof(l_l4BankDelete);
                 const uint32_t & RETURNED_SIZE = l_bufSize;
+                const fapi::Target & CHIP_TARGET = i_mbTarget;
                 FAPI_SET_HWP_ERROR(l_fapirc,RC_MBVPD_INSUFFICIENT_VPD_RETURNED);
                 break;  //  break out with fapirc
             }
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdAddrMirrorData.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdAddrMirrorData.C
index 6d4d3b2cd..571692f69 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdAddrMirrorData.C
+++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdAddrMirrorData.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2013              */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: getMBvpdAddrMirrorData.C,v 1.2 2013/07/18 15:33:35 whs Exp $
+// $Id: getMBvpdAddrMirrorData.C,v 1.4 2014/02/12 22:11:32 mjjones Exp $
 /**
  *  @file getMBvpdAddrMirrorData.C
  *
@@ -116,6 +116,7 @@ fapi::ReturnCode getMBvpdAddrMirrorData(
                        l_MaBufsize, AM_KEYWORD_SIZE);
             const uint32_t & KEYWORD = fapi::MBVPD_KEYWORD_AM;
             const uint32_t & RETURNED_SIZE = l_MaBufsize;
+            const fapi::Target & CHIP_TARGET = l_mbTarget;
             FAPI_SET_HWP_ERROR(l_fapirc, RC_MBVPD_INSUFFICIENT_VPD_RETURNED );
             break;  //  break out with fapirc
         }
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdDram2NModeEnabled.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdDram2NModeEnabled.C
index b5140e2e0..0386bb203 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdDram2NModeEnabled.C
+++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdDram2NModeEnabled.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2013              */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: getMBvpdDram2NModeEnabled.C,v 1.2 2013/10/31 18:06:17 whs Exp $
+// $Id: getMBvpdDram2NModeEnabled.C,v 1.3 2014/02/12 22:11:39 mjjones Exp $
 /**
  *  @file getMBvpdDram2NModeEnabled.C
  *
@@ -69,6 +69,7 @@ fapi::ReturnCode getMBvpdDram2NModeEnabled(
                      l_dram2NMode[0],l_dram2NMode[1]);
             const uint32_t & PORT0 = l_dram2NMode[0];
             const uint32_t & PORT1 = l_dram2NMode[1];
+            const fapi::Target & MBA_TARGET = i_mbaTarget;
             FAPI_SET_HWP_ERROR(l_fapirc,RC_MBVPD_DRAM_2N_MODE_NOT_EQUAL);
             break;  //  break out with fapirc
         }
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdPhaseRotatorData.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdPhaseRotatorData.C
index 34cbbe774..d7d26700c 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdPhaseRotatorData.C
+++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdPhaseRotatorData.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: getMBvpdPhaseRotatorData.C,v 1.7 2014/01/11 13:35:43 whs Exp $
+// $Id: getMBvpdPhaseRotatorData.C,v 1.8 2014/02/12 22:11:46 mjjones Exp $
 /**
  *  @file getMBvpdPhaseRotatorData.C
  *
@@ -163,6 +163,7 @@ fapi::ReturnCode getMBvpdPhaseRotatorData(
                        l_MrBufsize, MR_KEYWORD_SIZE);
             const uint32_t & KEYWORD = fapi::MBVPD_KEYWORD_MR;
             const uint32_t & RETURNED_SIZE = l_MrBufsize;
+            const fapi::Target & CHIP_TARGET = l_mbTarget;
             FAPI_SET_HWP_ERROR(l_fapirc, RC_MBVPD_INSUFFICIENT_VPD_RETURNED );
             break;  //  break out with fapirc
         }
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSensorMap.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSensorMap.C
index 37d20d311..a455b0970 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSensorMap.C
+++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSensorMap.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSensorMap.C $  */
+/* $Source: src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSensorMap.C $         */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2013              */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: getMBvpdSensorMap.C,v 1.1 2013/11/20 22:37:38 whs Exp $
+// $Id: getMBvpdSensorMap.C,v 1.2 2014/02/12 22:11:52 mjjones Exp $
 
 /**
  * @file getMBvpdSensorMap.C
@@ -92,6 +92,7 @@ fapi::ReturnCode getMBvpdSensorMap(
                        l_MwBufsize, MW_KEYWORD_SIZE);
             const uint32_t & KEYWORD = fapi::MBVPD_KEYWORD_MW;
             const uint32_t & RETURNED_SIZE = l_MwBufsize;
+            const fapi::Target & CHIP_TARGET = i_mbTarget;
             FAPI_SET_HWP_ERROR(l_fapirc, RC_MBVPD_INSUFFICIENT_VPD_RETURNED );
             break;  //  break out with fapirc
         }
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSlopeInterceptData.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSlopeInterceptData.C
index f2b2e06ef..bd30909ed 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSlopeInterceptData.C
+++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSlopeInterceptData.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSlopeInterceptData.C $    */
+/* $Source: src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSlopeInterceptData.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2013              */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: getMBvpdSlopeInterceptData.C,v 1.3 2013/11/22 22:14:11 whs Exp $
+// $Id: getMBvpdSlopeInterceptData.C,v 1.4 2014/02/12 22:12:00 mjjones Exp $
 /**
  *  @file getMBvpdSlopeInterceptData.C
  *
@@ -148,6 +148,7 @@ fapi::ReturnCode getMBvpdMasterData(
                        l_MwBufsize, MW_KEYWORD_SIZE);
             const uint32_t & KEYWORD = fapi::MBVPD_KEYWORD_MW;
             const uint32_t & RETURNED_SIZE = l_MwBufsize;
+            const fapi::Target & CHIP_TARGET = i_mbTarget;
             FAPI_SET_HWP_ERROR(l_fapirc, RC_MBVPD_INSUFFICIENT_VPD_RETURNED );
             break;  //  break out with fapirc
         }
@@ -281,6 +282,7 @@ fapi::ReturnCode getMBvpdSupplierData(
                            l_pdIBufsize, PDI_DDR3_KEYWORD_SIZE);
                 const uint32_t & KEYWORD = fapi::MBVPD_KEYWORD_PDI;
                 const uint32_t & RETURNED_SIZE = l_pdIBufsize;
+                const fapi::Target & CHIP_TARGET = i_mbTarget;
                 FAPI_SET_HWP_ERROR(l_fapirc,RC_MBVPD_INSUFFICIENT_VPD_RETURNED);
                 break;  //  break out with fapirc
             }
@@ -299,6 +301,7 @@ fapi::ReturnCode getMBvpdSupplierData(
                            l_pdIBufsize, PDI_DDR4_KEYWORD_SIZE);
                 const uint32_t & KEYWORD = fapi::MBVPD_KEYWORD_PDI;
                 const uint32_t & RETURNED_SIZE = l_pdIBufsize;
+                const fapi::Target & CHIP_TARGET = i_mbTarget;
                 FAPI_SET_HWP_ERROR(l_fapirc,RC_MBVPD_INSUFFICIENT_VPD_RETURNED);
                 break;  //  break out with fapirc
             }
@@ -312,6 +315,7 @@ fapi::ReturnCode getMBvpdSupplierData(
             FAPI_ERR("getMBvpdSupplierData:"
                      " unexpected memory type in #I");
             const uint8_t & MEM_TYPE = l_pPdIBuffer->pdI.common.mem_type;
+            const fapi::Target & MEMBUF_TARGET = i_mbTarget;
             FAPI_SET_HWP_ERROR(l_fapirc,RC_MBVPD_UNEXPECTED_MEM_TYPE);
             break;  //  break out with fapirc
         }
@@ -360,6 +364,7 @@ fapi::ReturnCode getMBvpdSupplierData(
                        l_mvBufsize, l_offset);
             const uint32_t & KEYWORD = fapi::MBVPD_KEYWORD_MV;
             const uint32_t & RETURNED_SIZE = l_mvBufsize;
+            const fapi::Target & CHIP_TARGET = i_mbTarget;
             FAPI_SET_HWP_ERROR(l_fapirc, RC_MBVPD_INSUFFICIENT_VPD_RETURNED );
             break;  //  break out with fapirc
         }
@@ -436,6 +441,7 @@ fapi::ReturnCode getMBvpdSupplierData(
                     " supplier ID not found 0x%04x",
                       l_moduleID_LSB+(l_moduleID_MSB<<8));
            const uint32_t & MODULE_ID = l_moduleID_LSB+(l_moduleID_MSB<<8);
+           const fapi::Target & MEMBUF_TARGET = i_mbTarget;
            FAPI_SET_HWP_ERROR(l_fapirc, RC_MBVPD_SUPPLIER_ID_NOT_IN_MV_VPD );
        }
 
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSpareDramData.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSpareDramData.C
index 10639e9ca..b604cb24d 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSpareDramData.C
+++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSpareDramData.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013                   */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: getMBvpdSpareDramData.C,v 1.4 2013/10/03 20:40:52 dedahle Exp $
+// $Id: getMBvpdSpareDramData.C,v 1.5 2014/02/12 22:14:28 mjjones Exp $
 #include  <stdint.h>
 
 //  fapi support
@@ -108,6 +108,7 @@ fapi::ReturnCode getMBvpdSpareDramData(const fapi::Target &i_mba,
                        l_AmBufSize, AM_KEYWORD_SIZE);
             const uint32_t & KEYWORD = fapi::MBVPD_KEYWORD_AM;
             const uint32_t & RETURNED_SIZE = l_AmBufSize;
+            const fapi::Target & CHIP_TARGET = l_mbTarget;
             FAPI_SET_HWP_ERROR(l_rc, RC_MBVPD_INSUFFICIENT_VPD_RETURNED );
             break;
         }
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C
index c5e612eab..534814b67 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C
+++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: getMBvpdTermData.C,v 1.8 2014/02/10 19:57:04 whs Exp $
+// $Id: getMBvpdTermData.C,v 1.9 2014/02/12 22:14:37 mjjones Exp $
 /**
  *  @file getMBvpdTermData.C
  *
@@ -332,6 +332,7 @@ fapi::ReturnCode getMBvpdTermData(
                        l_MtBufsize, MT_KEYWORD_SIZE);
             const uint32_t & KEYWORD = fapi::MBVPD_KEYWORD_MT;
             const uint32_t & RETURNED_SIZE = l_MtBufsize;
+            const fapi::Target & CHIP_TARGET = l_mbTarget;
             FAPI_SET_HWP_ERROR(l_fapirc, RC_MBVPD_INSUFFICIENT_VPD_RETURNED );
             break;  //  break out with fapirc
         }
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdVersion.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdVersion.C
index 55f17291a..81090d931 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdVersion.C
+++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdVersion.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2013              */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: getMBvpdVersion.C,v 1.1 2013/10/30 21:07:58 whs Exp $
+// $Id: getMBvpdVersion.C,v 1.2 2014/02/12 22:14:44 mjjones Exp $
 /**
  *  @file getMBvpdVersion.C
  *
@@ -81,6 +81,7 @@ fapi::ReturnCode getMBvpdVersion(
                        l_bufSize, sizeof(l_vpdVersion));
             const uint32_t & KEYWORD = sizeof(l_vpdVersion);
             const uint32_t & RETURNED_SIZE = l_bufSize;
+            const fapi::Target & CHIP_TARGET = l_mbTarget;
             FAPI_SET_HWP_ERROR(l_fapirc,RC_MBVPD_INSUFFICIENT_VPD_RETURNED);
             break;  //  break out with fapirc
         }
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/mvpdRingFuncs.C b/src/usr/hwpf/hwp/mvpd_accessors/mvpdRingFuncs.C
index 80e675212..a5106a6b3 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/mvpdRingFuncs.C
+++ b/src/usr/hwpf/hwp/mvpd_accessors/mvpdRingFuncs.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: mvpdRingFuncs.C,v 1.8 2014/01/26 12:57:15 whs Exp $
+// $Id: mvpdRingFuncs.C,v 1.9 2014/02/12 22:14:51 mjjones Exp $
 /**
  *  @file mvpdRingFuncs.C
  *
@@ -268,6 +268,7 @@ fapi::ReturnCode mvpdRingFunc(  const mvpdRingFuncOp i_mvpdRingFuncOp,
             {
                 const   uint8_t    & RING_MODIFIER =   i_ringId;
                 const   uint8_t    & CHIPLET_ID =   i_chipletId;
+                const fapi::Target & CHIP_TARGET = i_fapiTarget;
                 FAPI_SET_HWP_ERROR(l_fapirc, RC_REPAIR_RING_NOT_FOUND );
                 //  break out with fapirc
                 break;
@@ -422,6 +423,7 @@ fapi::ReturnCode mbvpdRingFunc( const mbvpdRingFuncOp i_mbvpdRingFuncOp,
             {
                 const uint8_t & RING_MODIFIER = i_ringId;
                 const uint8_t & CHIPLET_ID = i_chipletId;
+                const fapi::Target & CHIP_TARGET = i_fapiTarget;
                 FAPI_SET_HWP_ERROR(l_fapirc, RC_REPAIR_RING_NOT_FOUND );
                 //  break out with fapirc
                 break;
@@ -519,13 +521,6 @@ fapi::ReturnCode mvpdRingFuncFind( const uint8_t    i_chipletId,
                 FAPI_DBG("mvpdRingFuncFind:Header 0x%x offset 0x%x,end of list",
                             FAPI_BE32TOH(l_pScanData->iv_magic),
                             l_offset  );
-                //  TODO: RTC 51917 how to tell the end of the list? Assume that
-                // finding a header without RS4_MAGIC is the end.
-                // keep the following incase there is a different way to find
-                // the end.
-                // $$const   uint32_t    &MAGIC = l_pScanData->magic;
-                // $$FAPI_SET_HWP_ERROR(l_fapirc,RC_REPAIR_RING_INVALID_MAGIC );
-                // break out of scan loop, ring not found
                 break;
             }
             //  dump record info for debug
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/mvpd_errors.xml b/src/usr/hwpf/hwp/mvpd_accessors/mvpd_errors.xml
index b827400b9..e78170b28 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/mvpd_errors.xml
+++ b/src/usr/hwpf/hwp/mvpd_accessors/mvpd_errors.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- IBM CONFIDENTIAL                                                       -->
 <!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2012,2013              -->
+<!-- COPYRIGHT International Business Machines Corp. 2012,2014              -->
 <!--                                                                        -->
 <!-- p1                                                                     -->
 <!--                                                                        -->
@@ -20,7 +20,7 @@
 <!-- Origin: 30                                                             -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: mvpd_errors.xml,v 1.13 2013/11/22 22:14:37 whs Exp $ -->
+<!-- $Id: mvpd_errors.xml,v 1.15 2014/02/12 22:26:52 mjjones Exp $ -->
 <hwpErrors>
   <!-- ********************************************************************* -->
   <hwpError>
@@ -28,6 +28,10 @@
     <description>
         Invalid input parameter:  pointer to ringbuffer was NULL
     </description>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
@@ -35,14 +39,10 @@
     <description>
         Failed to allocate buffer space for repair ring data
     </description>
-  </hwpError>
-  <!-- ********************************************************************* -->
-  <hwpError>
-    <rc>RC_REPAIR_RING_INVALID_MAGIC</rc>
-    <description>
-        Failed to allocate buffer space for repair ring data
-    </description>
-    <ffdc>MAGIC</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
@@ -50,15 +50,27 @@
     <description>
         Invalid input parameter: buffer too small to copy repair ring data
     </description>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
     <rc>RC_REPAIR_RING_NOT_FOUND</rc>
     <description>
         The repair ring specified was not found.
+        Most likely reason is bad VPD
     </description>
     <ffdc>RING_MODIFIER</ffdc>
     <ffdc>CHIPLET_ID</ffdc>
+    <callout>
+      <target>CHIP_TARGET</target>
+      <priority>HIGH</priority>
+    </callout>
+    <deconfigure>
+      <target>CHIP_TARGET</target>
+    </deconfigure>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
@@ -66,6 +78,10 @@
     <description>
         An invalid parameter was passed to a mvpd ring function.
     </description>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
@@ -73,6 +89,10 @@
     <description>
         Insufficient room in the record to set the requested ring.
     </description>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
@@ -81,6 +101,10 @@
         VPD Field size too small to contain the EX_L2_SINGLE_MEMBER_ENABLE data
     </description>
     <ffdc>FIELD_SIZE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
@@ -89,6 +113,10 @@
         Invalid attribute ID
     </description>
     <ffdc>ATTR_ID</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
@@ -98,23 +126,47 @@
     </description>
     <ffdc>EXPECTED_SIZE</ffdc>
     <ffdc>PASSED_SIZE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
     <rc>RC_MBVPD_INSUFFICIENT_VPD_RETURNED</rc>
     <description>
         VPD keyword record returned is smaller than expected.
+        Probably a firmware bug, but could be bad VPD
     </description>
     <ffdc>KEYWORD</ffdc>
     <ffdc>RETURNED_SIZE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
+    <callout>
+      <target>CHIP_TARGET</target>
+      <priority>MEDIUM</priority>
+    </callout>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
     <rc>RC_MBVPD_SUPPLIER_ID_NOT_IN_MV_VPD</rc>
     <description>
         The Module ID in the #I keyword is not in the list of supplier provided entries in the MV keyword.
+        Bad C-DIMM VPD.
     </description>
     <ffdc>MODULE_ID</ffdc>
+    <callout>
+      <target>MEMBUF_TARGET</target>
+      <priority>HIGH</priority>
+    </callout>
+    <deconfigure>
+      <target>MEMBUF_TARGET</target>
+    </deconfigure>
+    <gard>
+      <target>MEMBUF_TARGET</target>
+    </gard>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
@@ -122,6 +174,10 @@
     <description>
         An invalid parameter was passed to a mbvpd ring function.
     </description>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
@@ -131,15 +187,30 @@
     </description>
     <ffdc>ATTR_ID</ffdc>
     <ffdc>VPD_VALUE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
     <rc>RC_MBVPD_DRAM_2N_MODE_NOT_EQUAL</rc>
     <description>
-        The 2 ports of DRAM 2N MODE should be equal.
+        The 2 ports of DRAM 2N MODE should be equal in VPD.
+        Bad C-DIMM VPD.
     </description>
     <ffdc>PORT0</ffdc>
     <ffdc>PORT1</ffdc>
+    <callout>
+      <target>MBA_TARGET</target>
+      <priority>HIGH</priority>
+    </callout>
+    <deconfigure>
+      <target>MBA_TARGET</target>
+    </deconfigure>
+    <gard>
+      <target>MBA_TARGET</target>
+    </gard>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
@@ -148,13 +219,28 @@
         Mode must be Get or Set.
     </description>
     <ffdc>MODE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
   </hwpError>
   <!-- ********************************************************************* -->
   <hwpError>
     <rc>RC_MBVPD_UNEXPECTED_MEM_TYPE</rc>
     <description>
         Memory type in VSPD keyword #I not DDR3 or DDR4
+        Unsupported C-DIMM VPD.
     </description>
     <ffdc>MEM_TYPE</ffdc>
+    <callout>
+      <target>MEMBUF_TARGET</target>
+      <priority>HIGH</priority>
+    </callout>
+    <deconfigure>
+      <target>MEMBUF_TARGET</target>
+    </deconfigure>
+    <gard>
+      <target>MEMBUF_TARGET</target>
+    </gard>
   </hwpError>
 </hwpErrors>