diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/runtime/hbrt_utilities.H | 2 | ||||
| -rw-r--r-- | src/usr/diag/attn/runtime/attn_rt.C | 26 | ||||
| -rw-r--r-- | src/usr/htmgt/runtime/rt_occ.C | 9 | ||||
| -rw-r--r-- | src/usr/isteps/pm/runtime/rt_pm.C | 18 | ||||
| -rw-r--r-- | src/usr/sbeio/runtime/rt_sbeio.C | 5 | ||||
| -rw-r--r-- | src/usr/sbeio/runtime/test/sbeioAttrOverrideTests.H | 122 | ||||
| -rw-r--r-- | src/usr/secureboot/runtime/rt_secureboot.C | 6 | ||||
| -rw-r--r-- | src/usr/targeting/runtime/attrPlatOverride_rt.C | 3 | ||||
| -rw-r--r-- | src/usr/targeting/runtime/rt_targeting.C | 5 | ||||
| -rw-r--r-- | src/usr/util/runtime/rt_fwnotify.C | 7 | ||||
| -rw-r--r-- | src/usr/util/runtime/util_rt.C | 6 | ||||
| -rw-r--r-- | src/usr/util/runtime/utillidmgr_rt.C | 32 |
12 files changed, 146 insertions, 95 deletions
diff --git a/src/include/runtime/hbrt_utilities.H b/src/include/runtime/hbrt_utilities.H index 9f7e69225..649677422 100644 --- a/src/include/runtime/hbrt_utilities.H +++ b/src/include/runtime/hbrt_utilities.H @@ -27,6 +27,8 @@ #ifndef __HOSTBOOT_RUNTIME_INTERFACE_VERSION_ONLY +#define HBRT_TRACE_NAME "HBRT" + #include "interface.h" /** @file hbrt_utilities.H diff --git a/src/usr/diag/attn/runtime/attn_rt.C b/src/usr/diag/attn/runtime/attn_rt.C index a82cdb7d2..4b044088b 100644 --- a/src/usr/diag/attn/runtime/attn_rt.C +++ b/src/usr/diag/attn/runtime/attn_rt.C @@ -45,6 +45,7 @@ using namespace std; using namespace TARGETING; using namespace ATTN; using namespace PRDF; +extern trace_desc_t* g_trac_hbrt; namespace ATTN_RT { @@ -54,6 +55,7 @@ namespace ATTN_RT */ int enableAttns(void) { + TRACFCOMP(g_trac_hbrt, ENTER_MRK" enable_attns"); ATTN_SLOW(ENTER_MRK"ATTN_RT::enableAttns"); int rc = 0; @@ -91,21 +93,22 @@ namespace ATTN_RT if ( err->sev() < ERRORLOG::ERRL_SEV_PREDICTIVE ) err->setSev( ERRORLOG::ERRL_SEV_PREDICTIVE ); - errlCommit(err, ATTN_COMP_ID); - rc = -1; + rc = ERRL_GETRC_SAFE(err); + errlCommit( err, ATTN_COMP_ID ); break; } err = Singleton<Service>::instance().enableAttns(); if(err) { - errlCommit(err, ATTN_COMP_ID); - rc = -1; + rc = ERRL_GETRC_SAFE(err); + errlCommit( err, ATTN_COMP_ID ); } }while(0); ATTN_SLOW(EXIT_MRK"ATTN_RT::enableAttns rc: %d", rc); + TRACFCOMP(g_trac_hbrt, EXIT_MRK" enable_attns: rc=0x%X",rc); return rc; } @@ -115,6 +118,7 @@ namespace ATTN_RT */ int disableAttns(void) { + TRACFCOMP(g_trac_hbrt, ENTER_MRK" disable_attns"); ATTN_SLOW(ENTER_MRK"ATTN_RT::disableAttns"); int rc = 0; @@ -122,12 +126,13 @@ namespace ATTN_RT err = Singleton<Service>::instance().disableAttns(); if(err) { - errlCommit(err, ATTN_COMP_ID); - rc = -1; + rc = ERRL_GETRC_SAFE(err); + errlCommit( err, ATTN_COMP_ID ); } ATTN_SLOW(EXIT_MRK"ATTN_RT::disableAttns rc: %d", rc); + TRACFCOMP(g_trac_hbrt, EXIT_MRK" disable_attns: rc=0x%X",rc); return rc; } @@ -143,6 +148,7 @@ namespace ATTN_RT uint64_t i_ipollStatus, uint64_t i_ipollMask) { + TRACFCOMP(g_trac_hbrt, ENTER_MRK" handle_attns"); ATTN_SLOW(ENTER_MRK"ATTN_RT::handleAttns RtProc: %llx" ", ipollMask: %llx, ipollStatus: %llx", i_proc, i_ipollMask, i_ipollStatus); @@ -160,7 +166,6 @@ namespace ATTN_RT { ATTN_ERR("ATTN_RT::handleAttns getHbTarget " "returned error for RtProc: %llx", i_proc); - rc = EINVAL; break; } @@ -189,17 +194,18 @@ namespace ATTN_RT if(err) { - errlCommit( err, ATTN_COMP_ID ); if(0 == rc) { - rc = -1; + rc = ERRL_GETRC_SAFE(err); } + errlCommit( err, ATTN_COMP_ID ); } attentions.clear(); ATTN_SLOW(EXIT_MRK"ATTN_RT::handleAttns rc: %d", rc); + TRACFCOMP(g_trac_hbrt, EXIT_MRK" handle_attns: rc=0x%X",rc); return rc; } @@ -215,6 +221,7 @@ namespace ATTN_RT uint64_t getIpollEvents( void ) { + TRACFCOMP(g_trac_hbrt, ENTER_MRK" get_ipoll_events"); uint64_t l_ipollEvents = 0; // Host side should allow 'Recov', 'UnitCs' and 'HostInt' @@ -225,6 +232,7 @@ namespace ATTN_RT IPOLL_SP_RECOVERABLE | IPOLL_SP_SPECIAL | IPOLL_ROUTE_TO_SP ; + TRACFCOMP(g_trac_hbrt, EXIT_MRK" get_ipoll_events: rc=0x%X",l_ipollEvents); return(l_ipollEvents); } // end getIpollEvents diff --git a/src/usr/htmgt/runtime/rt_occ.C b/src/usr/htmgt/runtime/rt_occ.C index 7c453ffc2..652e767ed 100644 --- a/src/usr/htmgt/runtime/rt_occ.C +++ b/src/usr/htmgt/runtime/rt_occ.C @@ -31,6 +31,7 @@ using namespace TARGETING; +extern trace_desc_t* g_trac_hbrt; namespace HTMGT @@ -40,6 +41,7 @@ namespace HTMGT void process_occ_error (uint64_t i_chipId) { + TRACFCOMP(g_trac_hbrt, ENTER_MRK" process_occ_error"); #ifdef CONFIG_HTMGT TARGETING::Target* l_reportingOccTarget = NULL; errlHndl_t err = RT_TARG::getHbTarget(i_chipId,l_reportingOccTarget); @@ -57,12 +59,14 @@ namespace HTMGT TMGT_ERR("Unexpected call to process_occ_error(%d)" " when HTMGT is not enabled", i_chipId); #endif + TRACFCOMP(g_trac_hbrt, EXIT_MRK" process_occ_error"); } //------------------------------------------------------------------------ void process_occ_reset (uint64_t i_chipId) { + TRACFCOMP(g_trac_hbrt, ENTER_MRK" process_occ_reset"); #ifdef CONFIG_HTMGT TARGETING::Target* l_failedOccTarget = NULL; errlHndl_t err = RT_TARG::getHbTarget(i_chipId,l_failedOccTarget); @@ -80,12 +84,14 @@ namespace HTMGT TMGT_ERR("Unexpected call to process_occ_reset(%d)" " when HTMGT is not enabled", i_chipId); #endif + TRACFCOMP(g_trac_hbrt, EXIT_MRK" process_occ_reset"); } //------------------------------------------------------------------------ int enable_occ_actuation (int i_occ_activation) { + TRACFCOMP(g_trac_hbrt, ENTER_MRK" enable_occ_actuation"); int rc = 0; #ifdef CONFIG_HTMGT errlHndl_t err = HTMGT::enableOccActuation(0 != i_occ_activation); @@ -107,6 +113,7 @@ namespace HTMGT TMGT_ERR("Unexpected call to enable_occ_actuation(%d)" " when HTMGT is not enabled", i_occ_activation); #endif + TRACFCOMP(g_trac_hbrt, EXIT_MRK" enable_occ_actuation: rc=0x%X",rc); return rc; } @@ -117,6 +124,7 @@ namespace HTMGT uint16_t * o_rspLength, uint8_t * o_rspData) { + TRACFCOMP(g_trac_hbrt, ENTER_MRK" mfg_htmgt_pass_thru"); int rc = 0; #ifdef CONFIG_HTMGT errlHndl_t err = HTMGT::passThruCommand(i_cmdLength, i_cmdData, @@ -140,6 +148,7 @@ namespace HTMGT #else o_rspLength = 0; #endif + TRACFCOMP(g_trac_hbrt, EXIT_MRK" mfg_htmgt_pass_thru: rc=0x%X",rc); return rc; } diff --git a/src/usr/isteps/pm/runtime/rt_pm.C b/src/usr/isteps/pm/runtime/rt_pm.C index ef861563d..163a78b55 100644 --- a/src/usr/isteps/pm/runtime/rt_pm.C +++ b/src/usr/isteps/pm/runtime/rt_pm.C @@ -53,6 +53,7 @@ using namespace TARGETING; using namespace RUNTIME; using namespace ERRORLOG; +extern trace_desc_t* g_trac_hbrt; namespace ISTEPS_TRACE { @@ -71,13 +72,12 @@ namespace RTPM void pm_complex_error( errlHndl_t i_err, int &io_rc ) { - errlCommit( i_err, RUNTIME_COMP_ID ); - if(io_rc == 0) { - io_rc = -1; + io_rc = ERRL_GETRC_SAFE(i_err); } + errlCommit( i_err, RUNTIME_COMP_ID ); return; } @@ -99,7 +99,7 @@ namespace RTPM errlHndl_t l_err = nullptr; int rc = 0; - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP( g_trac_hbrt,ENTER_MRK "load_pm_complex: homer addr=%016llx. " "occ common addr=%016lx. RtProcChip=%llx. mode=%d", i_homer_addr, @@ -193,6 +193,8 @@ namespace RTPM rc); } + TRACFCOMP( g_trac_hbrt,EXIT_MRK + "load_pm_complex:rc=0x%X", rc ); return rc; } @@ -208,7 +210,7 @@ namespace RTPM errlHndl_t l_err = nullptr; int rc = 0; - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP( g_trac_hbrt,ENTER_MRK "start_pm_complex: RtProcChip %llx", i_chip); do @@ -263,6 +265,8 @@ namespace RTPM rc); } + TRACFCOMP( g_trac_hbrt,EXIT_MRK + "start_pm_complex:rc=0x%X", rc ); return rc; } @@ -279,7 +283,7 @@ namespace RTPM errlHndl_t l_err = nullptr; int rc = 0; - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP( g_trac_hbrt,ENTER_MRK "reset_pm_complex: RtProcChip %llx", i_chip); do @@ -318,6 +322,8 @@ namespace RTPM rc); } + TRACFCOMP( g_trac_hbrt,EXIT_MRK + "reset_pm_complex:rc=0x%X", rc ); return rc; } diff --git a/src/usr/sbeio/runtime/rt_sbeio.C b/src/usr/sbeio/runtime/rt_sbeio.C index 3adea4043..3aed96db6 100644 --- a/src/usr/sbeio/runtime/rt_sbeio.C +++ b/src/usr/sbeio/runtime/rt_sbeio.C @@ -46,6 +46,7 @@ using namespace TARGETING; using namespace ERRORLOG; using namespace SBE_MSG; +extern trace_desc_t* g_trac_hbrt; // Trace trace_desc_t* g_trac_sbeio; @@ -524,6 +525,7 @@ namespace RT_SBEIO int process_sbe_msg(uint32_t i_procChipId) { + TRACFCOMP(g_trac_hbrt, ENTER_MRK" sbe_message_passing: i_procChipId=%d", i_procChipId ); int rc = 0; errlHndl_t errl = nullptr; @@ -649,7 +651,8 @@ namespace RT_SBEIO errlCommit (errl, SBE_COMP_ID); } - TRACFCOMP(g_trac_sbeio, EXIT_MRK" process_sbe_msg: rc=%d", rc ); + TRACFCOMP(g_trac_sbeio, EXIT_MRK" process_sbe_msg: rc=0x%X", rc ); + TRACFCOMP(g_trac_hbrt, EXIT_MRK" sbe_message_passing: rc=0x%X", rc ); return rc; } diff --git a/src/usr/sbeio/runtime/test/sbeioAttrOverrideTests.H b/src/usr/sbeio/runtime/test/sbeioAttrOverrideTests.H index 903bf08f6..d99acfe8b 100644 --- a/src/usr/sbeio/runtime/test/sbeioAttrOverrideTests.H +++ b/src/usr/sbeio/runtime/test/sbeioAttrOverrideTests.H @@ -45,8 +45,8 @@ extern trace_desc_t* g_trac_sbeio; -#define SBE_PASSTHROUGH_TRACD(printf_string,args...) \ - TRACDCOMP(g_trac_sbeio,"SbePassThroughTests: " printf_string,##args) +#define SBE_PASSTHROUGH_TRACF(printf_string,args...) \ + TRACFCOMP(g_trac_sbeio,"SbePassThroughTests: " printf_string,##args) //======================================= @@ -129,7 +129,7 @@ public: l_allowOverrides = SECUREBOOT::allowAttrOverrides(); #endif - SBE_PASSTHROUGH_TRACD("SBE_MSG_DATA_OFFSET: 0x%08X", + SBE_PASSTHROUGH_TRACF("SBE_MSG_DATA_OFFSET: 0x%08X", SBE_MSG_DATA_OFFSET ); @@ -209,7 +209,7 @@ public: // Step 3 - Get pointer to SBE COMMS AREA //######################################## - SBE_PASSTHROUGH_TRACD("applyAtrrTest. ChipId: 0x%016llX", l_chipId); + SBE_PASSTHROUGH_TRACF("applyAtrrTest. ChipId: 0x%016llX", l_chipId); sbeCommAddr_t l_sbeCommAddr{}; uint64_t address; @@ -237,7 +237,7 @@ public: } l_sbeCommAddr = reinterpret_cast<void*>(address); - SBE_PASSTHROUGH_TRACD("applyAtrrTest, SBE Area Address: " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, SBE Area Address: " "0x%016llX. ", address ); @@ -313,7 +313,7 @@ public: *(reinterpret_cast<SBE_MSG::sbeMessage_t*> (l_sbeCommAddr)) ); - SBE_PASSTHROUGH_TRACD("applyAtrrTest, %s", msgBuffer); + SBE_PASSTHROUGH_TRACF("applyAtrrTest, %s", msgBuffer); } //############################################# @@ -339,7 +339,7 @@ public: *(reinterpret_cast<SBE_MSG::sbeMessage_t*> (l_sbeCommAddr)) ); - SBE_PASSTHROUGH_TRACD("applyAtrrTest, %s", msgBuffer); + SBE_PASSTHROUGH_TRACF("applyAtrrTest, %s", msgBuffer); } //############################################# @@ -366,13 +366,13 @@ public: { char msgBuffer[256] = {0}; printSbeMessage(msgBuffer, "Actual Response", l_response); - SBE_PASSTHROUGH_TRACD("applyAtrrTest, actual response " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, actual response " "differs from expected response."); - SBE_PASSTHROUGH_TRACD("applyAtrrTest, %s", msgBuffer); + SBE_PASSTHROUGH_TRACF("applyAtrrTest, %s", msgBuffer); printSbeMessage(msgBuffer, "Expected Response", l_expectedResponse); - SBE_PASSTHROUGH_TRACD("applyAtrrTest, %s", msgBuffer); + SBE_PASSTHROUGH_TRACF("applyAtrrTest, %s", msgBuffer); TS_FAIL("applyAtrrTest: The actual response differs " "from the expected response."); @@ -429,7 +429,7 @@ public: &scratch_8_1 )) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "getAttribute failed for " "ATTR_SCRATCH_UINT8_1" ); @@ -440,14 +440,14 @@ public: break; } - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT8_1: 0x%02X", scratch_8_1 ); if(scratch_8_1_expected != scratch_8_1) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT8_1 value " "differs from expected! " "Expected 0x%02X, Actual 0x%02X", @@ -479,7 +479,7 @@ public: &scratch_8_2 )) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "getAttribute failed for " "ATTR_SCRATCH_UINT8_2" ); @@ -490,14 +490,14 @@ public: break; } - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT8_2: 0x%02X", scratch_8_2 ); if(scratch_8_2_expected != scratch_8_2) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT8_2 value " "differs from expected! " "Expected 0x%02X, Actual 0x%02X", @@ -529,7 +529,7 @@ public: &scratch_32_1 )) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "getAttribute failed for " "ATTR_SCRATCH_UINT32_1" ); @@ -540,14 +540,14 @@ public: break; } - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT32_1: 0x%08X", scratch_32_1 ); if(scratch_32_1_expected != scratch_32_1) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT32_1 value " "differs from expected! " "Expected 0x%08X, Actual 0x%08X", @@ -579,7 +579,7 @@ public: &scratch_32_2 )) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "getAttribute failed for " "ATTR_SCRATCH_UINT32_2" ); @@ -590,14 +590,14 @@ public: break; } - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT32_2: 0x%08X", scratch_32_2 ); if(scratch_32_2_expected != scratch_32_2) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT32_2 value " "differs from expected! " "Expected 0x%08X, Actual 0x%08X", @@ -628,7 +628,7 @@ public: &scratch_64_1 )) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "getAttribute failed for " "ATTR_SCRATCH_UINT64_1" ); @@ -639,14 +639,14 @@ public: break; } - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT64_1: 0x%016llX", scratch_64_1 ); if(scratch_64_1_expected != scratch_64_1) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT64_1 value " "differs from expected! " "Expected 0x%016llX, Actual 0x%016llX", @@ -677,7 +677,7 @@ public: &scratch_64_2 )) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "getAttribute failed for " "ATTR_SCRATCH_UINT64_2" ); @@ -688,14 +688,14 @@ public: break; } - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT64_2: 0x%016llX", scratch_64_2 ); if(scratch_64_2_expected != scratch_64_2) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT64_2 value " "differs from expected! " "Expected 0x%016llX, Actual 0x%016llX", @@ -724,7 +724,7 @@ public: if(nullptr == l_sys) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "Failed to obtain Sys Target." ); @@ -738,7 +738,7 @@ public: if(not l_sys-> tryGetAttr<TARGETING::ATTR_SCRATCH_UINT8_1>(scratch_8_1)) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "tryGetAttr failed for " "ATTR_SCRATCH_UINT8_1" ); @@ -749,14 +749,14 @@ public: break; } - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT8_1: 0x%02X", scratch_8_1 ); if(scratch_8_1_expected != scratch_8_1) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT8_1 value " "differs from expected! " "Expected 0x%02X, Actual 0x%02X", @@ -781,7 +781,7 @@ public: if(not l_sys-> tryGetAttr<TARGETING::ATTR_SCRATCH_UINT8_2>(scratch_8_2)) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "tryGetAttr failed for " "ATTR_SCRATCH_UINT8_2" ); @@ -792,14 +792,14 @@ public: break; } - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT8_2: 0x%02X", scratch_8_2 ); if(scratch_8_2_expected != scratch_8_2) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT8_2 value " "differs from expected! " "Expected 0x%02X, Actual 0x%02X", @@ -824,7 +824,7 @@ public: if(not l_sys-> tryGetAttr<TARGETING::ATTR_SCRATCH_UINT32_1>(scratch_32_1)) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "tryGetAttr failed for " "ATTR_SCRATCH_UINT32_1" ); @@ -835,14 +835,14 @@ public: break; } - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT32_1: 0x%08X", scratch_32_1 ); if(scratch_32_1_expected != scratch_32_1) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT32_1 value " "differs from expected! " "Expected 0x%08X, Actual 0x%08X", @@ -867,7 +867,7 @@ public: if(not l_sys-> tryGetAttr<TARGETING::ATTR_SCRATCH_UINT32_2>(scratch_32_2)) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "tryGetAttr failed for " "ATTR_SCRATCH_UINT32_2" ); @@ -878,14 +878,14 @@ public: break; } - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT32_2: 0x%08X", scratch_32_2 ); if(scratch_32_2_expected != scratch_32_2) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT32_2 value " "differs from expected! " "Expected 0x%08X, Actual 0x%08X", @@ -910,7 +910,7 @@ public: if(not l_sys-> tryGetAttr<TARGETING::ATTR_SCRATCH_UINT64_1>(scratch_64_1)) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "tryGetAttr failed for " "ATTR_SCRATCH_UINT64_1" ); @@ -921,14 +921,14 @@ public: break; } - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT64_1: 0x%016llX", scratch_64_1 ); if(scratch_64_1_expected != scratch_64_1) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT64_1 value " "differs from expected! " "Expected 0x%016llX, Actual 0x%016llX", @@ -953,7 +953,7 @@ public: if(not l_sys-> tryGetAttr<TARGETING::ATTR_SCRATCH_UINT64_2>(scratch_64_2)) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "tryGetAttr failed for " "ATTR_SCRATCH_UINT64_2" ); @@ -964,14 +964,14 @@ public: break; } - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT64_2: 0x%016llX", scratch_64_2 ); if(scratch_64_2_expected != scratch_64_2) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest, " + SBE_PASSTHROUGH_TRACF("applyAtrrTest, " "ATTR_SCRATCH_UINT64_2 value " "differs from expected! " "Expected 0x%016llX, Actual 0x%016llX", @@ -1005,11 +1005,11 @@ public: if(result) { - SBE_PASSTHROUGH_TRACD("applyAtrrTest passed!"); + SBE_PASSTHROUGH_TRACF("applyAtrrTest passed!"); } else { - SBE_PASSTHROUGH_TRACD("applyAtrrTest failed!"); + SBE_PASSTHROUGH_TRACF("applyAtrrTest failed!"); } } @@ -1026,7 +1026,7 @@ private: { if(not i_proc) { - SBE_PASSTHROUGH_TRACD("ensureClearToSend, " + SBE_PASSTHROUGH_TRACF("ensureClearToSend, " "i_proc is NULL!" ); @@ -1051,7 +1051,7 @@ private: delete errl; errl = nullptr; - SBE_PASSTHROUGH_TRACD("ensureClearToSend, " + SBE_PASSTHROUGH_TRACF("ensureClearToSend, " "Failed to read scom register." ); TS_FAIL("Failed to read scom register."); @@ -1082,7 +1082,7 @@ private: { if(not i_proc) { - SBE_PASSTHROUGH_TRACD("ensureClearToSend, " + SBE_PASSTHROUGH_TRACF("ensureClearToSend, " "i_proc is NULL!" ); @@ -1107,7 +1107,7 @@ private: delete errl; errl = nullptr; - SBE_PASSTHROUGH_TRACD("ensureClearToSend, " + SBE_PASSTHROUGH_TRACF("ensureClearToSend, " "Failed to read scom register." ); TS_FAIL("Failed to read scom register."); @@ -1129,7 +1129,7 @@ private: delete errl; errl = nullptr; - SBE_PASSTHROUGH_TRACD("ensureClearToSend, " + SBE_PASSTHROUGH_TRACF("ensureClearToSend, " "Failed to write to scom register." ); TS_FAIL("Failed to read scom register."); @@ -1242,13 +1242,13 @@ private: return; } - SBE_PASSTHROUGH_TRACD("%s", prefix); + SBE_PASSTHROUGH_TRACF("%s", prefix); //ATTR_SCRATCH_UINT8_1 //=================================================== if(l_sys->tryGetAttr<TARGETING::ATTR_SCRATCH_UINT8_1>(scratch_8_1)) { - SBE_PASSTHROUGH_TRACD( + SBE_PASSTHROUGH_TRACF( "\t\tATTR_SCRATCH_UINT8_1: 0x%02X", scratch_8_1 ); @@ -1258,7 +1258,7 @@ private: //=================================================== if(l_sys->tryGetAttr<TARGETING::ATTR_SCRATCH_UINT8_2>(scratch_8_2)) { - SBE_PASSTHROUGH_TRACD( + SBE_PASSTHROUGH_TRACF( "\t\tATTR_SCRATCH_UINT8_2: 0x%02X", scratch_8_2 ); @@ -1268,7 +1268,7 @@ private: //=================================================== if(l_sys->tryGetAttr<TARGETING::ATTR_SCRATCH_UINT32_1>(scratch_32_1)) { - SBE_PASSTHROUGH_TRACD( + SBE_PASSTHROUGH_TRACF( "\t\tATTR_SCRATCH_UINT32_1: 0x%08X", scratch_32_1 ); @@ -1278,7 +1278,7 @@ private: //=================================================== if(l_sys->tryGetAttr<TARGETING::ATTR_SCRATCH_UINT32_2>(scratch_32_2)) { - SBE_PASSTHROUGH_TRACD( + SBE_PASSTHROUGH_TRACF( "\t\tATTR_SCRATCH_UINT32_2: 0x%08X", scratch_32_2 ); @@ -1288,7 +1288,7 @@ private: //=================================================== if(l_sys->tryGetAttr<TARGETING::ATTR_SCRATCH_UINT64_1>(scratch_64_1)) { - SBE_PASSTHROUGH_TRACD( + SBE_PASSTHROUGH_TRACF( "\t\tATTR_SCRATCH_UINT64_1: 0x%016llX", scratch_64_1 ); @@ -1298,7 +1298,7 @@ private: //=================================================== if(l_sys->tryGetAttr<TARGETING::ATTR_SCRATCH_UINT64_2>(scratch_64_2)) { - SBE_PASSTHROUGH_TRACD( + SBE_PASSTHROUGH_TRACF( "\t\tATTR_SCRATCH_UINT64_2: 0x%016llX", scratch_64_2 ); diff --git a/src/usr/secureboot/runtime/rt_secureboot.C b/src/usr/secureboot/runtime/rt_secureboot.C index 0c24c3875..7c297be9e 100644 --- a/src/usr/secureboot/runtime/rt_secureboot.C +++ b/src/usr/secureboot/runtime/rt_secureboot.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ +/* Contributors Listed Below - COPYRIGHT 2016,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -41,6 +41,8 @@ #include <targeting/common/targetservice.H> #include <devicefw/userif.H> +extern trace_desc_t* g_trac_hbrt; + namespace SECUREBOOT { using namespace TARGETING; @@ -122,6 +124,7 @@ int verify_container( { int rc = 0; + TRACFCOMP(g_trac_hbrt, ENTER_MRK" verify_container" ); SB_ENTER( "verify_container: " "container ptr = %p, " @@ -134,6 +137,7 @@ int verify_container( SB_EXIT( "verify_container: rc = %d",rc); + TRACFCOMP(g_trac_hbrt, EXIT_MRK" verify_container: rc=0x%X", rc ); return rc; } diff --git a/src/usr/targeting/runtime/attrPlatOverride_rt.C b/src/usr/targeting/runtime/attrPlatOverride_rt.C index a803b5323..b379313d9 100644 --- a/src/usr/targeting/runtime/attrPlatOverride_rt.C +++ b/src/usr/targeting/runtime/attrPlatOverride_rt.C @@ -39,6 +39,7 @@ #include <sys/internode.h> +extern trace_desc_t* g_trac_hbrt; using namespace TARGETING; namespace RT_TARG @@ -50,6 +51,7 @@ int apply_attr_override(uint8_t* i_data, int rc = 0; errlHndl_t l_errl = NULL; + TRACFCOMP(g_trac_hbrt, ENTER_MRK" apply_attr_override"); TRACFCOMP(g_trac_targeting, "enter apply_attr_override"); bool l_allowOverrides = true; @@ -122,6 +124,7 @@ int apply_attr_override(uint8_t* i_data, #endif } + TRACFCOMP(g_trac_hbrt, EXIT_MRK" apply_attr_override: rc=%d"); return rc; } diff --git a/src/usr/targeting/runtime/rt_targeting.C b/src/usr/targeting/runtime/rt_targeting.C index 06342633e..35d154f2d 100644 --- a/src/usr/targeting/runtime/rt_targeting.C +++ b/src/usr/targeting/runtime/rt_targeting.C @@ -48,6 +48,7 @@ #include <sys/internode.h> +extern trace_desc_t* g_trac_hbrt; using namespace TARGETING; namespace RT_TARG @@ -711,6 +712,8 @@ errlHndl_t saveRestoreAttrs(void *i_rsvdMemPtr, int hbrt_update_prep(void) { + TRACFCOMP(g_trac_hbrt, ENTER_MRK" prepare_hbrt_update"); + TRACFCOMP(g_trac_targeting, ENTER_MRK" hbrt_update_prep"); errlHndl_t pError = nullptr; UtilLidMgr l_lidMgr(Util::TARGETING_BINARY_LIDID); void *l_lidStructPtr = nullptr; @@ -872,6 +875,8 @@ int hbrt_update_prep(void) errlCommit(pError,TARG_COMP_ID); } + TRACFCOMP(g_trac_targeting, EXIT_MRK" hbrt_update_prep"); + TRACFCOMP(g_trac_hbrt, EXIT_MRK" prepare_hbrt_update: rc=%.X", rc); return rc; } diff --git a/src/usr/util/runtime/rt_fwnotify.C b/src/usr/util/runtime/rt_fwnotify.C index 5515563b6..600a99fc6 100644 --- a/src/usr/util/runtime/rt_fwnotify.C +++ b/src/usr/util/runtime/rt_fwnotify.C @@ -41,6 +41,7 @@ using namespace SBEIO; // Trace definition extern trace_desc_t* g_trac_runtime; +extern trace_desc_t* g_trac_hbrt; /** * @brief The lower and upper bounds for the sequence ID. @@ -308,12 +309,12 @@ void attrSyncRequest( void * i_data) */ void firmware_notify( uint64_t i_len, void *i_data ) { - TRACFCOMP(g_trac_runtime, ENTER_MRK"firmware_notify: " + TRACFCOMP(g_trac_hbrt, ENTER_MRK"firmware_notify: " "i_len:%d", i_len ); TRACFBIN(g_trac_runtime, "firmware_notify: i_data", i_data, i_len); - errlHndl_t l_err = nullptr; + errlHndl_t l_err = nullptr; // Flag to detect an invlaid/unknown/not used message bool l_badMessage = false; @@ -437,7 +438,7 @@ void firmware_notify( uint64_t i_len, void *i_data ) errlCommit(l_err, RUNTIME_COMP_ID); } - TRACFCOMP(g_trac_runtime, EXIT_MRK"firmware_notify"); + TRACFCOMP(g_trac_hbrt, EXIT_MRK"firmware_notify"); }; struct registerFwNotify diff --git a/src/usr/util/runtime/util_rt.C b/src/usr/util/runtime/util_rt.C index 468db6ee7..e4489bd16 100644 --- a/src/usr/util/runtime/util_rt.C +++ b/src/usr/util/runtime/util_rt.C @@ -28,6 +28,12 @@ #include <util/utilrsvdmem.H> #include <util/runtime/util_rt.H> +// Create a buffer for high-level HBRT enter/exit traces +// Should only be used to bound the external calls into us +trace_desc_t* g_trac_hbrt = NULL; +TRAC_INIT(&g_trac_hbrt, "HBRT", 2*KILOBYTE); + + /** * @brief Get the address of a reserved hostboot memory region by its label * @param[in] i_label HBRT_MEM_LABEL_ constant diff --git a/src/usr/util/runtime/utillidmgr_rt.C b/src/usr/util/runtime/utillidmgr_rt.C index cacad8d70..8efbb7ffc 100644 --- a/src/usr/util/runtime/utillidmgr_rt.C +++ b/src/usr/util/runtime/utillidmgr_rt.C @@ -37,6 +37,8 @@ #include <util/utillidpnor.H> #include <pnor/pnor_reasoncodes.H> +extern trace_desc_t* g_trac_hbrt; + UtilLidMgr::UtilLidMgr(uint32_t i_lidId) : iv_isLidInPnor(false), iv_lidBuffer(nullptr), iv_lidSize(0), iv_isLidInVFS(false), iv_isLidInHbResvMem(false) @@ -341,20 +343,22 @@ errlHndl_t UtilLidMgr::updateLid(uint32_t i_lidId) const uint32_t * UtilLidMgr::getLidList(size_t * o_num) { - static uint32_t lidlist[] = - { - Util::OCC_LIDID, - Util::OCC_CONTAINER_LIDID, - Util::WOF_LIDID, - Util::WOF_CONTAINER_LIDID, - Util::NIMBUS_HCODE_LIDID, - Util::CUMULUS_HCODE_LIDID, - Util::HCODE_CONTAINER_LIDID, - Util::HWREFIMG_RINGOVD_LIDID, - Util::TARGETING_BINARY_LIDID - }; - *o_num = sizeof(lidlist)/sizeof(lidlist[0]); - return lidlist; + TRACFCOMP(g_trac_hbrt, ENTER_MRK" get_lid_list"); + static uint32_t lidlist[] = + { + Util::OCC_LIDID, + Util::OCC_CONTAINER_LIDID, + Util::WOF_LIDID, + Util::WOF_CONTAINER_LIDID, + Util::NIMBUS_HCODE_LIDID, + Util::CUMULUS_HCODE_LIDID, + Util::HCODE_CONTAINER_LIDID, + Util::HWREFIMG_RINGOVD_LIDID, + Util::TARGETING_BINARY_LIDID + }; + *o_num = sizeof(lidlist)/sizeof(lidlist[0]); + TRACFCOMP(g_trac_hbrt, EXIT_MRK" get_lid_list"); + return lidlist; } bool UtilLidMgr::lidInHbResvMem(const uint32_t i_lidId) const |
