Skip to content

Commit

Permalink
fixed compilation errors when ENABLE_CHECKSTOP_ANALYSIS is enabled
Browse files Browse the repository at this point in the history 
Change-Id: Ic77f03ca0b4c221eef37581e6791ab8b4398af74
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41180
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@zane131 @dcrowell77
zane131 authored and dcrowell77 committed Jun 8, 2017
1 parent e1cfd4e commit b431a6f
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 22 deletions.
10 changes: 9 additions & 1 deletion src/build/buildpnor/defaultPnorLayout.xml
View file
Expand Up @@ -251,7 +251,7 @@ Layout Description
<side>sideless</side>
<ecc/>
</section>
<section>
<section>
<description>OCC Lid (1.125M)</description>
<eyeCatch>OCC</eyeCatch>
<physicalOffset>0x2AD4000</physicalOffset>
Expand All @@ -271,4 +271,12 @@ Layout Description
<sha512Version/>
<ecc/>
</section>
<section>
<description>FIRDATA (12K)</description>
<eyeCatch>FIRDATA</eyeCatch>
<physicalOffset>0x2EF4000</physicalOffset>
<physicalRegionSize>0x3000</physicalRegionSize>
<side>sideless</side>
<ecc/>
</section>
</pnor>
8 changes: 8 additions & 0 deletions src/build/buildpnor/pnorLayoutFSP.xml
View file
Expand Up @@ -259,4 +259,12 @@ Layout Description - Used when building an FSP driver
<side>sideless</side>
<ecc/>
</section>
<section>
<description>FIRDATA (12K)</description>
<eyeCatch>FIRDATA</eyeCatch>
<physicalOffset>0x2EF4000</physicalOffset>
<physicalRegionSize>0x3000</physicalRegionSize>
<side>sideless</side>
<ecc/>
</section>
</pnor>
4 changes: 4 additions & 0 deletions src/build/configs/fsprelease.config
View file
Expand Up @@ -11,3 +11,7 @@ set START_OCC_DURING_BOOT
unset NO_SBE_UPDATES
unset BMC_BT_LPC_IPMI
unset HTMGT

# OpenPower checkstop analysis
unset ENABLE_CHECKSTOP_ANALYSIS

11 changes: 6 additions & 5 deletions src/build/mkrules/hbfw/img/makefile
View file
Expand Up @@ -88,12 +88,13 @@ PAYLOAD_FINAL_IMG = PAYLOAD.bin
RINGOVD_FINAL_IMG = RINGOVD.bin
SBKT_FINAL_IMG = SBKT.bin
WOFDATA_FINAL_IMG = WOFDATA.bin
FIRDATA_FINAL_IMG = FIRDATA.bin
FINAL_OUTPUT_IMAGES = ${HBBL_FINAL_IMG} ${HBB_FINAL_IMG} ${HBI_FINAL_IMG} \
${HBRT_FINAL_IMG} ${TEST_FINAL_IMG} ${TESTRO_FINAL_IMG} \
${HBEL_FINAL_IMG} ${GUARD_FINAL_IMG} ${GLOBAL_FINAL_IMG} \
${DJVPD_FINAL_IMG} ${MVPD_FINAL_IMG} ${CVPD_FINAL_IMG} \
${PAYLOAD_FINAL_IMG} ${RINGOVD_FINAL_IMG} ${SBKT_FINAL_IMG} \
${WOFDATA_FINAL_IMG}
${WOFDATA_FINAL_IMG} ${FIRDATA_FINAL_IMG}

# Aggregate
ALL_DEFAULT_IMAGES = ${DEFAULT_INPUT_IMAGES} ${FINAL_OUTPUT_IMAGES}
Expand All @@ -119,15 +120,15 @@ PNOR_LAYOUT = ${pnorLayoutFSP.xml:P}
# Decide which PNOR to build
.if(${FAKEPNOR} == "")
# Parameters passed into GEN_PNOR_IMAGE_SCRIPT.
GEN_DEFAULT_BIN_FILES = HBBL=${HBBL_IMG},HBB=${HBB_IMG},HBI=${HBI_IMG},HBRT=${HBRT_IMG},TEST=EMPTY,TESTRO=EMPTY,HBEL=EMPTY,GUARD=EMPTY,GLOBAL=EMPTY,PAYLOAD=EMPTY,CVPD=EMPTY,MVPD=EMPTY,DJVPD=EMPTY,RINGOVD=EMPTY,SBKT=EMPTY,WOFDATA=EMPTY
GEN_DEFAULT_BIN_FILES = HBBL=${HBBL_IMG},HBB=${HBB_IMG},HBI=${HBI_IMG},HBRT=${HBRT_IMG},TEST=EMPTY,TESTRO=EMPTY,HBEL=EMPTY,GUARD=EMPTY,GLOBAL=EMPTY,PAYLOAD=EMPTY,CVPD=EMPTY,MVPD=EMPTY,DJVPD=EMPTY,RINGOVD=EMPTY,SBKT=EMPTY,WOFDATA=EMPTY,FIRDATA=EMPTY
DEFAULT_PARAMS = --build-all --emit-eccless ${TARGET_TEST:b--test} ${HB_STANDALONE:b--hb-standalone} \
${CONFIG_SECUREBOOT:b--secureboot} --systemBinFiles ${GEN_DEFAULT_BIN_FILES} \
--pnorLayout ${PNOR_LAYOUT} ${KEY_TRANSITION_PARAMS} ${CORRUPT_PARAMS} \
--hwKeyHashFile ${IMPRINT_HW_KEY_HASH}
.else
PNOR_LAYOUT = ${pnorLayoutFake.xml:P}
# Parameters passed into GEN_PNOR_IMAGE_SCRIPT.
GEN_DEFAULT_BIN_FILES = HBI=${HBI_IMG},HBEL=EMPTY,MVPD=${${VPO_FAKE_MVPD}:P},DJVPD=${${VPO_FAKE_DJVPD}:P}
GEN_DEFAULT_BIN_FILES = HBI=${HBI_IMG},HBEL=EMPTY,MVPD=${${VPO_FAKE_MVPD}:P},DJVPD=${${VPO_FAKE_DJVPD}:P},FIRDATA=EMPTY
DEFAULT_PARAMS = --systemBinFiles ${GEN_DEFAULT_BIN_FILES} --pnorLayout ${PNOR_LAYOUT}
.endif

Expand Down Expand Up @@ -280,7 +281,7 @@ gen_system_specific_images_bypass_cache :
gen_system_specific_images: build_sbe_partitions .PMAKE
@${MAKE:T:R} gen_system_specific_images_bypass_cache

HOSTBOOT_DEFAULT_SECTIONS = HBBL=${HBBL_FINAL_IMG},HBB=${HBB_FINAL_IMG},HBI=${HBI_FINAL_IMG},HBRT=${HBRT_FINAL_IMG},TEST=${TEST_FINAL_IMG},TESTRO=${TESTRO_FINAL_IMG},HBEL=${HBEL_FINAL_IMG},GUARD=${GUARD_FINAL_IMG},GLOBAL=${GLOBAL_FINAL_IMG},PAYLOAD=${PAYLOAD_FINAL_IMG},CVPD=${CVPD_FINAL_IMG},MVPD=${MVPD_FINAL_IMG},DJVPD=${DJVPD_FINAL_IMG},RINGOVD=${RINGOVD_FINAL_IMG},SBKT=${SBKT_FINAL_IMG},WOFDATA=${WOFDATA_FINAL_IMG}
HOSTBOOT_DEFAULT_SECTIONS = HBBL=${HBBL_FINAL_IMG},HBB=${HBB_FINAL_IMG},HBI=${HBI_FINAL_IMG},HBRT=${HBRT_FINAL_IMG},TEST=${TEST_FINAL_IMG},TESTRO=${TESTRO_FINAL_IMG},HBEL=${HBEL_FINAL_IMG},GUARD=${GUARD_FINAL_IMG},GLOBAL=${GLOBAL_FINAL_IMG},PAYLOAD=${PAYLOAD_FINAL_IMG},CVPD=${CVPD_FINAL_IMG},MVPD=${MVPD_FINAL_IMG},DJVPD=${DJVPD_FINAL_IMG},RINGOVD=${RINGOVD_FINAL_IMG},SBKT=${SBKT_FINAL_IMG},WOFDATA=${WOFDATA_FINAL_IMG},FIRDATA=${FIRDATA_FINAL_IMG}
#@TODO RTC:163810 - Put SBEC back "SBEC=${SBEC_FINAL_IMG},"
.if(${DEFAULT_PNOR} == 1)
NIMBUS_SECT = HBD=${NIMBUS_HBD_FINAL_IMG},SBE=${NIMBUS_SBE_FINAL_IMG},HCODE=${NIMBUS_HCODE_FINAL_IMG},OCC=${NIMBUS_OCC_FINAL_IMG}
Expand All @@ -298,7 +299,7 @@ PNOR_IMG_INFO = \
# Note: If FAKEPNOR defined, ONLY a FAKEPNOR will be generated, this is due to
# some limitations of GEN_PNOR_IMAGE_SCRIPT at the time of porting to p9
.if(${FAKEPNOR} != "")
HOSTBOOT_DEFAULT_SECTIONS = HBI=${HBI_FINAL_IMG},HBEL=${HBEL_FINAL_IMG},MVPD=${MVPD_FINAL_IMG},DJVPD=${DJVPD_FINAL_IMG},CVPD=${VPO_FAKE_DVPD}
HOSTBOOT_DEFAULT_SECTIONS = HBI=${HBI_FINAL_IMG},HBEL=${HBEL_FINAL_IMG},MVPD=${MVPD_FINAL_IMG},DJVPD=${DJVPD_FINAL_IMG},CVPD=${VPO_FAKE_DVPD},FIRDATA=${FIRDATA_FINAL_IMG}
NIMBUS_SECT = HBD=${NIMBUS_HBD_FINAL_IMG},HCODE=${NIMBUS_HCODE_FINAL_IMG}
PNOR_IMG_INFO = \
${FAKEPNOR}:${PNOR_LAYOUT}:${NIMBUS_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
Expand Down
2 changes: 1 addition & 1 deletion src/usr/diag/HBconfig
View file
Expand Up @@ -4,7 +4,7 @@ config HBRT_PRD
Enable HBRT PRD.

config ENABLE_CHECKSTOP_ANALYSIS
default n
default y
help
Enable collection of FIR data by OCC for checkstops and
post-checkstop analysis by PRD on system reboot
Expand Down
6 changes: 3 additions & 3 deletions src/usr/diag/prdf/framework/prdfFileRegisterAccess.C
View file
Expand Up @@ -33,15 +33,15 @@ using namespace TARGETING;
namespace PRDF
{

errlHndl_t FileScomAccessor::Access(
uint32_t FileScomAccessor::Access(
TargetHandle_t i_target,
BitString & bs,
uint64_t registerId,
MopRegisterAccess::Operation operation) const
{
#define PRDF_FUNC "[FileScomAccessor::Access()] "

errlHndl_t errlH = NULL;
uint32_t rc = SUCCESS;

PnorFirDataReader & firData = PnorFirDataReader::getPnorFirDataReader();
uint64_t data = 0;
Expand All @@ -64,7 +64,7 @@ errlHndl_t FileScomAccessor::Access(
PRDF_ERR(PRDF_FUNC "Wrong Operation:%u", operation);
}

return errlH;
return rc;

#undef PRDF_FUNC
}
Expand Down
4 changes: 2 additions & 2 deletions src/usr/diag/prdf/framework/prdfFileRegisterAccess.H
View file
Expand Up @@ -65,10 +65,10 @@ class FileScomAccessor : public ScomAccessor
* @param BitString - holds data read or to write
* @param register address
* @param [READ|WRITE]
* @returns NULL if success, valid error handle otherwise
* @returns SUCCESS or PRD_SCANCOM_FAILURE
* @pre bs.Length() must be size of register data to read/write
*/
virtual errlHndl_t Access(TARGETING::TargetHandle_t i_target,
virtual uint32_t Access(TARGETING::TargetHandle_t i_target,
BitString & bs,
uint64_t registerId,
MopRegisterAccess::Operation operation) const;
Expand Down
3 changes: 0 additions & 3 deletions src/usr/isteps/istep06/host_gard.C
View file
Expand Up @@ -58,9 +58,6 @@
#endif

#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
#include <hwpf/hwp/occ/occ.H>
#include <hwpf/hwp/occ/occ_common.H>

#include <diag/attn/attn.H>
#endif

Expand Down
8 changes: 6 additions & 2 deletions src/usr/isteps/istep16/call_host_activate_slave_cores.C
View file
Expand Up @@ -45,6 +45,10 @@
#include <p9_cpu_special_wakeup.H>
#include <p9_dump_stop_info.H>

#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
#include <isteps/pm/occCheckstop.H>
#endif

using namespace ERRORLOG;
using namespace TARGETING;
using namespace ISTEP;
Expand Down Expand Up @@ -132,7 +136,7 @@ void* call_host_activate_slave_cores (void *io_pArgs)
fapi2::toString( l_fapi2ProcTarget,
l_targName,
sizeof(l_targName) );

TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
"Call p9_dump_stop_info on processor %s", l_targName );

Expand Down Expand Up @@ -229,7 +233,7 @@ void* call_host_activate_slave_cores (void *io_pArgs)
}
// @@@@@ END CUSTOM BLOCK: @@@@@

#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
if( l_stepError.isNull() )
{
// update firdata inputs for OCC
Expand Down
8 changes: 3 additions & 5 deletions src/usr/isteps/pm/pm_common.C
View file
Expand Up @@ -193,12 +193,10 @@ namespace HBPM
{
l_config_data->firMaster = IS_FIR_MASTER;

// TODO: RTC 124683 The ability to write the HOMER data
// is currently not available at runtime.
#ifndef __HOSTBOOT_RUNTIME
#if !defined(__HOSTBOOT_RUNTIME) || defined(CONFIG_HBRT_PRD)
l_errl = PRDF::writeHomerFirData( l_config_data->firdataConfig,
sizeof(config_data->firdataConfig) );
#endif
sizeof(l_config_data->firdataConfig) );
#endif

}
else
Expand Down

0 comments on commit b431a6f

Please sign in to comment.