From 429bb8ba92f196c3f20d1783d60ddadad6c6ec52 Mon Sep 17 00:00:00 2001 From: Raja Das Date: Wed, 7 Sep 2016 23:57:36 -0500 Subject: Sbefw related Hash Collision fixed - Temp fix Change-Id: I6d269c015344638ae09e788cd40e31cab0113ba5 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29361 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Shakeeb A. Pasha B K Reviewed-by: Sachin Gupta --- src/sbefw/sbecmdmemaccess.C | 5 +++-- src/sbefw/sbemain.C | 3 ++- src/sbefw/sbescom.C | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src/sbefw') diff --git a/src/sbefw/sbecmdmemaccess.C b/src/sbefw/sbecmdmemaccess.C index 80bbe9a3..cff8e594 100644 --- a/src/sbefw/sbecmdmemaccess.C +++ b/src/sbefw/sbecmdmemaccess.C @@ -6,6 +6,7 @@ /* OpenPOWER sbe Project */ /* */ /* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* [+] International Business Machines Corp. */ /* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ @@ -245,7 +246,7 @@ uint32_t constructAduFlag(const sbeMemAccessReqMsgHdr_t & i_hdr, (SBE_ADU_LOCK_TRIES << ADU_LOCK_TRIES_SHIFT) ); // 4-bit Lock Tries at 19-18-17-16 bits - SBE_INFO(SBE_FUNC "Cache[%d] Itag[%d] AutoIncr[%d] FastMode[%d] ", + SBE_INFO(SBE_FUNC " Cache[%d] Itag[%d] AutoIncr[%d] FastMode[%d].", l_isCacheInhibitMode,l_isItagBit,l_isAutoIncr,l_isFastMode); SBE_INFO(SBE_FUNC "EccRequiredMode[%d] EccOverrideMode[%d] EccOverrideByte" "[0x%02X] AduSetupFlag[0x%04X]",l_isEccRequiredMode,l_isEccOverrideMode, @@ -383,7 +384,7 @@ uint32_t processPbaRequest(const sbeMemAccessReqMsgHdr_t &i_hdr, // if p9_pba_access returns error if( l_fapiRc != FAPI2_RC_SUCCESS ) { - SBE_ERROR(SBE_FUNC" p9_pba_access Failed"); + SBE_ERROR(SBE_FUNC" p9_pba_access Failed."); // Respond with HWP FFDC l_respHdr.setStatus( SBE_PRI_GENERIC_EXECUTION_FAILURE, SBE_SEC_GENERIC_FAILURE_IN_EXECUTION ); diff --git a/src/sbefw/sbemain.C b/src/sbefw/sbemain.C index 06488c14..6ca8d351 100644 --- a/src/sbefw/sbemain.C +++ b/src/sbefw/sbemain.C @@ -6,6 +6,7 @@ /* OpenPOWER sbe Project */ /* */ /* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* [+] International Business Machines Corp. */ /* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ @@ -332,7 +333,7 @@ uint32_t main(int argc, char **argv) if(SbeRegAccess::theSbeRegAccess().init()) { - SBE_ERROR(SBE_FUNC"Failed to initialize SbeRegAccess"); + SBE_ERROR(SBE_FUNC"Failed to initialize SbeRegAccess."); // init failure could mean the below will fail too, but attempt it // anyway (void)SbeRegAccess::theSbeRegAccess().stateTransition( diff --git a/src/sbefw/sbescom.C b/src/sbefw/sbescom.C index 9a2fc38c..5d397902 100644 --- a/src/sbefw/sbescom.C +++ b/src/sbefw/sbescom.C @@ -6,6 +6,7 @@ /* OpenPOWER sbe Project */ /* */ /* Contributors Listed Below - COPYRIGHT 2016 */ +/* [+] International Business Machines Corp. */ /* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ @@ -78,7 +79,7 @@ uint32_t checkIndirectAndDoScom( const bool i_isRead, // If the indirect scom bit is 0, then doing a regular scom if( (i_addr & DIRECT_SCOM_ADDR_MASK) == 0) { - SBE_INFO(SBE_FUNC "Performing Direct scom"); + SBE_INFO(SBE_FUNC "Performing Direct scom."); if( i_isRead ) { o_pcbPibStatus = getscom_abs ( (uint32_t)i_addr, @@ -183,7 +184,7 @@ uint32_t checkIndirectAndDoScom( const bool i_isRead, if( o_pcbPibStatus ) break; if( ! scomout.done) { - SBE_ERROR(SBE_FUNC "Indirect scom timeout"); + SBE_ERROR(SBE_FUNC "Indirect scom timeout."); l_rc = SBE_SEC_HW_OP_TIMEOUT; break; } -- cgit v1.2.1