diff options
| author | Marty Gloff <mgloff@us.ibm.com> | 2017-07-07 16:52:37 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-07-17 11:07:38 -0400 |
| commit | 735531f69b8db22ec2acc8b0aa1b73106a892f77 (patch) | |
| tree | 3f664e2b18c3f8f4e59f1ff6260882507318be84 /src/usr/util | |
| parent | 9ecbdfd70311bd7074ce341201779791a14e381c (diff) | |
| download | talos-hostboot-735531f69b8db22ec2acc8b0aa1b73106a892f77.tar.gz talos-hostboot-735531f69b8db22ec2acc8b0aa1b73106a892f77.zip | |
Log build level for SBE and HCODE customization
Extract build information from the XIP header for the SBE and HCODE
images. Trace the information.
Also use it as FFDC for related error logs.
Save the SBE build information in the SB keyword of MVPD.
Change-Id: I600a71ae6cbf342643261da14f6b3b2e6bf3cbf1
RTC: 168827
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42951
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/util')
| -rw-r--r-- | src/usr/util/makefile | 4 | ||||
| -rw-r--r-- | src/usr/util/runtime/makefile | 4 | ||||
| -rw-r--r-- | src/usr/util/utilxipimage.C | 57 |
3 files changed, 65 insertions, 0 deletions
diff --git a/src/usr/util/makefile b/src/usr/util/makefile index 6f6623d6f..d2c86d816 100644 --- a/src/usr/util/makefile +++ b/src/usr/util/makefile @@ -25,6 +25,9 @@ ROOTPATH = ../../.. MODULE = util +## pointer to common HWP files +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/xip/ + OBJS += threadpool.o OBJS += utilbase.o OBJS += utilstream.o @@ -36,6 +39,7 @@ OBJS += utilmbox_scratch.o OBJS += utiltcemgr.o OBJS += utilsemipersist.o OBJS += utilrsvdmem.o +OBJS += utilxipimage.o SUBDIRS += test.d SUBDIRS += runtime.d diff --git a/src/usr/util/runtime/makefile b/src/usr/util/runtime/makefile index c9bc4b0ef..3f2ea4e4b 100644 --- a/src/usr/util/runtime/makefile +++ b/src/usr/util/runtime/makefile @@ -26,6 +26,9 @@ HOSTBOOT_RUNTIME = 1 ROOTPATH = ../../../.. MODULE = util_rt +## pointer to common HWP files +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/xip/ + OBJS += utilbase.o OBJS += utilstream.o OBJS += utilmem.o @@ -35,6 +38,7 @@ OBJS += utillidpnor.o OBJS += rt_cmds.o OBJS += util_rt.o OBJS += utilrsvdmem.o +OBJS += utilxipimage.o SUBDIRS += test.d diff --git a/src/usr/util/utilxipimage.C b/src/usr/util/utilxipimage.C new file mode 100644 index 000000000..b8b9fdf85 --- /dev/null +++ b/src/usr/util/utilxipimage.C @@ -0,0 +1,57 @@ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/util/utilxipimage.C $ */ +/* */ +/* 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 */ + +#include <string.h> +#include <util/utilxipimage.H> + +//Procedures +#include <p9_xip_image.h> + +namespace Util +{ + void pullTraceBuildInfo(void* i_imagePtr, + imageBuild_t& o_imageBuild, + trace_desc_t* i_traceDesc) + { + // Pull build information from XIP header + P9XipHeader* l_xipHeader = reinterpret_cast<P9XipHeader *>(i_imagePtr); + + o_imageBuild.buildDate = l_xipHeader->iv_buildDate; + o_imageBuild.buildTime = l_xipHeader->iv_buildTime; + memcpy(o_imageBuild.buildTag, + l_xipHeader->iv_buildTag, + sizeof(o_imageBuild.buildTag) ); + + // Trace build information if trace parameter supplied + if(i_traceDesc != nullptr) + { + TRACFCOMP(i_traceDesc, "pullTraceBuildInfo: image build date " + "= %8d, build time = %04d, build tag = %-.20s", + o_imageBuild.buildDate, + o_imageBuild.buildTime, + o_imageBuild.buildTag); + } + } +}
\ No newline at end of file |

