diff options
37 files changed, 450 insertions, 597 deletions
diff --git a/src/usr/diag/prdf/common/framework/config/iipSystem.C b/src/usr/diag/prdf/common/framework/config/iipSystem.C index e95fefc02..52b3e46bc 100755 --- a/src/usr/diag/prdf/common/framework/config/iipSystem.C +++ b/src/usr/diag/prdf/common/framework/config/iipSystem.C @@ -47,8 +47,8 @@ #include <iipDomain.h> #include <iipServiceDataCollector.h> #include <iipResolutionFactory.h> -#include <iipglobl.h> #include <prdfPlatServices.H> +#include <prdfGlobal.H> #ifndef __HOSTBOOT_MODULE #include <prdfMfgThresholdMgr.H> diff --git a/src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.C b/src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.C index 3b8f5c9fa..e683e12fd 100755 --- a/src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.C +++ b/src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.C @@ -28,7 +28,8 @@ #include <prdf_service_codes.H> #include <errlentry.H> #include <prdfPfa5Data.h> -#include <iipglobl.h> +#include <prdfErrlUtil.H> +#include <prdfGlobal.H> namespace PRDF { diff --git a/src/usr/diag/prdf/common/framework/config/prdfFabricDomain.C b/src/usr/diag/prdf/common/framework/config/prdfFabricDomain.C index 9d9f2658a..b6a8ba3e1 100755 --- a/src/usr/diag/prdf/common/framework/config/prdfFabricDomain.C +++ b/src/usr/diag/prdf/common/framework/config/prdfFabricDomain.C @@ -32,7 +32,7 @@ //---------------------------------------------------------------------- #define prdfFabricDomain_C -#include <iipglobl.h> +#include <prdfGlobal.H> #include <iipstep.h> #include <iipsdbug.h> #include <iipErrorRegister.h> diff --git a/src/usr/diag/prdf/common/framework/config/prdfParentDomain.C b/src/usr/diag/prdf/common/framework/config/prdfParentDomain.C index 89d1c3c5d..74febaad1 100755 --- a/src/usr/diag/prdf/common/framework/config/prdfParentDomain.C +++ b/src/usr/diag/prdf/common/framework/config/prdfParentDomain.C @@ -32,7 +32,7 @@ // Includes //---------------------------------------------------------------------- -#include <iipglobl.h> +#include <prdfGlobal.H> #include <iipDomain.h> #include <prdfPllDomain.H> diff --git a/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C b/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C index 8ce117c7a..a777d13e9 100755 --- a/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C +++ b/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C @@ -34,7 +34,7 @@ #include <iipResolution.h> #include <prdfPlatServices.H> #include <prdfPluginDef.H> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <iipSystem.h> namespace PRDF diff --git a/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C b/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C index c585dbf5b..9e4689ec9 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C +++ b/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C @@ -47,7 +47,7 @@ #include <iipErrorRegister.h> #include <iipconst.h> -#include <iipglobl.h> +#include <prdfGlobal.H> #undef iipErrorRegister_C namespace PRDF diff --git a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C index 846df3c2d..55f68d122 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C +++ b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C @@ -46,10 +46,11 @@ #include <prdfHomRegisterAccess.H> #include <prdf_service_codes.H> #include <iipbits.h> -#include <iipglobl.h> #include <prdfMain.H> #include <prdfPlatServices.H> - +#include <prdfGlobal.H> +#include <prdfErrlUtil.H> +#include <prdfTrace.H> #undef prdfHomRegisterAccess_C diff --git a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H index 9756d2683..4900fff96 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H +++ b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H @@ -36,8 +36,8 @@ #include <iipMopRegisterAccess.h> #include <vector> #include <prdfPlatServices.H> -#include <iipglobl.h> - +#include <prdfErrlUtil.H> +#include <prdfGlobal.H> //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- diff --git a/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H b/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H index f3f61b4a8..ec7083401 100644 --- a/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H +++ b/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H @@ -29,7 +29,7 @@ #include <map> #include <targeting/common/target.H> #include <iipbits.h> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <prdfScanFacility.H> #include <prdfScomRegisterAccess.H> diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolution.C b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C index a9d65aa62..935cfee23 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipResolution.C +++ b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C @@ -35,7 +35,7 @@ #include <iipconst.h> #include <CcAutoDeletePointer.h> #include <iipSystem.h> -#include <iipglobl.h> +#include <prdfGlobal.H> //#include <iipCalloutMap.h> #include <iipCalloutResolution.h> #include <iipstep.h> diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h index b0d7becb9..980b9dbbc 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h @@ -51,7 +51,7 @@ //-------------------------------------------------------------------- #include <iipconst.h> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <prdfFlyWeight.H> // dg01 #include <prdfFlyWeightS.H> #include <iipCalloutResolution.h> diff --git a/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C b/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C index c5d33e8d5..f1a3e26b7 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C +++ b/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C @@ -27,7 +27,8 @@ #include <prdfSdcFileControl.H> //for SyncAnalysis #endif -#include <iipglobl.h> // for SystemPtr. +#include <prdfGlobal.H> // for SystemPtr. +#include <prdfErrlUtil.H> #include <prdfRuleChip.H> #include <prdrLoadChip.H> diff --git a/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C b/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C index 93c1e5581..55e87c465 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C +++ b/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C @@ -31,9 +31,9 @@ #include <prdf_service_codes.H> #include <prdfThresholdResolutions.H> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <UtilHash.H> // for Util::hashString - +#include <prdfErrlUtil.H> #include <algorithm> // for std::generate_n namespace Prdr diff --git a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C index 65a6f49d1..344a06665 100755 --- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C +++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C @@ -32,9 +32,10 @@ #include <prdfPlatServices.H> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <prdfAssert.h> #include <prdfTrace.H> +#include <prdfErrlUtil.H> #include <dimmBadDqBitmapFuncs.H> // for dimm[S|G]etBadDqBitmap() #include <dram_initialization/mss_memdiag/mss_maint_cmds.H> diff --git a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C index 66d3454ea..1369b5577 100755 --- a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C +++ b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C @@ -32,7 +32,8 @@ #include <prdfTargetServices.H> -#include <iipglobl.h> +#include <prdfGlobal.H> +#include <prdfErrlUtil.H> #include <prdfTrace.H> #include <fapi.H> diff --git a/src/usr/diag/prdf/common/framework/service/prdf_ras_services.C b/src/usr/diag/prdf/common/framework/service/prdf_ras_services.C index 3eb42974f..1527771f9 100755 --- a/src/usr/diag/prdf/common/framework/service/prdf_ras_services.C +++ b/src/usr/diag/prdf/common/framework/service/prdf_ras_services.C @@ -32,7 +32,8 @@ #include <time.h> #include <iipServiceDataCollector.h> #include <prdf_service_codes.H> -#include <iipglobl.h> +#include <prdfGlobal.H> +#include <prdfErrlUtil.H> #include <prdfCallouts.H> #include <prdfPlatServices.H> diff --git a/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C b/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C index 6679e4562..8cc851ff1 100755 --- a/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C +++ b/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C @@ -49,10 +49,11 @@ #include <iipstep.h> #include <iipServiceDataCollector.h> #include <iipsdbug.h> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <prdf_service_codes.H> #include <prdfBitString.H> #include <prdfPlatServices.H> +#include <prdfErrlUtil.H> #undef xspprdsdbug_C diff --git a/src/usr/diag/prdf/common/iipglobl.h b/src/usr/diag/prdf/common/iipglobl.h deleted file mode 100755 index d92c6ec69..000000000 --- a/src/usr/diag/prdf/common/iipglobl.h +++ /dev/null @@ -1,562 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/diag/prdf/common/iipglobl.h $ */ -/* */ -/* IBM CONFIDENTIAL */ -/* */ -/* COPYRIGHT International Business Machines Corp. 2002,2013 */ -/* */ -/* p1 */ -/* */ -/* Object Code Only (OCO) source materials */ -/* Licensed Internal Code Source Materials */ -/* IBM HostBoot Licensed Internal Code */ -/* */ -/* The source code for this program is not published or otherwise */ -/* divested of its trade secrets, irrespective of what has been */ -/* deposited with the U.S. Copyright Office. */ -/* */ -/* Origin: 30 */ -/* */ -/* IBM_PROLOG_END_TAG */ - -#ifndef IIPGLOBL_H -#define IIPGLOBL_H - -/* Module Description *************************************************/ -/* */ -/* Name: iipglobl.h */ -/* */ -/* Description: This module contains the Processor Runtime - Diagnostics global variable and type declarations. */ -/* */ -/* End Module Description *********************************************/ - -/*--------------------------------------------------------------------*/ -/* Includes */ -/*--------------------------------------------------------------------*/ - -#ifdef __HOSTBOOT_MODULE - #include <errl/errlmanager.H> - #include <util/singleton.H> -#else - #include <errlentry.H> - #include <hwsvSvrErrl.H> - #include <utilsingleton.H> - #include <srcisrc.H> - // FIXME: uncomment dump include when Adriana's fix is in - //#include <dumpHWURequest_applet.H> -#endif - -#include <prdfTrace.H> -#include <prdf_types.h> -#include <prdfErrlSmartPtr.H> - -namespace PRDF -{ -/*--------------------------------------------------------------------*/ -/* Forward References */ -/*--------------------------------------------------------------------*/ - -class System; - -/*--------------------------------------------------------------------*/ -/* Global Variables */ -/*--------------------------------------------------------------------*/ - - extern System * systemPtr; - extern ErrlSmartPtr g_prd_errlHndl; - -} //End namespace PRDF - -/*--------------------------------------------------------------------*/ -/* Singleton macros common to both FSP and Hostboot */ -/*--------------------------------------------------------------------*/ -/** - * @brief common singleton declaration to specific platform - * - * @param[in] __T__ - * Type of singleton, fully namespaced - * - * @param[in] __NAME__ - * Symbol name for singleton - */ - -/** - * @brief common singleton "getter" to the specific platform - * - * @param[in] __TYPE__ - * Typedef for singleton, as created above - * - * @return Singleton reference for the given singleton - */ - -// ----------- Hostboot macros begin ----------- -#ifdef __HOSTBOOT_MODULE - -#define PRDF_DECLARE_SINGLETON(__T__,__NAME__) \ - typedef Singleton<__T__> __NAME__ - - -#define PRDF_GET_SINGLETON(__TYPE__) \ - __TYPE__::instance() - -// ----------- FSP macros begin ----------- -#else - -#define PRDF_DECLARE_SINGLETON(__T__,__NAME__) \ - typedef util::SingletonHolder<__T__> __NAME__ - -#define PRDF_GET_SINGLETON(__TYPE__) \ - __TYPE__::Instance() - -#endif -// end Singleton macros - -/*--------------------------------------------------------------------*/ -/* Errl macros common to both FSP and Hostboot */ -/*--------------------------------------------------------------------*/ - -/** - * @brief Convert any integer to uint64_t - */ -#define PRDF_GET_UINT64(x) static_cast<uint64_t>(x) - -/** - * @brief store two uint32_t to uint64_t - */ -#define PRDF_GET_UINT64_FROM_UINT32(l_32, r_32) \ - ( (PRDF_GET_UINT64(l_32) << 32) | PRDF_GET_UINT64(r_32) ) - -// ----------- Hostboot macros begin ----------- -#ifdef __HOSTBOOT_MODULE - -/** - * @brief create ErrlEntry in Hostboot - */ -/* This macro does not use the below FSP input parms: - - - i_etype : errlEventType - - i_type : srciType - - i_srcAttr : srcAttr - - i_refCode : serviceCodes -*/ -#define PRDF_CREATE_ERRL(io_errl, i_sev, i_etype, i_type, \ - i_srcAttr, i_mid, i_refCode, i_reasonCode, \ - i_user1 , i_user2, i_user3 , i_user4) \ - io_errl = new ERRORLOG::ErrlEntry(ERRORLOG::i_sev, \ - i_mid, \ - i_reasonCode, \ - PRDF_GET_UINT64_FROM_UINT32( \ - i_user1, \ - i_user2), \ - PRDF_GET_UINT64_FROM_UINT32( \ - i_user3, \ - i_user4)) - -/** - * @brief Add user data to the log - */ -#define PRDF_ADD_FFDC(io_errl, i_buf, i_size, i_ver, i_subsec) \ - io_errl->addFFDC(PRDF_COMP_ID, i_buf, i_size, i_ver, i_subsec) - -/** - * @brief Commit the log - */ -// FIXME: hberr does not use i_actions for commit -#define PRDF_COMMIT_ERRL(io_errl, i_actions) \ - if(i_actions) {} \ - errlCommit(io_errl, PRDF_COMP_ID) - -/** - * @brief Collect component trace - */ -#define PRDF_COLLECT_TRACE(io_errl, i_max) \ - io_errl->collectTrace(PRDF_COMP_NAME, i_max) - -/** - * @brief Add a procedure ( software ) callout - */ -#define PRDF_ADD_PROCEDURE_CALLOUT(io_errl, i_priority, i_procedure) \ - io_errl->addProcedureCallout((const HWAS::epubProcedureID)i_procedure, \ - (const HWAS::callOutPriority)i_priority) - -/** - * @brief Adds a software section to the log - * mostly used as a stack call indicator - */ -// FIXME: hberrl hasn't added this in yet so make it a no-op for now -#define PRDF_ADD_SW_ERR(io_errl, i_rc, i_fileId, i_codeloc) - -/** - * @brief Set the platform Log Id - */ -// FIXME: hberrl doesn't have this setter method so make it a no-op for now -#define PRDF_SET_PLID(io_errl, i_plid) - -/** - * @brief Get the platform Log Id - */ -#define PRDF_GET_PLID(io_errl, o_plid) \ - o_plid = io_errl->plid() - -/** - * @brief Set 32 bit user defined return code - */ -// FIXME: hberrl doesn't have this setter method so make it a no-op for now -#define PRDF_SET_RC(io_errl, i_rc) - -/** - * @brief Get 32 bit user defined return code - */ -// FIXME: hberrl doesn't have this setter method so make it a no-op for now -#define PRDF_GET_RC(io_errl, o_rc) - -/** - * @brief Get reason code - */ -#define PRDF_GET_REASONCODE(io_errl, o_reasonCode) \ - o_reasonCode = io_errl->reasonCode() - -/** - * @brief get previously stored SRC - * A special index ( 0 ) is used to a - * ccess the primary src. - */ -// FIXME: hberrl doesn't have this setter method so make it a no-op for now -#define PRDF_GET_SRC(io_errl, o_src, i_idx) - -/** - * @brief Determine if the src is terminating - */ -// FIXME: hberrl doesn't have this setter method so make it a no-op for now -#define PRDF_GET_TERM_SRC(io_errl, o_termSRC) - -/** - * @brief write SRC termination flag - */ -// FIXME: hberrl doesn't have this setter method so make it a no-op for now -#define PRDF_SRC_WRITE_TERM_STATE_ON(io_errl, i_flags) - - -// ----------- Hostboot macros end ----------- - -// ----------- FSP macros begin ----------- -#else - -/** - * @brief create ErrlEntry in FSP - */ -#define PRDF_CREATE_ERRL(io_errl, i_sev, i_etype, i_type, \ - i_srcAttr, i_mid, i_refCode, i_reasonCode, \ - i_user1 , i_user2, i_user3 , i_user4) \ - io_errl = new ErrlEntry(PRDF_COMP_ID, \ - i_sev, \ - i_etype, \ - i_type, \ - i_srcAttr, \ - i_mid, \ - i_refCode, \ - i_reasonCode, \ - i_user1, \ - i_user2, \ - i_user3, \ - i_user4, \ - EPUB_FIRMWARE_SP) - -/** - * @brief Add user data to the log - */ -#define PRDF_ADD_FFDC(io_errl, i_buf, i_size, i_ver, i_subsec) \ - io_errl->addUsrDtls(i_buf, i_size, PRDF_COMP_ID, i_ver, i_subsec) - -/** - * @brief Commit the log - */ -#define PRDF_COMMIT_ERRL(io_errl, i_actions) \ - io_errl->commit(PRDF_COMP_ID, i_actions); \ - delete io_errl; io_errl=NULL; - -/** - * @brief Collect component trace - */ -#define PRDF_COLLECT_TRACE(io_errl, i_max) \ - io_errl->CollectTrace(PRDF_COMP_NAME, i_max) - -/** - * @brief Add a procedure ( software ) callout - */ -#define PRDF_ADD_PROCEDURE_CALLOUT(io_errl, i_priority, i_procedure) \ - io_errl->addProcedureCallout(i_priority, i_procedure) - -/** - * @brief Adds a software section to the log - * mostly used as a stack call indicator - */ -#define PRDF_ADD_SW_ERR(io_errl, i_rc, i_fileId, i_codeloc) \ - io_errl->addSwErr(PRDF_COMP_ID, i_rc, i_fileId, i_codeloc) - -/** - * @brief Set the platform Log Id - */ -#define PRDF_SET_PLID(io_errl, i_plid) \ - io_errl->plid(i_plid) - -/** - * @brief Get the platform Log Id - */ -#define PRDF_GET_PLID(io_errl, o_plid) \ - o_plid = io_errl->plid() - -/** - * @brief Set 32 bit user defined return code - */ -#define PRDF_SET_RC(io_errl, i_rc) \ - io_errl->setRC(i_rc) - -/** - * @brief Get 32 bit user defined return code - */ -#define PRDF_GET_RC(io_errl, o_rc) \ - o_rc = io_errl->getRC() - -/** - * @brief Get reason code - */ -#define PRDF_GET_REASONCODE(io_errl, o_reasonCode) \ - o_reasonCode = io_errl->getSRC() == NULL ? 0 : \ - io_errl->getSRC()->reasonCode() - -/** - * @brief get previously stored SRC - * A special index ( 0 ) is used to a - * ccess the primary src. - */ -#define PRDF_GET_SRC(io_errl, o_src, i_idx) \ - o_src = io_errl->getSRC(i_idx) - -/** - * @brief Determine if the src is terminating - */ -#define PRDF_GET_TERM_SRC(io_errl, o_termSRC) \ - o_termSRC = io_errl->getSRC()->isTerminateSRC() - -/** - * @brief write SRC termination flag - */ -#define PRDF_SRC_WRITE_TERM_STATE_ON(io_errl, i_flags) \ - io_errl->getSRC()->writeTermState_ON(i_flags) - - -// ----------- FSP macros end ----------- -#endif - - -/*--------------------------------------------------------------------*/ -/* HW Deconfig Errl macros common to both FSP and Hostboot */ -/*--------------------------------------------------------------------*/ - -// FIXME: defines for enums that are not available in hostboot -#ifdef __HOSTBOOT_MODULE - -// FIXME: these ERRL sevs are currently not supported in HB -#define ERRL_SEV_PREDICTIVE ERRL_SEV_UNRECOVERABLE -#define ERRL_SEV_DIAGNOSTIC_ERROR1 ERRL_SEV_UNRECOVERABLE -#define ERRL_SEV_RECOVERED ERRL_SEV_INFORMATIONAL - -#include <prdfEnums.H> - -#endif - -#ifdef __HOSTBOOT_MODULE - -// ----------- Hostboot macros begin ------------------------------------------- - -/** - * @brief function to create an error log. - */ -#define PRDF_HW_CREATE_ERRL(io_errl, \ - i_sev, \ - i_etype, \ - i_type, \ - i_srcAttr, \ - i_mid, \ - i_refCode, \ - i_reasonCode, \ - i_userData1, \ - i_userData2, \ - i_userData3, \ - i_userData4, \ - i_termFlag, \ - i_pldCheck) \ - PRDF_CREATE_ERRL(io_errl, i_sev, i_etype, i_type, \ - i_srcAttr, i_mid, i_refCode, i_reasonCode, \ - i_userData1, i_userData2, i_userData3, i_userData4) - -/** - * @brief Add a procedure callout to an existing error log - */ -#define PRDF_HW_ADD_PROC_CALLOUT(i_procedure, \ - i_priority, \ - io_errl, \ - i_severity) \ - PRDF_ADD_PROCEDURE_CALLOUT(io_errl, i_priority, i_procedure) - -/** - * @brief Error log interface to add a HW callout to an existing error log. - */ -#define PRDF_HW_ADD_CALLOUT(io_sysTerm, i_target, i_priority, \ - i_deconfigState, i_gardState, \ - io_errl, i_writeVpd, \ - i_gardErrType, i_severity, i_hcdb_update) \ - io_errl->addHwCallout(i_target, \ - (const HWAS::callOutPriority)i_priority, \ - (const HWAS::DeconfigEnum)i_deconfigState, \ - (const HWAS::GARD_ErrorType)i_gardErrType) - -/** - * @brief Error log interface to add a HW callout to an existing error log. - */ -// FIXME - will need to implement later -#define PRDF_HW_ADD_MEMMRU_CALLOUT(io_sysTerm, i_memMRU, i_priority, \ - i_deconfigState, i_gardState, \ - io_errl, i_writeVpd, \ - i_gardErrType, i_severity, i_hcdb_update) - -/** - * @brief Process's pending deconfig and GARD service actions - * and thencommits and deletes the error log. - */ -#define PRDF_HW_COMMIT_ERRL(io_sysTerm, io_errl, i_deferDeconfig, \ - i_action, i_continue) \ - io_sysTerm = false; \ - PRDF_COMMIT_ERRL(io_errl, i_action); - -/** - * @brief indicate whether an abort is active or not - */ -// FIXME - not available in Hostboot? -#define PRDF_ABORTING(o_abort) \ - o_abort = false; - -/** - * @brief Interface to request a Hardware Unit dump collection - */ -// FIXME - need to implement in Hostboot -#define PRDF_HWUDUMP( i_errl, i_content, i_huid ) \ - SUCCESS - -/** - * @brief Interface to deconfig target at Runtime (Not valid in Hostboot) - */ -// FIXME - need to implement in Hostboot -#define PRDF_RUNTIME_DECONFIG( i_pTarget ) \ - SUCCESS - -// ----------- Hostboot macros end ------------------------------------------- - -#else - -// ----------- FSP macros begin ------------------------------------------------ - -/** - * @brief function to create an error log. - */ -#define PRDF_HW_CREATE_ERRL(io_errl, \ - i_sev, \ - i_etype, \ - i_type, \ - i_srcAttr, \ - i_mid, \ - i_refCode, \ - i_reasonCode, \ - i_userData1, \ - i_userData2, \ - i_userData3, \ - i_userData4, \ - i_termFlag, \ - i_pldCheck) \ - HWSV::SvrError::Elog(io_errl, \ - (const uint8_t)i_mid, \ - i_reasonCode, \ - PRDF_COMP_ID, \ - i_userData1, \ - i_userData2, \ - i_userData3, \ - i_userData4, \ - (const HWSV::homTermEnum)i_termFlag, \ - i_pldCheck) - -/** - * @brief Add a procedure callout to an existing error log - */ -#define PRDF_HW_ADD_PROC_CALLOUT(i_procedure, \ - i_priority, \ - io_errl, \ - i_severity) \ - HWSV::SvrError::AddProcedureCallout((const epubProcedureID)i_procedure, \ - (const srciPriority)i_priority, \ - io_errl, \ - i_severity) - -/** - * @brief Error log interface to add a HW callout to an existing error log. - */ -#define PRDF_HW_ADD_CALLOUT(io_sysTerm, i_target, i_priority, \ - i_deconfigState, i_gardState, \ - io_errl, i_writeVpd, \ - i_gardErrType, i_severity, i_hcdb_update) \ - io_sysTerm = HWSV::SvrError::AddHwCallout((HWSV::HUID)PlatServices::getHuid(i_target), \ - (srciPriority)i_priority, \ - (const HWSV::homDeconfigEnum)i_deconfigState, \ - (const HWSV::homGardEnum)i_gardState, \ - io_errl, \ - i_gardErrType, \ - i_severity, \ - (homHCDBUpdate)i_hcdb_update) - -/** - * @brief Error log interface to add a HW callout to an existing error log. - */ -// FIXME - will need to implement later -#define PRDF_HW_ADD_MEMMRU_CALLOUT(io_sysTerm, i_memMRU, i_priority, \ - i_deconfigState, i_gardState, \ - io_errl, i_writeVpd, \ - i_gardErrType, i_severity, i_hcdb_update) - -/** - * @brief Process's pending deconfig and GARD service actions - * and thencommits and deletes the error log. - */ -#define PRDF_HW_COMMIT_ERRL(io_sysTerm, io_errl, i_deferDeconfig, \ - i_action, i_continue) \ - io_sysTerm = HWSV::SvrError::CommitErrl(PRDF_COMP_ID, \ - io_errl, \ - i_deferDeconfig, \ - i_action, \ - i_continue) - -/** - * @brief indicate whether an abort is active or not - */ -#define PRDF_ABORTING(o_abort) \ - o_abort = HWSV::theExecutionService::Instance().aborting() - -/** - * @brief Interface to request a Hardware Unit dump collection - */ -#define PRDF_HWUDUMP( i_errl, i_content, i_huid ) \ - PlatServices::dumpHWURequest( i_errl, i_content, i_huid ) - -/** - * @brief Interface to deconfig target at Runtime - */ -#define PRDF_RUNTIME_DECONFIG( i_target ) \ - PlatServices::runtimeDeconfig( i_target ) - -// ----------- FSP macros end ------------------------------------------------ - -#endif // not __HOSTBOOT_MODULE - -#endif // IIPGLOBL_H diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C index fa3c79b9d..cf7def8cc 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C @@ -32,7 +32,7 @@ #include <prdfBitString.H> #include <iipscr.h> #include <prdfPlatServices.H> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <iipSystem.h> namespace PRDF diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.C b/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.C index f8df68280..2c402e4d7 100644 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.C @@ -26,7 +26,7 @@ #include <prdfMemUtil.H> #include <iipconst.h> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <iipSystem.h> #include <iipServiceDataCollector.h> #include <prdfExtensibleChip.H> diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Ex.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Ex.C index 4439ee474..cfe21720c 100644 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Ex.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Ex.C @@ -25,7 +25,7 @@ * @brief Contains all the plugin code for the PRD P8 EX chiplet */ -#include <iipglobl.h> +#include <prdfGlobal.H> #include <prdfPluginDef.H> #include <iipServiceDataCollector.h> #include <prdfExtensibleChip.H> diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C index b3714a407..67a7beef7 100644 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C @@ -22,7 +22,7 @@ /* IBM_PROLOG_END_TAG */ #include <prdfSystemSpecific.H> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <prdfPegasusConfigurator.H> #include <prdfPlatServices.H> diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.C b/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.C index c78a08eb5..0ac815f03 100644 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.C @@ -25,7 +25,7 @@ // Includes //------------------------------------------------------------------------------ -#include <iipglobl.h> +#include <prdfGlobal.H> #include <prdfPegasusConfigurator.H> #include <prdfRuleFiles.H> diff --git a/src/usr/diag/prdf/common/prdfGlobal_common.H b/src/usr/diag/prdf/common/prdfGlobal_common.H new file mode 100755 index 000000000..b67875457 --- /dev/null +++ b/src/usr/diag/prdf/common/prdfGlobal_common.H @@ -0,0 +1,73 @@ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/diag/prdf/common/prdfGlobal_common.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2002,2013 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ + +#ifndef PRDF_GLOBAL_COMMON_H +#define PRDF_GLOBAL_COMMON_H + +/** + * @file prdfGlobal_common.H + * @brief PRD global code used by external components. + * + * This file contains the Processor Runtime + * Diagnostics global variable and type declarations. + */ + +/*--------------------------------------------------------------------*/ +/* Includes */ +/*--------------------------------------------------------------------*/ + +#include <prdf_types.h> +#include <prdfErrlSmartPtr.H> + +namespace PRDF +{ +/*--------------------------------------------------------------------*/ +/* Forward References */ +/*--------------------------------------------------------------------*/ + +class System; +/*--------------------------------------------------------------------*/ +/* Global Variables */ +/*--------------------------------------------------------------------*/ + + extern System * systemPtr; + extern ErrlSmartPtr g_prd_errlHndl; + +} //End namespace PRDF + +/*--------------------------------------------------------------------*/ +/* Errl macros common to both FSP and Hostboot */ +/*--------------------------------------------------------------------*/ + +/** + * @brief Convert any integer to uint64_t + */ +#define PRDF_GET_UINT64(x) static_cast<uint64_t>(x) + +/** + * @brief store two uint32_t to uint64_t + */ +#define PRDF_GET_UINT64_FROM_UINT32(l_32, r_32) \ + ( (PRDF_GET_UINT64(l_32) << 32) | PRDF_GET_UINT64(r_32) ) + +#endif // PRDF_GLOBAL_COMMON_H diff --git a/src/usr/diag/prdf/common/prdfMain_common.C b/src/usr/diag/prdf/common/prdfMain_common.C index 1fef649fd..652577274 100755 --- a/src/usr/diag/prdf/common/prdfMain_common.C +++ b/src/usr/diag/prdf/common/prdfMain_common.C @@ -33,7 +33,7 @@ #include <prdfMain.H> #include <CcAutoDeletePointer.h> -#include <iipglobl.h> +#include <prdfErrlUtil.H> #include <iipResolutionFactory.h> #include <iipSystem.h> #include <prdrLoadChipCache.H> // To flush chip-file cache. diff --git a/src/usr/diag/prdf/common/util/prdfAssert.C b/src/usr/diag/prdf/common/util/prdfAssert.C index b45ace541..ab31a0c67 100755 --- a/src/usr/diag/prdf/common/util/prdfAssert.C +++ b/src/usr/diag/prdf/common/util/prdfAssert.C @@ -28,11 +28,13 @@ #define prdfAssert_C #include <prdfAssert.h> -#include <iipglobl.h> +#include <prdfGlobal.H> +#include <prdfTrace.H> #include <stdlib.h> #include <errlentry.H> #include <prdf_service_codes.H> #include <prdfMain.H> +#include <prdfErrlUtil.H> #ifdef __HOSTBOOT_MODULE #include <assert.h> diff --git a/src/usr/diag/prdf/common/util/prdfErrlSmartPtr.C b/src/usr/diag/prdf/common/util/prdfErrlSmartPtr.C index 02def05a8..3afe6f7eb 100755 --- a/src/usr/diag/prdf/common/util/prdfErrlSmartPtr.C +++ b/src/usr/diag/prdf/common/util/prdfErrlSmartPtr.C @@ -22,7 +22,8 @@ /* IBM_PROLOG_END_TAG */ #include <prdfErrlSmartPtr.H> -#include <iipglobl.h> +#include <prdfGlobal.H> +#include <prdfErrlUtil.H> namespace PRDF { diff --git a/src/usr/diag/prdf/common/util/prdfFlyWeight.C b/src/usr/diag/prdf/common/util/prdfFlyWeight.C index f2d4fbf49..151e49ae6 100755 --- a/src/usr/diag/prdf/common/util/prdfFlyWeight.C +++ b/src/usr/diag/prdf/common/util/prdfFlyWeight.C @@ -35,6 +35,7 @@ #include <prdfFlyWeight.H> #include <tracinterface.H> #include <prdfHeapBucketSize.H> +#include <prdfTrace.H> #undef prdfFlyWeight_C //---------------------------------------------------------------------- diff --git a/src/usr/diag/prdf/common/util/prdfFlyWeight.H b/src/usr/diag/prdf/common/util/prdfFlyWeight.H index 9f1fa35cf..d23f50075 100755 --- a/src/usr/diag/prdf/common/util/prdfFlyWeight.H +++ b/src/usr/diag/prdf/common/util/prdfFlyWeight.H @@ -35,7 +35,7 @@ #include <stdint.h> #include <vector> -#include <iipglobl.h> +#include <prdfGlobal.H> //-------------------------------------------------------------------- // Forward References diff --git a/src/usr/diag/prdf/common/util/prdfFlyWeightS.H b/src/usr/diag/prdf/common/util/prdfFlyWeightS.H index 446146767..76950e998 100755 --- a/src/usr/diag/prdf/common/util/prdfFlyWeightS.H +++ b/src/usr/diag/prdf/common/util/prdfFlyWeightS.H @@ -26,7 +26,7 @@ #include <stdint.h> #include <vector> -#include <iipglobl.h> +#include <prdfGlobal.H> namespace PRDF { diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.C b/src/usr/diag/prdf/framework/service/prdfPlatServices.C index c031ad89f..7bc5fa78f 100644 --- a/src/usr/diag/prdf/framework/service/prdfPlatServices.C +++ b/src/usr/diag/prdf/framework/service/prdfPlatServices.C @@ -31,7 +31,9 @@ #include <prdfPlatServices.H> -#include <iipglobl.h> +#include <prdfGlobal.H> +#include <prdfErrlUtil.H> +#include <prdfTrace.H> #include <prdfAssert.h> #include <diag/mdia/mdia.H> diff --git a/src/usr/diag/prdf/plat/pegasus/prdfDramRepairs.C b/src/usr/diag/prdf/plat/pegasus/prdfDramRepairs.C index fe1bd4082..1d94335e2 100644 --- a/src/usr/diag/prdf/plat/pegasus/prdfDramRepairs.C +++ b/src/usr/diag/prdf/plat/pegasus/prdfDramRepairs.C @@ -26,7 +26,9 @@ #include <diag/prdf/prdfMain.H> #include <diag/prdf/common/prdf_service_codes.H> #include "common/iipconst.h" -#include "common/iipglobl.h" +#include <prdfGlobal.H> +#include <prdfTrace.H> +#include <prdfErrlUtil.H> #include "common/prdfEnums.H" #include "common/plat/prdfMemoryMru.H" #include "framework/service/prdfPlatServices.H" diff --git a/src/usr/diag/prdf/prdfErrlUtil.H b/src/usr/diag/prdf/prdfErrlUtil.H new file mode 100644 index 000000000..22dd8d3c6 --- /dev/null +++ b/src/usr/diag/prdf/prdfErrlUtil.H @@ -0,0 +1,247 @@ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/diag/prdf/prdfErrlUtil.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2002,2013 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ + +#ifndef __prdfErrlUtil_H +#define __prdfErrlUtil_H + +/** + * @file prdfErrlUtil.H + * @brief PRD error logging code specific to hostboot. + * + * This file contains the Processor Runtime Diagnostics error logging + * related declarations specific to hostboot. + */ + +/*--------------------------------------------------------------------*/ +/* Includes */ +/*--------------------------------------------------------------------*/ +#include <errl/errlmanager.H> +#include <prdfEnums.H> + +/** + * @brief create ErrlEntry in Hostboot + */ +/* This macro does not use the below FSP input parms: + + - i_etype : errlEventType + - i_type : srciType + - i_srcAttr : srcAttr + - i_refCode : serviceCodes +*/ +#define PRDF_CREATE_ERRL(io_errl, i_sev, i_etype, i_type, \ + i_srcAttr, i_mid, i_refCode, i_reasonCode, \ + i_user1 , i_user2, i_user3 , i_user4) \ + io_errl = new ERRORLOG::ErrlEntry(ERRORLOG::i_sev, \ + i_mid, \ + i_reasonCode, \ + PRDF_GET_UINT64_FROM_UINT32( \ + i_user1, \ + i_user2), \ + PRDF_GET_UINT64_FROM_UINT32( \ + i_user3, \ + i_user4)) + +/** + * @brief Add user data to the log + */ +#define PRDF_ADD_FFDC(io_errl, i_buf, i_size, i_ver, i_subsec) \ + io_errl->addFFDC(PRDF_COMP_ID, i_buf, i_size, i_ver, i_subsec) + +/** + * @brief Commit the log + */ +// FIXME:RTC: 65609 will address this issue. +// hberr does not use i_actions for commit +#define PRDF_COMMIT_ERRL(io_errl, i_actions) \ + if(i_actions) {} \ + errlCommit(io_errl, PRDF_COMP_ID) + +/** + * @brief Collect component trace + */ +#define PRDF_COLLECT_TRACE(io_errl, i_max) \ + io_errl->collectTrace(PRDF_COMP_NAME, i_max) + +/** + * @brief Add a procedure ( software ) callout + */ +#define PRDF_ADD_PROCEDURE_CALLOUT(io_errl, i_priority, i_procedure) \ + io_errl->addProcedureCallout((const HWAS::epubProcedureID)i_procedure, \ + (const HWAS::callOutPriority)i_priority) + +/** + * @brief Adds a software section to the log + * mostly used as a stack call indicator + */ +// FIXME:RTC: 65609 will address this issue. +// hberrl hasn't added this in yet so make it a no-op for now +#define PRDF_ADD_SW_ERR(io_errl, i_rc, i_fileId, i_codeloc) + +/** + * @brief Set the platform Log Id + */ +// FIXME:RTC: 65609 will address this issue. +// hberrl doesn't have this setter method so make it a no-op for now +#define PRDF_SET_PLID(io_errl, i_plid) + +/** + * @brief Get the platform Log Id + */ +#define PRDF_GET_PLID(io_errl, o_plid) \ + o_plid = io_errl->plid() + +/** + * @brief Set 32 bit user defined return code + */ +// FIXME:RTC: 65609 will address this issue. +// hberrl doesn't have this setter method so make it a no-op for now +#define PRDF_SET_RC(io_errl, i_rc) + +/** + * @brief Get 32 bit user defined return code + */ +// FIXME:RTC: 65609 will address this issue. +// hberrl doesn't have this setter method so make it a no-op for now +#define PRDF_GET_RC(io_errl, o_rc) + +/** + * @brief Get reason code + */ +#define PRDF_GET_REASONCODE(io_errl, o_reasonCode) \ + o_reasonCode = io_errl->reasonCode() + +/** + * @brief get previously stored SRC + * A special index ( 0 ) is used to a + * ccess the primary src. + */ +// FIXME:RTC: 65609 will address this issue. +// hberrl doesn't have this setter method so make it a no-op for now +#define PRDF_GET_SRC(io_errl, o_src, i_idx) + +/** + * @brief Determine if the src is terminating + */ +// FIXME:RTC: 65609 will address this issue. +// hberrl doesn't have this setter method so make it a no-op for now +#define PRDF_GET_TERM_SRC(io_errl, o_termSRC) + +/** + * @brief write SRC termination flag + */ +// FIXME:RTC: 65609 will address this issue. +// hberrl doesn't have this setter method so make it a no-op for now +#define PRDF_SRC_WRITE_TERM_STATE_ON(io_errl, i_flags) + +// end Singleton macros + +/*--------------------------------------------------------------------*/ +/* HW Deconfig Errl macros for Hostboot */ +/*--------------------------------------------------------------------*/ + +// FIXME:RTC: 65609 will address this issue. +// defines for enums that are not available in hostboot +// these ERRL sevs are currently not supported in HB +#define ERRL_SEV_PREDICTIVE ERRL_SEV_UNRECOVERABLE +#define ERRL_SEV_DIAGNOSTIC_ERROR1 ERRL_SEV_UNRECOVERABLE +#define ERRL_SEV_RECOVERED ERRL_SEV_INFORMATIONAL + +/** + * @brief function to create an error log. + */ +#define PRDF_HW_CREATE_ERRL(io_errl, \ + i_sev, \ + i_etype, \ + i_type, \ + i_srcAttr, \ + i_mid, \ + i_refCode, \ + i_reasonCode, \ + i_userData1, \ + i_userData2, \ + i_userData3, \ + i_userData4, \ + i_termFlag, \ + i_pldCheck) \ + PRDF_CREATE_ERRL(io_errl, i_sev, i_etype, i_type, \ + i_srcAttr, i_mid, i_refCode, i_reasonCode, \ + i_userData1, i_userData2, i_userData3, i_userData4) + +/** + * @brief Add a procedure callout to an existing error log + */ +#define PRDF_HW_ADD_PROC_CALLOUT(i_procedure, \ + i_priority, \ + io_errl, \ + i_severity) \ + PRDF_ADD_PROCEDURE_CALLOUT(io_errl, i_priority, i_procedure) + +/** + * @brief Error log interface to add a HW callout to an existing error log. + */ +#define PRDF_HW_ADD_CALLOUT(io_sysTerm, i_target, i_priority, \ + i_deconfigState, i_gardState, \ + io_errl, i_writeVpd, \ + i_gardErrType, i_severity, i_hcdb_update) \ + io_errl->addHwCallout(i_target, \ + (const HWAS::callOutPriority)i_priority, \ + (const HWAS::DeconfigEnum)i_deconfigState, \ + (const HWAS::GARD_ErrorType)i_gardErrType) + +/** + * @brief Error log interface to add a HW callout to an existing error log. + */ +// FIXME:RTC: 65609 will address this issue. +// will need to implement later +#define PRDF_HW_ADD_MEMMRU_CALLOUT(io_sysTerm, i_memMRU, i_priority, \ + i_deconfigState, i_gardState, \ + io_errl, i_writeVpd, \ + i_gardErrType, i_severity, i_hcdb_update) + +/** + * @brief Process's pending deconfig and GARD service actions + * and thencommits and deletes the error log. + */ +#define PRDF_HW_COMMIT_ERRL(io_sysTerm, io_errl, i_deferDeconfig, \ + i_action, i_continue) \ + io_sysTerm = false; \ + PRDF_COMMIT_ERRL(io_errl, i_action); + +/** + * @brief indicate whether an abort is active or not + */ +// FIXME:RTC: 65609 will address this issue. +// not available in Hostboot? +#define PRDF_ABORTING(o_abort) \ + o_abort = false; + +/** + * @brief Interface to request a Hardware Unit dump collection + */ +// FIXME:RTC: 65609 will address this issue. +// need to implement in Hostboot +#define PRDF_HWUDUMP( i_errl, i_content, i_huid ) \ + SUCCESS + + +#endif // __prdfErrlUtil_H diff --git a/src/usr/diag/prdf/prdfGlobal.H b/src/usr/diag/prdf/prdfGlobal.H new file mode 100644 index 000000000..0f89ffe8d --- /dev/null +++ b/src/usr/diag/prdf/prdfGlobal.H @@ -0,0 +1,80 @@ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/diag/prdf/prdfGlobal.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2002,2013 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ + +#ifndef PRDF_GLOBAL_HB_H +#define PRDF_GLOBAL_HB_H + +/** + * @file prdfGlobal.H + * @brief PRD global code specific to hostboot. + * + * This file contains the Processor Runtime Diagnostics global variable + * and type declarations specific to hostboot. + */ + +/*--------------------------------------------------------------------*/ +/* Includes */ +/*--------------------------------------------------------------------*/ +#include <prdfGlobal_common.H> +#include <util/singleton.H> + +/*--------------------------------------------------------------------*/ +/* Singleton macros common to both FSP and Hostboot */ +/*--------------------------------------------------------------------*/ +/** + * @brief common singleton declaration to specific platform + * + * @param[in] __T__ + * Type of singleton, fully namespaced + * + * @param[in] __NAME__ + * Symbol name for singleton + */ + +/** + * @brief common singleton "getter" to the specific platform + * + * @param[in] __TYPE__ + * Typedef for singleton, as created above + * + * @return Singleton reference for the given singleton + */ + +#define PRDF_DECLARE_SINGLETON(__T__,__NAME__) \ + typedef Singleton<__T__> __NAME__ + + +#define PRDF_GET_SINGLETON(__TYPE__) \ + __TYPE__::instance() + +// end Singleton macros + +/** + * @brief Interface to deconfig target at Runtime (Not valid in Hostboot) + */ +// FIXME:RTC: 65609 will address this issue. +// need to implement in Hostboot +#define PRDF_RUNTIME_DECONFIG( i_pTarget ) \ + SUCCESS + +#endif // PRDF_GLOBAL_HB_H diff --git a/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.C b/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.C index 7beca3ef1..0c692740a 100755 --- a/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.C +++ b/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.C @@ -24,7 +24,7 @@ #include "prdfsimHomRegisterAccess.H" #include "prdfsimServices.H" #include "prdfsimScrDB.H" - +#include <prdfTrace.H> namespace PRDF { diff --git a/src/usr/diag/prdf/test/prdfsimServices.C b/src/usr/diag/prdf/test/prdfsimServices.C index e475d3da2..7d6776811 100755 --- a/src/usr/diag/prdf/test/prdfsimServices.C +++ b/src/usr/diag/prdf/test/prdfsimServices.C @@ -25,7 +25,7 @@ #include <prdfPlatServices.H> #include <prdfMain.H> #include <prdfTrace.H> -#include <iipglobl.h> +#include <prdfGlobal.H> #include "prdfsimUtil.H" #include "prdsimSignatureParser.H" diff --git a/src/usr/diag/prdf/test/prdfsimServices.H b/src/usr/diag/prdf/test/prdfsimServices.H index 0cce26299..21713b8b8 100755 --- a/src/usr/diag/prdf/test/prdfsimServices.H +++ b/src/usr/diag/prdf/test/prdfsimServices.H @@ -25,7 +25,7 @@ #define _SimServices_H #include <prdfMain.H> -#include <iipglobl.h> +#include <prdfGlobal.H> #include "prdfsimScrDB.H" namespace PRDF |
