Add customer error descriptions to error log headers.

Change-Id: Ibb2f1219b6f2ff27e9b09fea4d36c2616fb7ddf9
RTC: 110397
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11079
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

14 files changed, 171 insertions, 11 deletions

diff --git a/src/usr/fsi/fsidd.C b/src/usr/fsi/fsidd.C
index 98f06fa78..3de346360 100644
--- a/src/usr/fsi/fsidd.C
+++ b/src/usr/fsi/fsidd.C
@@ -114,6 +114,8 @@ errlHndl_t ddOp(DeviceFW::OperationType i_opType,
              * @userdata1    FSI Address
              * @userdata2    Data Length
              * @devdesc      FsiDD::ddOp> Invalid data length (!= 4 bytes)
+             * @custdesc     A problem occurred during the
+             *               IPL of the system.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             FSI::MOD_FSIDD_DDOP,
@@ -139,6 +141,8 @@ errlHndl_t ddOp(DeviceFW::OperationType i_opType,
              * @userdata1    FSI Address
              * @userdata2    Operation Type (i_opType) : 0=READ, 1=WRITE
              * @devdesc      FsiDD::ddOp> Target is NULL
+             * @custdesc     A problem occurred during the
+             *               IPL of the system.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             FSI::MOD_FSIDD_DDOP,
@@ -160,6 +164,8 @@ errlHndl_t ddOp(DeviceFW::OperationType i_opType,
              * @userdata1    FSI Address
              * @userdata2    Operation Type (i_opType) : 0=READ, 1=WRITE
              * @devdesc      FsiDD::ddOp> Target is unsupported Master Sentinel
+             * @custdesc     A problem occurred during the
+             *               IPL of the system.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             FSI::MOD_FSIDD_DDOP,
@@ -205,6 +211,8 @@ errlHndl_t ddOp(DeviceFW::OperationType i_opType,
              * @userdata1    FSI Address
              * @userdata2    Operation Type (i_opType)
              * @devdesc      FsiDD::ddOp> Invalid operation type
+             * @custdesc     A problem occurred during the
+             *               IPL of the system.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             FSI::MOD_FSIDD_DDOP,
@@ -546,6 +554,8 @@ errlHndl_t FsiDD::initializeHardware()
                              * @userdata2[32:63]  Master FSI LinkId
                              * @devdesc      FsiDD::initializeHardware>
                              *   Unexpected attribute data for remote FSI link
+                             * @custdesc     A problem occurred during the
+                             *               IPL of the system.
                              */
                             l_err = new ERRORLOG::ErrlEntry(
                                         ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -1303,6 +1313,8 @@ errlHndl_t FsiDD::handleOpbErrors(FsiAddrInfo_t& i_addrInfo,
          * @userdata2[00:31]  OPB Status Register
          * @userdata2[32:63]  FSI Master HUID
          * @devdesc      FsiDD::handleOpbErrors> Error during FSI access
+         * @custdesc     A problem occurred during the
+         *               IPL of the system.
          */
         l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                         FSI::MOD_FSIDD_HANDLEOPBERRORS,
@@ -1603,6 +1615,8 @@ errlHndl_t FsiDD::pollForComplete(FsiAddrInfo_t& i_addrInfo,
              * @userdata1[32:63]  Absolute FSI Address
              * @userdata2    OPB Status Register
              * @devdesc      FsiDD::pollForComplete> Error during FSI access
+             * @custdesc     A problem occurred during the
+             *               IPL of the system.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             FSI::MOD_FSIDD_POLLFORCOMPLETE,
@@ -1671,6 +1685,8 @@ errlHndl_t FsiDD::pollForComplete(FsiAddrInfo_t& i_addrInfo,
                  * @userdata1[32:63]  Absolute FSI Address
                  * @userdata2    OPB Status Register
                  * @devdesc      FsiDD::pollForComplete> Read valid never came on
+                 * @custdesc     A problem occurred during the
+                 *               IPL of the system.
                  */
                 l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                                 FSI::MOD_FSIDD_POLLFORCOMPLETE,
@@ -1773,6 +1789,8 @@ errlHndl_t FsiDD::genFullFsiAddr(FsiAddrInfo_t& io_addrInfo)
          * @userdata2[48:55]  FSI Master type (0=MFSI,1=CMFSI,2=NO_MASTER)
          * @userdata2[56:63]  Slave link/port number
          * @devdesc      FsiDD::genFullFsiAddr> Master Type is not supported
+         * @custdesc     A problem occurred during the
+         *               IPL of the system.
          */
         l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                      FSI::MOD_FSIDD_GENFULLFSIADDR,
@@ -1812,6 +1830,8 @@ errlHndl_t FsiDD::genFullFsiAddr(FsiAddrInfo_t& io_addrInfo)
              * @userdata2[48:55]  FSI Master type (0=MFSI,1=CMFSI,2=NO_MASTER)  [master's master]
              * @userdata2[56:63]  Slave link/port number  [master's master]
              * @devdesc      FsiDD::genFullFsiAddr> Cannot chain 2 masters
+             * @custdesc     A problem occurred during the
+             *               IPL of the system.
              */
             l_err = new ERRORLOG::ErrlEntry(
                         ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -1846,6 +1866,8 @@ errlHndl_t FsiDD::genFullFsiAddr(FsiAddrInfo_t& io_addrInfo)
              * @userdata2[48:55]  FSI Master type (0=MFSI,1=CMFSI,2=NO_MASTER)  [master's master]
              * @userdata2[56:63]  Slave link/port number  [master's master]
              * @devdesc      FsiDD::genFullFsiAddr> Invalid master type for the target's master
+             * @custdesc     A problem occurred during the
+             *               IPL of the system.
              */
             l_err = new ERRORLOG::ErrlEntry(
                         ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -2781,6 +2803,8 @@ errlHndl_t FsiDD::checkForErrors( FsiAddrInfo_t& i_addrInfo )
              * @userdata1[24:31]  Slave link/port number
              * @userdata2    MAEB from master
              * @devdesc      FsiDD::checkForErrors> Error discovered in MAEB
+             * @custdesc     A problem occurred during the
+             *               IPL of the system.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             FSI::MOD_FSIDD_CHECKFORERRORS,
@@ -2855,6 +2879,8 @@ errlHndl_t FsiDD::verifyPresent( TARGETING::Target* i_target )
          * @userdata2[32:63]  HUID of FSI Master
          * @devdesc      FsiDD::verifyPresent> Target was never detected
          *               during FSI Init
+         * @custdesc     A problem occurred during the
+         *               IPL of the system.
          */
         l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                     FSI::MOD_FSIDD_VERIFYPRESENT,
diff --git a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
index a6b7fd610..609cc7f08 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
+++ b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
@@ -136,6 +136,8 @@ errlHndl_t  loadPoreImage(  char                    *& o_rporeAddr,
              * @userdata2   Size of WINK PNOR partition
              * @devdesc     Image from PNOR WINK partition invalid, too small,
              *              or too big
+             * @custdesc    A problem occurred during the IPL
+             *              of the system.
              */
             l_errl =
               new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -334,6 +336,8 @@ errlHndl_t  applyPoreGenCpuRegs(   TARGETING::Target *i_procChipTarg,
          *
          * @devdesc p8_pore_gen_xxx returned an error when
          *          attempting to change a reg value in the PORE image.
+         * @custdesc    A problem occurred during the IPL
+         *              of the system.
          */
         l_errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                 ISTEP::ISTEP_BUILD_WINKLE_IMAGES,
@@ -621,6 +625,8 @@ void*    call_host_build_winkle( void    *io_pArgs )
              * @userdata1    Return Code
              * @userdata2    Unmap address
              * @devdesc      mm_block_unmap() returns error
+             * @custdesc    A problem occurred during the IPL
+             *              of the system.
              */
             l_errl =
               new ERRORLOG::ErrlEntry(
@@ -743,6 +749,8 @@ void*    call_proc_set_pore_bar( void    *io_pArgs )
              * @userdata1    Return Code
              * @userdata2    Unmap address
              * @devdesc      mm_block_unmap() returns error
+             * @custdesc    A problem occurred during the IPL
+             *              of the system.
              */
             l_errl =
               new ERRORLOG::ErrlEntry(
diff --git a/src/usr/hwpf/hwp/occ/occ.C b/src/usr/hwpf/hwp/occ/occ.C
index be85cea7a..1f3bc509f 100644
--- a/src/usr/hwpf/hwp/occ/occ.C
+++ b/src/usr/hwpf/hwp/occ/occ.C
@@ -638,6 +638,8 @@ namespace HBOCC
                  * @userdata1    Return Code
                  * @userdata2    Unmap address
                  * @devdesc      mm_block_unmap() returns error
+                 * @custdesc    A problem occurred during the IPL
+                 *              of the system.
                  */
                 l_tmpErrl =
                   new ERRORLOG::ErrlEntry(
diff --git a/src/usr/hwpf/hwp/start_payload/start_payload.C b/src/usr/hwpf/hwp/start_payload/start_payload.C
index 5f025e2c7..96cde5a1b 100644
--- a/src/usr/hwpf/hwp/start_payload/start_payload.C
+++ b/src/usr/hwpf/hwp/start_payload/start_payload.C
@@ -559,6 +559,8 @@ errlHndl_t callShutdown ( uint64_t i_masterInstance,
              * @userdata1        <UNUSED>
              * @userdata2        <UNUSED>
              * @devdesc          System target was NULL!
+             * @custdesc         A problem occurred during the IPL
+             *                   of the system.
              */
             err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_CRITICAL_SYS_TERM,
                                            ISTEP_START_PAYLOAD_CALL_SHUTDOWN,
@@ -880,6 +882,8 @@ errlHndl_t enableCoreCheckstops()
              * @userdata1    <unused>
              * @userdata2    Physical address
              * @devdesc      mm_block_map() returns error
+             * @custdesc     A problem occurred during the IPL
+             *               of the system.
              */
             l_errl =
               new ERRORLOG::ErrlEntry(
@@ -943,6 +947,8 @@ errlHndl_t enableCoreCheckstops()
                  *
                  * @devdesc p8_pore_gen_scom_fixed returned an error when
                  *          attempting to erase a reg value in the PORE image.
+                 * @custdesc         A problem occurred during the IPL
+                 *                   of the system.
                  */
                 l_errl = new ERRORLOG::ErrlEntry(
                                      ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -972,9 +978,11 @@ errlHndl_t enableCoreCheckstops()
              * @userdata1    Return Code
              * @userdata2    Unmap address
              * @devdesc      mm_block_unmap() returns error
+             * @custdesc     A problem occurred during the IPL
+             *               of the system.
              */
             l_errl =
-              new ERRORLOG::ErrlEntry(
+                new ERRORLOG::ErrlEntry(
                                       ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                       ISTEP::ISTEP_ENABLE_CORE_CHECKSTOPS,
                                       ISTEP::ISTEP_MM_UNMAP_ERR,
diff --git a/src/usr/hwpf/hwp/thread_activate/thread_activate.C b/src/usr/hwpf/hwp/thread_activate/thread_activate.C
index eb15d33fd..5c8bc4639 100644
--- a/src/usr/hwpf/hwp/thread_activate/thread_activate.C
+++ b/src/usr/hwpf/hwp/thread_activate/thread_activate.C
@@ -153,6 +153,8 @@ bool getCacheDeconfig(uint64_t i_masterCoreId)
              * @userdata2    Master processor chip huid
              * @devdesc      getCacheDeconfig> Master core is not mapped
              *               to a LRPx Module VPD Record.
+             * @custdesc     A problem occurred during the IPL
+             *               of the system.
              */
             l_errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                              fapi::MOD_GET_CACHE_DECONFIG,
@@ -180,6 +182,8 @@ bool getCacheDeconfig(uint64_t i_masterCoreId)
              * @userdata2    CH Keyword Size
              * @devdesc      getCacheDeconfig> LRPx Record, CH keyword
              *               is incorrect size
+             * @custdesc     A problem occurred during the IPL
+             *               of the system.
              */
             l_errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                              fapi::MOD_GET_CACHE_DECONFIG,
@@ -293,6 +297,8 @@ void activate_threads( errlHndl_t& io_rtaskRetErrl )
              * @userdata2    Master processor chip huid
              * @devdesc      activate_threads> Could not find a target
              *               for the master core
+             * @custdesc     A problem occurred during the IPL
+             *               of the system.
              */
             l_errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                              fapi::MOD_THREAD_ACTIVATE,
diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C
index b60d66458..3ea39accc 100644
--- a/src/usr/initservice/istepdispatcher/istepdispatcher.C
+++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C
@@ -1406,6 +1406,8 @@ void IStepDispatcher::handleProcFabIovalidMsg(msg_t * & io_pMsg)
              * @userdata2[32:63] N/A.
              * @devdesc          handleProcFabIovalidMsg called during MPIPL,
              *                   which is illegal.
+             * @custdesc    A problem occurred during the IPL
+             *              of the system.
              */
             err = new ERRORLOG::ErrlEntry(
                                           ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -1792,6 +1794,8 @@ errlHndl_t IStepDispatcher::failedDueToDeconfig(
      *                   is outside the reconfig loop (desired steps 0), too
      *                   many reconfig loops were attempted, in manufacturing
      *                   mode or in istep mode.
+     * @custdesc    A hardware error occurred during the IPL. See previous logs
+     *              for details.
      */
     err = new ERRORLOG::ErrlEntry(
             ERRORLOG::ERRL_SEV_UNRECOVERABLE,
diff --git a/src/usr/mbox/mboxdd.C b/src/usr/mbox/mboxdd.C
index 51d911997..5ad5ad45c 100644
--- a/src/usr/mbox/mboxdd.C
+++ b/src/usr/mbox/mboxdd.C
@@ -380,6 +380,8 @@ errlHndl_t mboxWrite(TARGETING::Target* i_target,void* i_buffer,
              * @userdata1    Target ID String...
              * @userdata2    Data Length
              * @devdesc      MboxDD::write> Invalid data length (> msg_t size)
+             * @custdesc     A problem occurred during the
+             *               IPL of the system.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             MBOX::MOD_MBOXDD_WRITE,
@@ -513,6 +515,8 @@ errlHndl_t mboxWrite(TARGETING::Target* i_target,void* i_buffer,
              * @userdata1    Target ID String...
              * @userdata2    Status/Control Register
              * @devdesc      MboxDD::write> Message still pending
+             * @custdesc     A problem occurred during the
+             *               IPL of the system.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                         MBOX::MOD_MBOXDD_WRITE,
diff --git a/src/usr/pnor/pnordd.C b/src/usr/pnor/pnordd.C
index bbd302ea1..0fcd8d7ef 100644
--- a/src/usr/pnor/pnordd.C
+++ b/src/usr/pnor/pnordd.C
@@ -754,6 +754,7 @@ errlHndl_t PnorDD::pollSfcOpComplete(uint64_t i_pollTime)
              * @userdata2[0:31]    ECCB Status Register
              * @devdesc      PnorDD::pollSfcOpComplete> Error or timeout from
              *               SFC Status Register
+             * @custdesc    A problem occurred while accessing the boot flash.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             PNOR::MOD_PNORDD_POLLSFCOPCOMPLETE,
@@ -942,6 +943,7 @@ errlHndl_t PnorDD::checkForErrors( void )
          * @userdata2[32:63] <unused>
          * @devdesc      PnorDD::checkForErrors> Error(s) found in SFC
          *               and/or LPC Slave Status Registers
+         * @custdesc    A problem occurred while accessing the boot flash.
          */
         l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                         PNOR::MOD_PNORDD_CHECKFORERRORS,
@@ -1212,6 +1214,7 @@ errlHndl_t PnorDD::micronFlagStatus(uint64_t i_pollTime)
              * @userdata2[0:31]   Micron Flag status register
              * @devdesc      PnorDD::micronFlagStatus> Error or timeout from
              *               Micron Flag Status Register
+             * @custdesc    A problem occurred while accessing the boot flash.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             PNOR::MOD_PNORDD_MICRONFLAGSTATUS,
@@ -1764,6 +1767,7 @@ errlHndl_t PnorDD::readLPC(uint32_t i_addr,
              * @userdata2    ECCB Status Register
              * @devdesc      PnorDD::readLPC> Error or timeout from
              *               LPC Status Register
+             * @custdesc    A problem occurred while accessing the boot flash.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             PNOR::MOD_PNORDD_READLPC,
@@ -1882,6 +1886,7 @@ errlHndl_t PnorDD::writeLPC(uint32_t i_addr,
              * @userdata2    ECCB Status Register
              * @devdesc      PnorDD::writeLPC> Error or timeout from
              *               LPC Status Register
+             * @custdesc    A problem occurred while accessing the boot flash.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             PNOR::MOD_PNORDD_WRITELPC,
@@ -2088,6 +2093,7 @@ errlHndl_t PnorDD::eraseFlash(uint32_t i_address)
              * @userdata1    LPC Address
              * @userdata2    Nearest Erase Boundary
              * @devdesc      PnorDD::eraseFlash> Address not on erase boundary
+             * @custdesc    A problem occurred while accessing the boot flash.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             PNOR::MOD_PNORDD_ERASEFLASH,
@@ -2181,6 +2187,7 @@ errlHndl_t PnorDD::eraseFlash(uint32_t i_address)
              * @userdata1    NOR Chip ID
              * @userdata2    LPC Address to erase
              * @devdesc      PnorDD::eraseFlash> No support for MODEL_REAL yet
+             * @custdesc    A problem occurred while accessing the boot flash.
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             PNOR::MOD_PNORDD_ERASEFLASH,
diff --git a/src/usr/pnor/pnorrp.C b/src/usr/pnor/pnorrp.C
index 84c25b292..9ec472384 100644
--- a/src/usr/pnor/pnorrp.C
+++ b/src/usr/pnor/pnorrp.C
@@ -135,9 +135,10 @@ void PnorRP::init( errlHndl_t   &io_rtaskRetErrl )
          *  @userdata2      0
          *
          *  @devdesc        PNOR startup task returned an error.
+         * @custdesc    A problem occurred while accessing the boot flash.
          */
         l_errl = new ERRORLOG::ErrlEntry(
-                                ERRORLOG::ERRL_SEV_CRITICAL_SYS_TERM,
+                                         ERRORLOG::ERRL_SEV_CRITICAL_SYS_TERM,
                                 PNOR::MOD_PNORRP_DIDSTARTUPFAIL,
                                 PNOR::RC_BAD_STARTUP_RC,
                                 rc,
@@ -234,6 +235,7 @@ void PnorRP::initDaemon()
              * @userdata1    Requested Address
              * @userdata2    rc from mm_alloc_block
              * @devdesc      PnorRP::initDaemon> Error from mm_alloc_block
+             * @custdesc    A problem occurred while accessing the boot flash.
              */
             l_errhdl = new ERRORLOG::ErrlEntry(
                            ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -298,6 +300,7 @@ errlHndl_t PnorRP::getSectionInfo( PNOR::SectionId i_section,
              * @userdata1    Requested Section
              * @userdata2    Startup RC
              * @devdesc      PnorRP::getSectionInfo> RP not properly initialized
+             * @custdesc    A problem occurred while accessing the boot flash.
              */
             l_errhdl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                                PNOR::MOD_PNORRP_GETSECTIONINFO,
@@ -324,7 +327,8 @@ errlHndl_t PnorRP::getSectionInfo( PNOR::SectionId i_section,
              * @userdata1    Requested Section
              * @userdata2    TOC used
              * @devdesc      PnorRP::getSectionInfo> Invalid Address for read/write
-             */
+             * @custdesc    A problem occurred while accessing the boot flash.
+            */
             l_errhdl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                                PNOR::MOD_PNORRP_GETSECTIONINFO,
                                                PNOR::RC_INVALID_SECTION,
@@ -697,6 +701,8 @@ void PnorRP::waitForMessage()
                          * @userdata2    Requested Virtual Address
                          * @devdesc      PnorRP::waitForMessage> Unrecognized
                          *               message type
+                         * @custdesc     A problem occurred while accessing
+                         *               the boot flash.
                          */
                         l_errhdl = new ERRORLOG::ErrlEntry(
                                            ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -719,7 +725,10 @@ void PnorRP::waitForMessage()
                  * @reasoncode   PNOR::RC_INVALID_ASYNC_MESSAGE
                  * @userdata1    Message type
                  * @userdata2    Requested Virtual Address
-                 * @devdesc      PnorRP::waitForMessage> Unrecognized message type
+                 * @devdesc      PnorRP::waitForMessage> Unrecognized message
+                 *               type
+                 * @custdesc     A problem occurred while accessing the boot
+                 *               flash.
                  */
                 l_errhdl = new ERRORLOG::ErrlEntry(
                                          ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -940,6 +949,7 @@ errlHndl_t PnorRP::computeDeviceAddr( void* i_vaddr,
          * @userdata2    Base PNOR Address
          * @devdesc      PnorRP::computeDeviceAddr> Virtual Address outside
          *               known PNOR range
+         * @custdesc    A problem occurred while accessing the boot flash.
          */
         l_errhdl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                         PNOR::MOD_PNORRP_COMPUTEDEVICEADDR,
@@ -1021,6 +1031,7 @@ errlHndl_t PnorRP::computeSection( uint64_t i_vaddr,
          * @userdata1    Requested Virtual Address
          * @userdata2    <unused>
          * @devdesc      PnorRP::computeSection> Invalid Address
+         * @custdesc    A problem occurred while accessing the boot flash.
          */
         errhdl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                          PNOR::MOD_PNORRP_COMPUTESECTION,
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C
index d1cddc0e1..347735f8a 100644
--- a/src/usr/sbe/sbe_update.C
+++ b/src/usr/sbe/sbe_update.C
@@ -467,6 +467,8 @@ namespace SBE
                  * @userdata1    Target Unit Id
                  * @userdata2    Target Type
                  * @devdesc      Unsupported Target Type passed in
+                 * @custdesc     A problem occurred while updating processor
+                 *               boot code.
                  */
                 err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
                                     SBE_FIND_IN_PNOR,
@@ -516,6 +518,8 @@ namespace SBE
                  * @userdata1    SBE TOC EYE-CATCHER
                  * @userdata2    Expected EYE-CATCHER
                  * @devdesc      Unsupported EYE-CATCHER found in TOC
+                 * @custdesc     A problem occurred while updating processor
+                 *               boot code.
                  */
                 err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
                                     SBE_FIND_IN_PNOR,
@@ -548,6 +552,8 @@ namespace SBE
                      * @userdata2[32:63]  SBE TOC EyeCatch
                      * @devdesc      SBE partition contains unsupported version
                      *               of Table of Contents
+                     * @custdesc     A problem occurred while updating processor
+                     *               boot code.
                      */
                     err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
                                         SBE_FIND_IN_PNOR,
@@ -604,6 +610,8 @@ namespace SBE
                  * @userdata2[32:63]  SBE TOC EyeCatch
                  * @devdesc      SBE image for current chip EC was not found
                  *               in PNOR
+                 * @custdesc     A problem occurred while updating processor
+                 *               boot code.
                  */
                 err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
                                     SBE_FIND_IN_PNOR,
@@ -841,6 +849,8 @@ namespace SBE
                  * @userdata2[0:31]   coreMask of target
                  * @userdata2[32:63]  coreCount - updated on the loops
                  * @devdesc      Unsuccessful in creating Customized SBE Image
+                 * @custdesc     A problem occurred while updating processor
+                 *               boot code.
                  */
                 err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
                                     SBE_CUSTOMIZE_IMG,
@@ -1069,6 +1079,8 @@ namespace SBE
                  * @userdata1    Discovered VPD Size
                  * @userdata2    Expected VPD Size
                  * @devdesc      SB Keyword in MVPD has invalid size
+                 * @custdesc     A problem occurred while updating processor
+                 *               boot code.
                  */
                 err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
                                     SBE_GETSET_MVPD_VERSION,
@@ -1185,6 +1197,8 @@ namespace SBE
                  * @userdata2    Not Used
                  * @devdesc      Image Version not found in PNOR
                  *               SBE image.
+                 * @custdesc     A problem occurred while updating processor
+                 *               boot code.
                  */
                 err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
                                     SBE_READ_PNOR_VERSION,
@@ -1757,6 +1771,8 @@ namespace SBE
                  * @userdata2    rc from mm_remove_pages
                  * @devdesc      updateProcessorSbeSeeproms> mm_remove_pages
                  *               RELEASE failed
+                 * @custdesc     A problem occurred while updating processor
+                 *               boot code.
                  */
                 err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
                                     SBE_UPDATE_SEEPROMS,
@@ -2344,6 +2360,8 @@ namespace SBE
                          * @userdata2    Update Actions
                          * @devdesc      Bad Path in decisionUpdateTree:
                          *               cur=PERM/DIRTY
+                         * @custdesc     A problem occurred while updating
+                         *               processor boot code.
                          */
                         err = new ErrlEntry(ERRL_SEV_RECOVERED,
                                             SBE_DECISION_TREE,
@@ -2682,6 +2700,8 @@ namespace SBE
                  * @userdata2    rc from mm_alloc_block
                  * @devdesc      updateProcessorSbeSeeproms> Error
                  *               from mm_alloc_block
+                 * @custdesc     A problem occurred while updating processor
+                 *               boot code.
                  */
                 err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
                                     SBE_CREATE_TEST_SPACE,
@@ -2711,6 +2731,8 @@ namespace SBE
                  * @userdata2    rc from mm_set_permission
                  * @devdesc      updateProcessorSbeSeeproms> Error from
                  *               mm_set_permission on creation
+                 * @custdesc     A problem occurred while updating processor
+                 *               boot code.
                  */
                 err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
                                     SBE_CREATE_TEST_SPACE,
@@ -2761,6 +2783,8 @@ namespace SBE
                  * @userdata2    rc from mm_set_permission
                  * @devdesc      updateProcessorSbeSeeproms> Error from
                  *               mm_set_permission on cleanup
+                 * @custdesc     A problem occurred while updating processor
+                 *               boot code.
                  */
                 err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
                                     SBE_CLEANUP_TEST_SPACE,
@@ -2791,6 +2815,8 @@ namespace SBE
                  * @userdata2    rc from mm_remove_pages
                  * @devdesc      updateProcessorSbeSeeproms> mm_remove_pages
                  *               RELEASE failed
+                 * @custdesc     A problem occurred while updating processor
+                 *               boot code.
                  */
                 err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
                                     SBE_CLEANUP_TEST_SPACE,
diff --git a/src/usr/scan/scandd.C b/src/usr/scan/scandd.C
index 3d71c47f2..329d642cd 100644
--- a/src/usr/scan/scandd.C
+++ b/src/usr/scan/scandd.C
@@ -108,6 +108,8 @@ errlHndl_t scanPerformOp( DeviceFW::OperationType i_opType,
             * @userdata1    SCAN Ring Address
             * @userdata2    SCAN ring length
             * @devdesc      ScanDD::scanPerformOp> Invalid ringlength
+            * @custdesc    A problem occurred during the IPL
+            *              of the system.
             */
            l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            SCAN::MOD_SCANDD_DDOP,
@@ -135,6 +137,8 @@ errlHndl_t scanPerformOp( DeviceFW::OperationType i_opType,
             * @userdata1    SCAN Ring Address
             * @userdata2    TARGET
             * @devdesc      ScanDD::scanPerformOp> Invalid Ring Address
+            * @custdesc    A problem occurred during the IPL
+            *              of the system.
             */
            l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            SCAN::MOD_SCANDD_DDOP,
@@ -162,6 +166,8 @@ errlHndl_t scanPerformOp( DeviceFW::OperationType i_opType,
             * @userdata1    SCAN IO buffer length
             * @userdata2    SCAN ring length
             * @devdesc      ScanDD::scanPerformOp> Invalid IObuf length
+            * @custdesc    A problem occurred during the IPL
+            *              of the system.
             */
            l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            SCAN::MOD_SCANDD_DDOP,
@@ -204,6 +210,8 @@ errlHndl_t scanPerformOp( DeviceFW::OperationType i_opType,
             * @userdata1    SCAN Address
             * @userdata2    Operation Type (i_opType)
             * @devdesc      ScanDD::scanPerformOp> Invalid operation type
+            * @custdesc    A problem occurred during the IPL
+            *              of the system.
             */
            l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            SCAN::MOD_SCANDD_DDOP,
@@ -663,6 +671,8 @@ errlHndl_t scanDoScan(  DeviceFW::OperationType i_opType,
                  * @userdata2    Operation Type (i_opType)
                  * @devdesc      ScanDD::scanDoScan> Got a data mismatch
                  *               when reading back the header
+                 * @custdesc    A problem occurred during the IPL
+                 *              of the system.
                  */
                 l_err = new ERRORLOG::ErrlEntry(
                                       ERRORLOG::ERRL_SEV_UNRECOVERABLE,
diff --git a/src/usr/secureboot/base/securerom.C b/src/usr/secureboot/base/securerom.C
index da632fa26..f67556766 100644
--- a/src/usr/secureboot/base/securerom.C
+++ b/src/usr/secureboot/base/securerom.C
@@ -164,6 +164,7 @@ errlHndl_t SecureROM::initialize()
              * @userdata1    TBROM Register Address
              * @userdata2    TBROM Register Data
              * @devdesc      mmio_dev_map() failed for Secure ROM
+             * @custdesc     A problem occurred during the IPL of the system.
              */
             l_errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             SECUREBOOT::MOD_SECURE_ROM_INIT,
@@ -222,6 +223,7 @@ errlHndl_t SecureROM::initialize()
              * @userdata1    l_rc
              * @userdata2    iv_device_ptr
              * @devdesc      mm_set_permission(EXECUTABLE) failed for Secure ROM
+             * @custdesc     A problem occurred during the IPL of the system.
              */
             l_errl = new ERRORLOG::ErrlEntry(
                                    ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -357,6 +359,7 @@ errlHndl_t SecureROM::verifyContainer(void * i_container, size_t i_size)
              * @userdata1    l_rc
              * @userdata2    l_hw_parms.log
              * @devdesc      ROM_verify() Call Failed
+             * @custdesc     Failure to verify authenticity of software.
              */
             l_errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                          SECUREBOOT::MOD_SECURE_ROM_VERIFY,
@@ -453,6 +456,7 @@ void SecureROM::_cleanup()
              * @userdata1    l_rc
              * @userdata2    iv_device_ptr
              * @devdesc      mm_set_permission(WRITABLE) failed for Secure ROM
+             * @custdesc     A problem occurred during the IPL of the system.
              */
             errlHndl_t l_errl = new ERRORLOG::ErrlEntry(
                                     ERRORLOG::ERRL_SEV_UNRECOVERABLE,
diff --git a/src/usr/vpd/spd.C b/src/usr/vpd/spd.C
index 048f8a42c..15e53e9fa 100755
--- a/src/usr/vpd/spd.C
+++ b/src/usr/vpd/spd.C
@@ -476,6 +476,8 @@ errlHndl_t spdWriteData ( uint64_t i_offset,
              * @userdata2        Number of Bytes to Write
              * @devdesc          g_usePNOR is false, but there isn't an
              *                   alternate way to write PNOR.
+             * @custdesc         A problem occurred during the IPL
+             *                   of the system.
              */
             err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            VPD::VPD_SPD_WRITE_DATA,
@@ -541,6 +543,8 @@ errlHndl_t spdGetValue ( uint64_t i_keyword,
              * @userdata2[32:63] Memory Type
              * @devdesc          The table entry associated with keyword was
              *                   NULL.
+             * @custdesc         A problem occurred during the IPL
+             *                   of the system.
              */
             err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            VPD::VPD_SPD_GET_VALUE,
@@ -672,6 +676,8 @@ errlHndl_t spdWriteValue ( uint64_t i_keyword,
              * @userdata2[32:63] Memory Type
              * @devdesc          The table entry associated with keyword was
              *                   NULL.
+             * @custdesc         A problem occurred during the IPL
+             *                   of the system.
              */
             err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            VPD::VPD_SPD_WRITE_VALUE,
@@ -704,6 +710,8 @@ errlHndl_t spdWriteValue ( uint64_t i_keyword,
              * @userdata2[0:31]  Buffer Length
              * @userdata2[32:63] Memory Type
              * @devdesc          The SPD Keyword is not writable.
+             * @custdesc         A problem occurred during the IPL
+             *                   of the system.
              */
             err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            VPD::VPD_SPD_WRITE_VALUE,
@@ -747,7 +755,10 @@ errlHndl_t spdWriteValue ( uint64_t i_keyword,
              * @userdata2[0:15]  Keyword Length (in bytes)
              * @userdata2[16:31] Keyword Bitmask
              * @userdata2[32:63] Memory Type
-             * @devdesc          Writes to non-byte SPD keywords are unsupported.
+             * @devdesc          Writes to non-byte SPD keywords are
+             *                   unsupported.
+             * @custdesc         A problem occurred during the IPL of
+             *                   the system.
              */
             err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            VPD::VPD_SPD_WRITE_VALUE,
@@ -925,6 +936,8 @@ errlHndl_t ddr3SpecialCases(const KeywordData & i_kwdData,
              * @userdata1        SPD Keyword
              * @userdata2        UNUSED
              * @devdesc          Keyword is not a special case keyword.
+             * @custdesc         A problem occurred during the IPL
+             *                   of the system.
              */
             err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            VPD::VPD_SPD_DDR3_SPECIAL_CASES,
@@ -1065,6 +1078,8 @@ errlHndl_t ddr4SpecialCases(const KeywordData & i_kwdData,
              * @userdata1        SPD Keyword
              * @userdata2        UNUSED
              * @devdesc          Keyword is not a special case keyword.
+             * @custdesc         A problem occurred during the IPL
+             *                   of the system.
              */
             err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            VPD::VPD_SPD_DDR4_SPECIAL_CASES,
@@ -1121,6 +1136,8 @@ errlHndl_t spdSpecialCases ( const KeywordData & i_kwdData,
              * @userdata1        SPD Keyword
              * @userdata2        DIMM DDR Revision
              * @devdesc          Invalid DDR Revision
+             * @custdesc         A problem occurred during the IPL
+             *                   of the system.
              */
             err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            VPD::VPD_SPD_SPECIAL_CASES,
@@ -1181,6 +1198,8 @@ errlHndl_t spdCheckSize ( size_t i_bufferSz,
          * @userdata2[32:63] Expected Buffer Size
          * @devdesc          Buffer Size provided was not big enough for
          *                   the keyword requested.
+         * @custdesc         A problem occurred during the IPL
+         *                   of the system.
          */
         err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                        VPD::VPD_SPD_CHECK_SIZE,
@@ -1283,8 +1302,11 @@ errlHndl_t spdReadBinaryFile ( uint64_t i_byteAddr,
              * @userdata1        File Size
              * @userdata2[0:48]  Starting offset into file
              * @userdata2[49:63] Number of bytes to read
-             * @devdesc          File is not sufficiently large to read number of
-             *                   bytes at offset given without overrunning file.
+             * @devdesc          File is not sufficiently large to read number
+             *                   of bytes at offset given without overrunning
+             *                   file.
+             * @custdesc         A problem occurred during the IPL
+             *                   of the system.
              */
             err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            VPD::VPD_SPD_READ_BINARY_FILE,
@@ -1382,7 +1404,10 @@ errlHndl_t checkModSpecificKeyword ( KeywordData i_kwdData,
                  * @userdata1[32:63] Memory Type (byte 2)
                  * @userdata2[0:31]  SPD Keyword
                  * @userdata2[32:63] Module Specific flag
-                 * @devdesc          Keyword requested was not UMM Module specific.
+                 * @devdesc          Keyword requested was not UMM Module
+                 *                   specific.
+                 * @custdesc         A problem occurred during the IPL
+                 *                   of the system.
                  */
                 err = new ERRORLOG::ErrlEntry(
                     ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -1425,7 +1450,10 @@ errlHndl_t checkModSpecificKeyword ( KeywordData i_kwdData,
                  * @userdata1[32:63] Memory Type (byte 2)
                  * @userdata2[0:31]  SPD Keyword
                  * @userdata2[32:63] Module Specific flag
-                 * @devdesc          Keyword requested was not RMM Module specific.
+                 * @devdesc          Keyword requested was not RMM Module
+                 *                   specific.
+                 * @custdesc         A problem occurred during the IPL
+                 *                   of the system.
                  */
                 err = new ERRORLOG::ErrlEntry(
                     ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -1468,7 +1496,10 @@ errlHndl_t checkModSpecificKeyword ( KeywordData i_kwdData,
                  * @userdata1[32:63] Memory Type (byte 2)
                  * @userdata2[0:31]  SPD Keyword
                  * @userdata2[32:63] Module Specific flag
-                 * @devdesc          Keyword requested was not CMM Module specific.
+                 * @devdesc          Keyword requested was not CMM Module
+                 *                   specific.
+                 * @custdesc         A problem occurred during the IPL
+                 *                   of the system.
                  */
                 err = new ERRORLOG::ErrlEntry(
                     ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -1511,7 +1542,10 @@ errlHndl_t checkModSpecificKeyword ( KeywordData i_kwdData,
                  * @userdata1[32:63] Memory Type (byte 2)
                  * @userdata2[0:31]  SPD Keyword
                  * @userdata2[32:63] Module Specific flag
-                 * @devdesc          Keyword requested was not LRMM Module specific.
+                 * @devdesc          Keyword requested was not LRMM Module
+                 *                   specific.
+                 * @custdesc         A problem occurred during the IPL
+                 *                    of the system.
                  */
                 err = new ERRORLOG::ErrlEntry(
                     ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -1554,6 +1588,8 @@ errlHndl_t checkModSpecificKeyword ( KeywordData i_kwdData,
              * @userdata1        Module Type
              * @userdata2        Memory Type (byte 2)
              * @devdesc          Unsupported Module Type.
+             * @custdesc         A problem occurred during the IPL
+             *                   of the system.
              */
             err = new ERRORLOG::ErrlEntry(
                 ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -1689,6 +1725,8 @@ errlHndl_t getModType ( modSpecTypes_t & o_modType,
              * @userdata1        Module Type (byte 3[3:0])
              * @userdata2        Memory Type (byte 2)
              * @devdesc          Unrecognized Module Type.
+             * @custdesc         A problem occurred during the IPL
+             *                   of the system.
              */
             err = new ERRORLOG::ErrlEntry(
                 ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -1751,6 +1789,8 @@ errlHndl_t getKeywordEntry ( uint64_t i_keyword,
              * @userdata1        SPD Keyword
              * @userdata2        The DDR Revision
              * @devdesc          Invalid DDR Revision
+             * @custdesc         A problem occurred during the IPL
+             *                   of the system.
              */
             err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            VPD::VPD_SPD_GET_KEYWORD_ENTRY,
@@ -1797,6 +1837,8 @@ errlHndl_t getKeywordEntry ( uint64_t i_keyword,
              * @userdata1        SPD Keyword
              * @userdata2        <UNUSED>
              * @devdesc          Invalid SPD Keyword
+             * @custdesc         A problem occurred during the IPL
+             *                   of the system.
              */
             err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                            VPD::VPD_SPD_GET_KEYWORD_ENTRY,
diff --git a/src/usr/xscom/xscom.C b/src/usr/xscom/xscom.C
index 30df917da..017edcd0f 100644
--- a/src/usr/xscom/xscom.C
+++ b/src/usr/xscom/xscom.C
@@ -305,6 +305,8 @@ errlHndl_t getTargetVirtualAddress(TARGETING::Target* i_target,
                          * @userdata1    Return Code
                          * @userdata2    Unmap address
                          * @devdesc      mmio_dev_unmap() returns error
+                         * @custdesc     A problem occurred during the IPL
+                         *               of the system.
                          */
                         l_err = new ERRORLOG::ErrlEntry(
                                 ERRORLOG::ERRL_SEV_UNRECOVERABLE,