Parser for SBE and HCODE build level

Add ERRL_UDT_BUILD and associated parser for XIP image build information
user detail in an error log.

Change-Id: I7ef7eaa1eedd51a882d0b1a2159d2b89569ade02
RTC: 177362
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48586
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Brian E. Bakke <bbakke@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

6 files changed, 119 insertions, 7 deletions

diff --git a/src/include/usr/errl/errlreasoncodes.H b/src/include/usr/errl/errlreasoncodes.H
index f9d03c246..7d36eb745 100644
--- a/src/include/usr/errl/errlreasoncodes.H
+++ b/src/include/usr/errl/errlreasoncodes.H
@@ -75,6 +75,7 @@ namespace ERRORLOG
         ERRL_UDT_PRINTK           = 0x07,
         ERRL_UDT_SENSOR           = 0x08,
         ERRL_UDT_STRING_SET       = 0x09,
+        ERRL_UDT_BUILD            = 0x0A,
     };
 
     // Identifiers for ERRL user data subsection versions
diff --git a/src/usr/errl/plugins/errludbuild.H b/src/usr/errl/plugins/errludbuild.H
new file mode 100644
index 000000000..bd871b643
--- /dev/null
+++ b/src/usr/errl/plugins/errludbuild.H
@@ -0,0 +1,109 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/errl/plugins/errludbuild.H $                          */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2017                             */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+#ifndef ERRL_UDBUILD_H
+#define ERRL_UDBUILD_H
+
+/**
+ *  @file errludbuild.H
+ *
+ *  Defines the ErrlUserDetailsParserBuild class that parses XIP image build
+ *  information user detail in an error log
+ */
+
+#include "errluserdetails.H"
+
+#include <../devicefw/userif.H>
+#include <../devicefw/driverif.H>
+
+namespace ERRORLOG
+{
+
+/**
+ * @class ErrlUserDetailsBuild
+ *
+ * Parses Build user detail in an error log
+ */
+class ErrlUserDetailsParserBuild : public ErrlUserDetailsParser
+{
+public:
+    /**
+     *  @brief Constructor
+     */
+    ErrlUserDetailsParserBuild() {}
+
+    /**
+     *  @brief Destructor
+     */
+    virtual ~ErrlUserDetailsParserBuild() {}
+
+    /**
+     *  @brief Parses image build information user detail data from an error log
+     *
+     *  @param  i_version Version of the data
+     *  @param  i_parse   ErrlUsrParser object for outputting information
+     *  @param  i_pBuffer Pointer to buffer containing detail data
+     *  @param  i_buflen  Length of the buffer
+     */
+    virtual void parse(errlver_t i_version,
+                       ErrlUsrParser & i_parser,
+                       void * i_pBuffer,
+                       const uint32_t i_buflen) const
+    {
+        struct imageBuild_t // Copied from src/include/usr/util/utilxipimage.H
+        {
+            uint32_t buildDate;    // Generated by `date +%Y%m%d`, eg, 20110630
+            uint32_t buildTime;    // Generated by `date +%H%M`, eg, 0756
+            char     buildTag[20]; // Generated when releasing image to fw
+        } PACKED;
+
+        if(i_buflen == sizeof(imageBuild_t))
+        {
+            imageBuild_t* buildData = static_cast<imageBuild_t*>(i_pBuffer);
+            i_parser.PrintNumber("Build Date", "%8d",
+                                 ntohl(buildData->buildDate));
+            i_parser.PrintNumber("Build Time", "%04d",
+                                 ntohl(buildData->buildTime));
+            i_parser.PrintString("Build Tag", buildData->buildTag);
+        }
+        else
+        {
+            i_parser.PrintNumber("Build Buffer length", "0x%X", i_buflen);
+            i_parser.PrintNumber("Expected length", "0x%X",
+                                 sizeof(imageBuild_t));
+            i_parser.PrintHexDump(i_pBuffer, i_buflen);
+        }
+    } // parse
+
+private:
+    // Disabled
+    ErrlUserDetailsParserBuild(const ErrlUserDetailsParserBuild &);
+    ErrlUserDetailsParserBuild & operator=(
+        const ErrlUserDetailsParserBuild &);
+};
+
+}
+
+#endif
+
diff --git a/src/usr/errl/plugins/errludparserfactoryerrl.H b/src/usr/errl/plugins/errludparserfactoryerrl.H
index ebe7acb47..3859e8250 100644
--- a/src/usr/errl/plugins/errludparserfactoryerrl.H
+++ b/src/usr/errl/plugins/errludparserfactoryerrl.H
@@ -38,6 +38,7 @@
 #include "errludlogregister.H"
 #include "errludcallout.H"
 #include "errludsensor.H"
+#include "errludbuild.H"
 
 namespace ERRORLOG
 {
@@ -65,6 +66,7 @@ public:
         registerParser<ErrlUserDetailsParserLogRegister>(ERRL_UDT_LOGREGISTER);
         registerParser<ErrlUserDetailsParserCallout>(ERRL_UDT_CALLOUT);
         registerParser<ErrlUserDetailsParserSensor>(ERRL_UDT_SENSOR);
+        registerParser<ErrlUserDetailsParserBuild>(ERRL_UDT_BUILD);
     }
 
 private:
diff --git a/src/usr/isteps/istep15/host_build_stop_image.C b/src/usr/isteps/istep15/host_build_stop_image.C
index 1a3d0e05a..958e8fbfe 100644
--- a/src/usr/isteps/istep15/host_build_stop_image.C
+++ b/src/usr/isteps/istep15/host_build_stop_image.C
@@ -576,11 +576,11 @@ void* host_build_stop_image (void *io_pArgs)
                 // capture the target data in the elog
                 ErrlUserDetailsTarget(l_procChip).addToLog( l_errl );
 
-                l_errl->addFFDC( HWPF_COMP_ID,
+                l_errl->addFFDC( ERRL_COMP_ID,
                                  reinterpret_cast<void *>(&l_imageBuild),
                                  sizeof(Util::imageBuild_t),
                                  0,                   // Version
-                                 ERRL_UDT_NOFORMAT,   // parser ignores data
+                                 ERRL_UDT_BUILD,      // parse XIP image build
                                  false );             // merge
 
                 // Create IStep error log and cross ref error that occurred
diff --git a/src/usr/isteps/pm/pm_common.C b/src/usr/isteps/pm/pm_common.C
index 44aa2e99e..348568ef7 100644
--- a/src/usr/isteps/pm/pm_common.C
+++ b/src/usr/isteps/pm/pm_common.C
@@ -346,11 +346,11 @@ namespace HBPM
             {
                 TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                            ERR_MRK"loadHcode: p9_hcode_image_build failed!" );
-                l_errl->addFFDC( ISTEP_COMP_ID,
+                l_errl->addFFDC( ERRL_COMP_ID,
                                  reinterpret_cast<void *>(&l_imageBuild),
                                  sizeof(Util::imageBuild_t),
                                  0,                           // Version
-                                 ERRORLOG::ERRL_UDT_NOFORMAT, // parser ignores
+                                 ERRORLOG::ERRL_UDT_BUILD,    // parse build
                                  false );                     // merge
                 l_errl->collectTrace("ISTEPS_TRACE",256);
 
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C
index 1a2cea5cb..822a6912f 100644
--- a/src/usr/sbe/sbe_update.C
+++ b/src/usr/sbe/sbe_update.C
@@ -2262,11 +2262,11 @@ namespace SBE
         if(err && (io_sbeState.new_imageBuild.buildDate != 0) &&
            (io_sbeState.new_imageBuild.buildTime != 0))
         {
-            err->addFFDC(SBE_COMP_ID,
+            err->addFFDC(ERRL_COMP_ID,
                          &(io_sbeState.new_imageBuild),
                          sizeof(io_sbeState.new_imageBuild),
                          0,                   // Version
-                         ERRL_UDT_NOFORMAT,   // parser ignores data
+                         ERRL_UDT_BUILD,      // parser for XIP image build info
                          false );             // merge
         }
 
@@ -4482,7 +4482,7 @@ namespace SBE
 
 
                         TRACFCOMP(g_trac_sbe,"preReIplCheck(): MVPD update "
-                                  "Requried for tgt=0x%X (u_a=0x%X, flag=0x%X)",
+                                  "Required for tgt=0x%X (u_a=0x%X, flag=0x%X)",
                                   TARGETING::get_huid(io_sbeStates_v[i].target),
                                   io_sbeStates_v[i].update_actions,
                                   io_sbeStates_v[i].mvpdSbKeyword.flags);