diff options
Diffstat (limited to 'src/usr')
52 files changed, 771 insertions, 759 deletions
diff --git a/src/usr/diag/prdf/common/framework/config/iipSystem.C b/src/usr/diag/prdf/common/framework/config/iipSystem.C index ede292f56..2e88ced6b 100755 --- a/src/usr/diag/prdf/common/framework/config/iipSystem.C +++ b/src/usr/diag/prdf/common/framework/config/iipSystem.C @@ -324,7 +324,7 @@ int32_t System::Analyze(STEP_CODE_DATA_STRUCT & serviceData, if(rc == PRD_POWER_FAULT) { - PRDF_ERR( PRDF_FUNC"Power Fault detected!" ); + PRDF_ERR( PRDF_FUNC "Power Fault detected!" ); break; } } @@ -341,7 +341,7 @@ int32_t System::Analyze(STEP_CODE_DATA_STRUCT & serviceData, // anything for error isolation pass. if ( NULL != l_temp_sdc ) { - PRDF_ERR( PRDF_FUNC"l_temp_sdc is not NULL" ); + PRDF_ERR( PRDF_FUNC "l_temp_sdc is not NULL" ); continue; } diff --git a/src/usr/diag/prdf/common/framework/config/prdfPciOscSwitchDomain.C b/src/usr/diag/prdf/common/framework/config/prdfPciOscSwitchDomain.C index aaa5b0823..cdce54a4b 100644 --- a/src/usr/diag/prdf/common/framework/config/prdfPciOscSwitchDomain.C +++ b/src/usr/diag/prdf/common/framework/config/prdfPciOscSwitchDomain.C @@ -93,13 +93,13 @@ bool PciOscSwitchDomain::Query(ATTENTION_TYPE attentionType) if( PRD_POWER_FAULT == rc ) { - PRDF_ERR( PRDF_FUNC"Power Fault detected!" ); + PRDF_ERR( PRDF_FUNC "Power Fault detected!" ); break; } if( SUCCESS != rc ) { - PRDF_ERR( PRDF_FUNC"SCOM fail. RC=%x", rc ); + PRDF_ERR( PRDF_FUNC "SCOM fail. RC=%x", rc ); } } } @@ -134,7 +134,7 @@ int32_t PciOscSwitchDomain::Analyze( STEP_CODE_DATA_STRUCT & i_sc, if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Query failed HUID: 0x%08x", l_chip->GetId() ); + PRDF_ERR( PRDF_FUNC "Query failed HUID: 0x%08x", l_chip->GetId() ); break; } @@ -149,7 +149,7 @@ int32_t PciOscSwitchDomain::Analyze( STEP_CODE_DATA_STRUCT & i_sc, if( SUCCESS != o_rc ) { - PRDF_ERR(PRDF_FUNC" PCI CLK Switch over analysis failed" ); + PRDF_ERR(PRDF_FUNC " PCI CLK Switch over analysis failed" ); break; } @@ -193,7 +193,7 @@ int32_t PciOscSwitchDomain::analyzePciOscSwitch( if( NULL == nodeTgt ) { - PRDF_ERR( PRDF_FUNC"unable to get node HUID: 0x%08x ", + PRDF_ERR( PRDF_FUNC "unable to get node HUID: 0x%08x ", i_chip->GetId() ); o_rc = FAIL; break; @@ -208,7 +208,7 @@ int32_t PciOscSwitchDomain::analyzePciOscSwitch( if( NULL == l_procChip ) { - PRDF_ERR( PRDF_FUNC" could not find chip 0x%08x", + PRDF_ERR( PRDF_FUNC " could not find chip 0x%08x", getHuid(*it) ); continue; } @@ -234,7 +234,7 @@ int32_t PciOscSwitchDomain::analyzePciOscSwitch( ( o_pciOscSwitchData )); if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"analysis failed HUID: 0x%08x", + PRDF_ERR( PRDF_FUNC "analysis failed HUID: 0x%08x", l_procChip->GetId() ); break; } @@ -249,7 +249,7 @@ int32_t PciOscSwitchDomain::analyzePciOscSwitch( if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC" Failed to clear PCI Osc error" ); + PRDF_ERR( PRDF_FUNC " Failed to clear PCI Osc error" ); break; } @@ -304,7 +304,7 @@ void PciOscSwitchDomain::addHwCalloutAndSignature( STEP_CODE_DATA_STRUCT & i_sc, if( 0 == listSize ) { - PRDF_ERR( PRDF_FUNC"PCI Osc Switch Over: Analysis failed"); + PRDF_ERR( PRDF_FUNC "PCI Osc Switch Over: Analysis failed"); i_sc.service_data->SetCallout( NextLevelSupport_ENUM, MRU_MED, NO_GARD ); signature = PRDFSIG_PCI_OSC_ANL_FAILED; @@ -329,7 +329,7 @@ void PciOscSwitchDomain::addHwCalloutAndSignature( STEP_CODE_DATA_STRUCT & i_sc, if( checkMultiOscFailure( i_pciOscSwitchData ) ) { - PRDF_ERR( PRDF_FUNC"Multiple pci Osc failures detected"); + PRDF_ERR( PRDF_FUNC "Multiple pci Osc failures detected"); signature = PRDFSIG_PCI_MULTIPLE_OSC_FO; i_sc.service_data->SetCallout( NextLevelSupport_ENUM, MRU_MED, NO_GARD ); @@ -383,7 +383,7 @@ int32_t PciOscSwitchDomain::clearPciSwitchError( if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC" Failed to clear PCI clk error bits" + PRDF_ERR( PRDF_FUNC " Failed to clear PCI clk error bits" "HUID: 0x%08x", it->pciParentProc->GetId() ); break; } diff --git a/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C b/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C index 6c4ac5c2b..6a3e08c37 100755 --- a/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C +++ b/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C @@ -190,7 +190,7 @@ int32_t PllDomain::Analyze(STEP_CODE_DATA_STRUCT & serviceData, } else { - PRDF_ERR(PRDF_FUNC"getOscPos returned error for chip: " + PRDF_ERR(PRDF_FUNC "getOscPos returned error for chip: " "0x%08x", l_chip->GetId()); } } @@ -261,7 +261,7 @@ int32_t PllDomain::Analyze(STEP_CODE_DATA_STRUCT & serviceData, if (( false == oscSource[0] ) && ( false == oscSource[1] )) { - PRDF_ERR(PRDF_FUNC"can't threshold IO domain due to no available " + PRDF_ERR(PRDF_FUNC "can't threshold IO domain due to no available " "pcie osc source - count:%d, chip 0x%08x", count, chip()[0]->GetId()); } @@ -303,7 +303,7 @@ int32_t PllDomain::Analyze(STEP_CODE_DATA_STRUCT & serviceData, if (( false == oscSource[0] ) && ( false == oscSource[1] )) { - PRDF_ERR(PRDF_FUNC"can't mask pcie pll error due to no " + PRDF_ERR(PRDF_FUNC "can't mask pcie pll error due to no " "available pcie osc source - count:%d, chip 0x%08x", count, chip()[0]->GetId()); } diff --git a/src/usr/diag/prdf/common/framework/register/prdfScomRegister.C b/src/usr/diag/prdf/common/framework/register/prdfScomRegister.C index 3e549ac97..ae1f7d386 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfScomRegister.C +++ b/src/usr/diag/prdf/common/framework/register/prdfScomRegister.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 1996,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* [+] 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. */ @@ -147,7 +149,7 @@ uint32_t ScomRegister::ForceRead() const if ( ( ACCESS_NONE == iv_operationType ) && ( ACCESS_WO == iv_operationType ) ) { - PRDF_ERR( PRDF_FUNC"Write-only register: 0x%08x 0x%016llx", + PRDF_ERR( PRDF_FUNC "Write-only register: 0x%08x 0x%016llx", getChip()->GetId(), iv_scomAddress ); break; } @@ -183,7 +185,7 @@ uint32_t ScomRegister::Write() if ( ( ACCESS_NONE == iv_operationType ) && ( ACCESS_RO == iv_operationType ) ) { - PRDF_ERR( PRDF_FUNC"Read-only register: 0x%08x 0x%016llx", + PRDF_ERR( PRDF_FUNC "Read-only register: 0x%08x 0x%016llx", getChip()->GetId(), iv_scomAddress ); break; } @@ -193,7 +195,7 @@ uint32_t ScomRegister::Write() { // Something bad happened and there was nothing in the cache to // write to hardware. - PRDF_ERR( PRDF_FUNC"No entry found in cache: 0x%08x 0x%016llx", + PRDF_ERR( PRDF_FUNC "No entry found in cache: 0x%08x 0x%016llx", getChip()->GetId(), iv_scomAddress ); break; } diff --git a/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C b/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C index d3e1a507e..43bbc4e73 100644 --- a/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C +++ b/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C @@ -1086,7 +1086,7 @@ ExtensibleChipFunction *RuleMetaData::getExtensibleFunction( // stage during system Initialize and this scenario should fail // basic validation. // So aborting system at this point. - PRDF_ERR( PRDF_FUNC"NULL Function for plugin:%s chip %s", + PRDF_ERR( PRDF_FUNC "NULL Function for plugin:%s chip %s", i_func, cv_fileName ); PRDF_ASSERT( NULL != plugin ); 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 a3d5feec1..9bb365c92 100755 --- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C +++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C @@ -273,7 +273,7 @@ int32_t erepairFirIsolation(TargetHandle_t i_rxBusTgt) if(NULL != err) { - PRDF_ERR( PRDF_FUNC"rxHUID: 0x%08x committing io_fir_isolation log", + PRDF_ERR( PRDF_FUNC "rxHUID: 0x%08x committing io_fir_isolation log", getHuid(i_rxBusTgt)); PRDF_COMMIT_ERRL( err, ERRL_ACTION_REPORT ); } @@ -303,14 +303,14 @@ int32_t getMemAddrRange( TargetHandle_t i_mba, uint8_t i_mrank, // Check parameters. if ( TYPE_MBA != getTargetType(i_mba) ) { - PRDF_ERR( PRDF_FUNC"The given target is not TYPE_MBA" ); + PRDF_ERR( PRDF_FUNC "The given target is not TYPE_MBA" ); o_rc = FAIL; break; } if ( (MSS_ALL_RANKS != i_mrank && MASTER_RANKS_PER_MBA <= i_mrank) || (SLAVE_RANKS_PER_MASTER_RANK <= i_srank) ) { - PRDF_ERR( PRDF_FUNC"The given rank is not valid" ); + PRDF_ERR( PRDF_FUNC "The given rank is not valid" ); o_rc = FAIL; break; } @@ -333,7 +333,7 @@ int32_t getMemAddrRange( TargetHandle_t i_mba, uint8_t i_mrank, if ( NULL != errl ) { - PRDF_ERR( PRDF_FUNC"mss_get_address_range() failed" ); + PRDF_ERR( PRDF_FUNC "mss_get_address_range() failed" ); PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT ); o_rc = FAIL; break; } @@ -342,7 +342,7 @@ int32_t getMemAddrRange( TargetHandle_t i_mba, uint8_t i_mrank, if ( 64 != o_startAddr.getBitLength() || 64 != o_endAddr.getBitLength() ) { - PRDF_ERR( PRDF_FUNC"Addresses returned from " + PRDF_ERR( PRDF_FUNC "Addresses returned from " "mss_get_address_range() are not 64-bit" ); o_rc = FAIL; break; } @@ -351,7 +351,7 @@ int32_t getMemAddrRange( TargetHandle_t i_mba, uint8_t i_mrank, if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_mba=0x%08x i_mrank=%d i_srank=%d " + PRDF_ERR( PRDF_FUNC "Failed: i_mba=0x%08x i_mrank=%d i_srank=%d " "i_slaveOnly=%s", getHuid(i_mba), i_mrank, i_srank, i_slaveOnly ? "true" : "false" ); } @@ -388,7 +388,7 @@ int32_t getBadDqBitmap( TargetHandle_t i_mba, const CenRank & i_rank, errlHndl_t errl = fapi::fapiRcToErrl(l_rc); if ( NULL != errl ) { - PRDF_ERR( PRDF_FUNC"dimmGetBadDqBitmap() failed: MBA=0x%08x " + PRDF_ERR( PRDF_FUNC "dimmGetBadDqBitmap() failed: MBA=0x%08x " "ps=%d ds=%d rs=%d", getHuid(i_mba), ps, i_rank.getDimmSlct(), i_rank.getRankSlct() ); PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT ); @@ -429,7 +429,7 @@ int32_t setBadDqBitmap( TargetHandle_t i_mba, const CenRank & i_rank, data[ps] ); if ( NULL != errl ) { - PRDF_ERR( PRDF_FUNC"dimmSetBadDqBitmap() failed: MBA=0x%08x " + PRDF_ERR( PRDF_FUNC "dimmSetBadDqBitmap() failed: MBA=0x%08x " "ps=%d ds=%d rs=%d", getHuid(i_mba), ps, i_rank.getDimmSlct(), i_rank.getRankSlct() ); PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT ); @@ -461,7 +461,7 @@ int32_t mssGetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank, if ( NULL != errl ) { - PRDF_ERR( PRDF_FUNC"mss_get_mark_store() failed. HUID: 0x%08x " + PRDF_ERR( PRDF_FUNC "mss_get_mark_store() failed. HUID: 0x%08x " "rank: %d", getHuid(i_mba), i_rank.getMaster() ); PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT ); o_rc = FAIL; break; @@ -475,7 +475,7 @@ int32_t mssGetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank, o_rc = mssGetSteerMux( i_mba, i_rank, sp0, sp1, ecc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetSteerMux() failed. HUID: 0x%08x " + PRDF_ERR( PRDF_FUNC "mssGetSteerMux() failed. HUID: 0x%08x " "rank: %d", getHuid(i_mba), i_rank.getMaster() ); break; } @@ -537,7 +537,7 @@ int32_t mssSetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank, o_rc = mssGetMarkStore( i_mba, i_rank, hwMark ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetMarkStore() failed." ); + PRDF_ERR( PRDF_FUNC "mssGetMarkStore() failed." ); } else { @@ -550,7 +550,7 @@ int32_t mssSetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank, errl = fapi::fapiRcToErrl(l_rc); if ( NULL != errl ) { - PRDF_ERR( PRDF_FUNC"mss_put_mark_store() failed. HUID: 0x%08x " + PRDF_ERR( PRDF_FUNC "mss_put_mark_store() failed. HUID: 0x%08x " "rank: %d sm: %d cm: %d", getHuid(i_mba), i_rank.getMaster(), sm, cm ); PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT ); @@ -636,7 +636,7 @@ int32_t getMemAddrRange( TargetHandle_t i_mba, CenAddr & o_startAddr, int32_t o_rc = getMemAddrRange( i_mba, MSS_ALL_RANKS, startAddr, endAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_mba=0x%08x", getHuid(i_mba) ); + PRDF_ERR( PRDF_FUNC "Failed: i_mba=0x%08x", getHuid(i_mba) ); } else { @@ -663,7 +663,7 @@ int32_t getMemAddrRange( TargetHandle_t i_mba, const CenRank & i_rank, i_rank.getSlave(), i_slaveOnly ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_mba=0x%08x i_rank=M%dS%d i_slaveOnly=%s", + PRDF_ERR( PRDF_FUNC "Failed: i_mba=0x%08x i_rank=M%dS%d i_slaveOnly=%s", getHuid(i_mba), i_rank.getMaster(), i_rank.getSlave(), i_slaveOnly ? "true" : "false" ); } @@ -694,13 +694,13 @@ int32_t getDimmSpareConfig( TargetHandle_t i_mba, CenRank i_rank, { if( TYPE_MBA != getTargetType( i_mba ) ) { - PRDF_ERR( PRDF_FUNC"Invalid Target:0x%08X", getHuid( i_mba ) ); + PRDF_ERR( PRDF_FUNC "Invalid Target:0x%08X", getHuid( i_mba ) ); o_rc = FAIL; break; } if ( MAX_PORT_PER_MBA <= i_ps ) { - PRDF_ERR( PRDF_FUNC"Invalid parameters i_ps:%u", i_ps ); + PRDF_ERR( PRDF_FUNC "Invalid parameters i_ps:%u", i_ps ); o_rc = FAIL; break; } @@ -709,7 +709,7 @@ int32_t getDimmSpareConfig( TargetHandle_t i_mba, CenRank i_rank, errlHndl_t errl = fapi::fapiRcToErrl(l_rc); if ( NULL != errl ) { - PRDF_ERR( PRDF_FUNC"Failed to get ATTR_VPD_DIMM_SPARE for Target:" + PRDF_ERR( PRDF_FUNC "Failed to get ATTR_VPD_DIMM_SPARE for Target:" "0x%08X", getHuid( i_mba ) ); PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT ); o_rc = FAIL; break; @@ -728,7 +728,7 @@ int32_t getDimmSpareConfig( TargetHandle_t i_mba, CenRank i_rank, if ( ( isX4Dram && isFullByte ) || ( !isX4Dram && !isFullByte ) ) { - PRDF_ERR( PRDF_FUNC"Invalid Configuration: o_spareConfig:%u", + PRDF_ERR( PRDF_FUNC "Invalid Configuration: o_spareConfig:%u", o_spareConfig ); o_rc = FAIL; break; } @@ -754,7 +754,7 @@ int32_t getMemBufRawCardType( TargetHandle_t i_mba, { if ( TYPE_MBA != getTargetType(i_mba) ) { - PRDF_ERR( PRDF_FUNC"Target 0x%08x is not an MBA", getHuid(i_mba) ); + PRDF_ERR( PRDF_FUNC "Target 0x%08x is not an MBA", getHuid(i_mba) ); o_rc = FAIL; break; } @@ -762,14 +762,14 @@ int32_t getMemBufRawCardType( TargetHandle_t i_mba, o_rc = isMembufOnDimm( i_mba, isCenDimm ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"isMembufOnDimm() failed on MBA 0x%08x", + PRDF_ERR( PRDF_FUNC "isMembufOnDimm() failed on MBA 0x%08x", getHuid(i_mba) ); break; } if ( !isCenDimm ) { - PRDF_ERR( PRDF_FUNC"MBA 0x%08x is not on a buffered DIMM", + PRDF_ERR( PRDF_FUNC "MBA 0x%08x is not on a buffered DIMM", getHuid(i_mba) ); o_rc = FAIL; break; } @@ -777,7 +777,7 @@ int32_t getMemBufRawCardType( TargetHandle_t i_mba, TargetHandleList l_dimmList = getConnected( i_mba, TYPE_DIMM ); if ( 0 == l_dimmList.size() ) { - PRDF_ERR( PRDF_FUNC"No DIMMs connected to MBA 0x%08x", + PRDF_ERR( PRDF_FUNC "No DIMMs connected to MBA 0x%08x", getHuid(i_mba) ); o_rc = FAIL; break; } @@ -796,7 +796,7 @@ int32_t getMemBufRawCardType( TargetHandle_t i_mba, if ( NULL != errl ) { - PRDF_ERR( PRDF_FUNC"fapiPlatGetSpdModspecComRefRawCard() failed on" + PRDF_ERR( PRDF_FUNC "fapiPlatGetSpdModspecComRefRawCard() failed on" "DIMM 0x%08X", getHuid(l_dimmList[0]) ); PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT ); o_rc = FAIL; break; @@ -867,7 +867,7 @@ int32_t mss_MaintCmdWrapper::setupAndExecuteCmd() if ( NULL != errl ) { PRDF_GET_REASONCODE( errl, o_rc ); - PRDF_ERR( PRDF_FUNC"setupAndExecuteCmd() failed: rc=0x%x", o_rc ); + PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() failed: rc=0x%x", o_rc ); PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT ); o_rc = FAIL; } @@ -890,7 +890,7 @@ int32_t mss_MaintCmdWrapper::stopCmd() if ( NULL != errl ) { PRDF_GET_REASONCODE( errl, o_rc ); - PRDF_ERR( PRDF_FUNC"stopCmd() failed: rc=0x%x", o_rc ); + PRDF_ERR( PRDF_FUNC "stopCmd() failed: rc=0x%x", o_rc ); PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT ); o_rc = FAIL; } @@ -913,7 +913,7 @@ int32_t mss_MaintCmdWrapper::cleanupCmd() if ( NULL != errl ) { PRDF_GET_REASONCODE( errl, o_rc ); - PRDF_ERR( PRDF_FUNC"cleanupCmd() failed: rc=0x%x", o_rc ); + PRDF_ERR( PRDF_FUNC "cleanupCmd() failed: rc=0x%x", o_rc ); PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT ); o_rc = FAIL; } @@ -957,7 +957,7 @@ mss_MaintCmdWrapper * createMssCmd( mss_MaintCmdWrapper::CmdType i_cmdType, i_endAddr, i_stopCond, false ); break; default: - PRDF_ERR( PRDF_FUNC"Unsupported command type: 0x%x", i_cmdType ); + PRDF_ERR( PRDF_FUNC "Unsupported command type: 0x%x", i_cmdType ); } if ( NULL != cmd ) diff --git a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C index 215793cec..83f7af4aa 100644 --- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C +++ b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C @@ -159,7 +159,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, // Do nothing. Saved SDCs only supported on FSP. #ifdef __HOSTBOOT_RUNTIME - PRDF_ERR( PRDF_FUNC"HBRT should NOT have any CS attns!" ); + PRDF_ERR( PRDF_FUNC "HBRT should NOT have any CS attns!" ); #endif #else @@ -175,7 +175,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, &sdcSaveFlags, sz_uint8 ); if (errorLog) { - PRDF_ERR( PRDF_FUNC"Failure in SDC flag Registry read" ); + PRDF_ERR( PRDF_FUNC "Failure in SDC flag Registry read" ); PRDF_COMMIT_ERRL(errorLog, ERRL_ACTION_REPORT); } else if (sdcSaveFlags & SDC_SAVE_UE_FLAG) //check if UE log stored @@ -183,7 +183,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, bool l_rc = SdcRetrieve(SDC_SAVE_UE_FLAG, sdcBuffer); if (l_rc) { - PRDF_ERR( PRDF_FUNC"Failure in UE SDC Retrieve Function" ); + PRDF_ERR( PRDF_FUNC "Failure in UE SDC Retrieve Function" ); } else { @@ -208,7 +208,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, bool l_rc = SdcRetrieve(SDC_SAVE_SUE_FLAG, sdcBuffer); if (l_rc) { - PRDF_ERR( PRDF_FUNC"Failure in SUE SDC Retrieve Function" ); + PRDF_ERR( PRDF_FUNC "Failure in SUE SDC Retrieve Function" ); } else { @@ -246,7 +246,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, bool l_rc = SdcSave(SDC_SAVE_UE_FLAG, io_sdc); if (l_rc) { - PRDF_ERR( PRDF_FUNC"Failure in UE SDC Save Function" ); + PRDF_ERR( PRDF_FUNC "Failure in UE SDC Save Function" ); } } else if //Sue-Re RECOVERABLE condition. @@ -258,7 +258,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, bool l_rc = SdcSave(SDC_SAVE_SUE_FLAG, io_sdc); if (l_rc) { - PRDF_ERR( PRDF_FUNC"Failure in SUE SDC Save Function" ); + PRDF_ERR( PRDF_FUNC "Failure in SUE SDC Save Function" ); } } #endif // if not __HOSTBOOT_MODULE @@ -555,7 +555,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, { thisProcedureID = epubProcedureID(thiscallout.flatten()); - PRDF_DTRAC( PRDF_FUNC"thisProcedureID: %x, thispriority: %x, severityParm: %x", + PRDF_DTRAC( PRDF_FUNC "thisProcedureID: %x, thispriority: %x, severityParm: %x", thisProcedureID, thispriority,severityParm ); PRDF_HW_ADD_PROC_CALLOUT(thisProcedureID, @@ -567,7 +567,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, // Add a Second Level Support procedure callout Low, for this case. if (HW == false && SW == true && SecondLevel == false) { - PRDF_DTRAC( PRDF_FUNC"thisProcedureID= %x, thispriority=%x, severityParm=%x", + PRDF_DTRAC( PRDF_FUNC "thisProcedureID= %x, thispriority=%x, severityParm=%x", EPUB_PRC_LVL_SUPP, MRU_LOW, severityParm ); PRDF_HW_ADD_PROC_CALLOUT(EPUB_PRC_LVL_SUPP, @@ -705,7 +705,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, o_dumpErrl = iv_errl; iv_errl = NULL; o_dumpErrlActions = actionFlag; - PRDF_TRAC( PRDF_FUNC"for target: 0x%08x, i_errl: 0x%08x, " + PRDF_TRAC( PRDF_FUNC "for target: 0x%08x, i_errl: 0x%08x, " "i_errlActions: 0x%08x", getHuid(o_dumpTrgt), ERRL_GETRC_SAFE(o_dumpErrl), o_dumpErrlActions ); } @@ -721,7 +721,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, errlHndl_t reg_errl = UtilReg::read ("prdf/RasServices", &sdcSaveFlags, sz_uint8); if (reg_errl) { - PRDF_ERR( PRDF_FUNC"Failure in SDC Sync flag Registry read" ); + PRDF_ERR( PRDF_FUNC "Failure in SDC Sync flag Registry read" ); PRDF_COMMIT_ERRL(reg_errl, ERRL_ACTION_REPORT); } else @@ -731,13 +731,13 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, reg_errl = UtilReg::write ("prdf/RasServices", &sdcSaveFlags, sz_uint8); if (reg_errl) { - PRDF_ERR( PRDF_FUNC"Failure in SDC Sync flag Registry write" ); + PRDF_ERR( PRDF_FUNC "Failure in SDC Sync flag Registry write" ); PRDF_COMMIT_ERRL(reg_errl, ERRL_ACTION_REPORT); } } #endif - PRDF_INF( PRDF_FUNC"PRD called to analyze an error: 0x%08x 0x%08x", + PRDF_INF( PRDF_FUNC "PRD called to analyze an error: 0x%08x 0x%08x", esig->getChipId(), esig->getSigId() ); // Reset iv_errl to NULL. This is done to catch logical bug in our code. @@ -916,13 +916,13 @@ bool ErrDataService::SdcSave( sdcSaveFlagsEnum i_saveFlag, else { //Should not get here - code error - PRDF_ERR( PRDF_FUNC"Failure - incorrect SDC save flag" ); + PRDF_ERR( PRDF_FUNC "Failure - incorrect SDC save flag" ); rc = true; break; } if (errorLog) { - PRDF_ERR( PRDF_FUNC"Failure in getting SDC file path" ); + PRDF_ERR( PRDF_FUNC "Failure in getting SDC file path" ); PRDF_COMMIT_ERRL(errorLog, ERRL_ACTION_REPORT); rc = true; break; @@ -938,7 +938,7 @@ bool ErrDataService::SdcSave( sdcSaveFlagsEnum i_saveFlag, errorLog = UtilReg::read ("prdf/RasServices", &sdcSaveFlags, sz_uint8); if (errorLog) { - PRDF_ERR( PRDF_FUNC"Failure in SDC flag Registry read" ); + PRDF_ERR( PRDF_FUNC "Failure in SDC flag Registry read" ); PRDF_COMMIT_ERRL(errorLog, ERRL_ACTION_REPORT); rc = true; break; @@ -949,7 +949,7 @@ bool ErrDataService::SdcSave( sdcSaveFlagsEnum i_saveFlag, errorLog = UtilReg::write ("prdf/RasServices", &sdcSaveFlags, sz_uint8); if (errorLog) { - PRDF_ERR( PRDF_FUNC"Failure in SDC flag Registry write" ); + PRDF_ERR( PRDF_FUNC "Failure in SDC flag Registry write" ); PRDF_COMMIT_ERRL(errorLog, ERRL_ACTION_REPORT); rc = true; break; @@ -992,13 +992,13 @@ bool ErrDataService::SdcRetrieve(sdcSaveFlagsEnum i_saveFlag, void * o_buffer) else { //Should not get here - code error - PRDF_ERR(PRDF_FUNC"Failure - incorrect SDC save flag" ); + PRDF_ERR(PRDF_FUNC "Failure - incorrect SDC save flag" ); rc = true; break; } if (errorLog) { - PRDF_ERR( PRDF_FUNC"Failure in getting SDC file path" ); + PRDF_ERR( PRDF_FUNC "Failure in getting SDC file path" ); PRDF_COMMIT_ERRL(errorLog, ERRL_ACTION_REPORT); rc = true; break; @@ -1086,7 +1086,7 @@ void ErrDataService::deallocateDimms( const SDC_MRU_LIST & i_mruList ) int32_t rc = DEALLOC::dimmListGard( dimmList ); if ( SUCCESS != rc ) { - PRDF_ERR( PRDF_FUNC"dimmListGard failed" ); + PRDF_ERR( PRDF_FUNC "dimmListGard failed" ); break; } diff --git a/src/usr/diag/prdf/common/framework/service/prdfServiceDataCollector.C b/src/usr/diag/prdf/common/framework/service/prdfServiceDataCollector.C index 4035cec08..8059e36d6 100755 --- a/src/usr/diag/prdf/common/framework/service/prdfServiceDataCollector.C +++ b/src/usr/diag/prdf/common/framework/service/prdfServiceDataCollector.C @@ -212,7 +212,7 @@ void ServiceDataCollector::AddSignatureList( TargetHandle_t i_target, { if ( NULL == i_target ) { - PRDF_ERR( PRDF_FUNC"Given target is NULL" ); + PRDF_ERR( PRDF_FUNC "Given target is NULL" ); break; } @@ -252,7 +252,7 @@ void ServiceDataCollector::AddSignatureList( ErrorSignature & i_sig ) } else { - PRDF_ERR( PRDF_FUNC"Failed to get target Handle for " + PRDF_ERR( PRDF_FUNC "Failed to get target Handle for " "chip:0x%08X", i_sig.getChipId() ); } #undef PRDF_FUNC diff --git a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C index c25463ebf..4f083a028 100755 --- a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C +++ b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C @@ -393,12 +393,12 @@ void setHWStateChanged(TARGETING::TargetHandle_t i_target) } else { - PRDF_ERR(PRDF_FUNC"invalid target type: 0x%08x", type); + PRDF_ERR(PRDF_FUNC "invalid target type: 0x%08x", type); } } else { - PRDF_ERR(PRDF_FUNC"i_target is null"); + PRDF_ERR(PRDF_FUNC "i_target is null"); } #undef PRDF_FUNC @@ -596,7 +596,7 @@ int32_t getAssociationType( TARGETING::TargetHandle_t i_target, { if ( NULL == i_target ) { - PRDF_ERR( PRDF_FUNC"Given target is null" ); + PRDF_ERR( PRDF_FUNC "Given target is null" ); o_rc = FAIL; break; } @@ -611,7 +611,7 @@ int32_t getAssociationType( TARGETING::TargetHandle_t i_target, if ( (it == lookups + sz_lookups) || // off the end (type != it->from) || (i_connType != it->to) ) // not equals { - PRDF_ERR( PRDF_FUNC"Look-up failed: i_target=0x%08x i_connType=%d", + PRDF_ERR( PRDF_FUNC "Look-up failed: i_target=0x%08x i_connType=%d", getHuid(i_target), i_connType ); o_rc = FAIL; break; } @@ -637,7 +637,7 @@ TargetHandleList getConnAssoc( TargetHandle_t i_target, TYPE i_connType, { if ( NULL == i_target ) { - PRDF_ERR( PRDF_FUNC"Given target is null" ); + PRDF_ERR( PRDF_FUNC "Given target is null" ); break; } @@ -704,7 +704,7 @@ TargetHandle_t getConnectedParent( TargetHandle_t i_target, TYPE i_connType ) if ( TargetService::PARENT_BY_AFFINITY != assocType ) { - PRDF_ERR( PRDF_FUNC"Unsupported parent connection: i_target=0x%08x " + PRDF_ERR( PRDF_FUNC "Unsupported parent connection: i_target=0x%08x " "i_connType=%d", getHuid(i_target), i_connType ); break; } @@ -712,7 +712,7 @@ TargetHandle_t getConnectedParent( TargetHandle_t i_target, TYPE i_connType ) TargetHandleList list = getConnAssoc( i_target, i_connType, assocType ); if ( 1 != list.size() ) // Should be one and only one parent { - PRDF_ERR( PRDF_FUNC"Could not find parent: i_target=0x%08x " + PRDF_ERR( PRDF_FUNC "Could not find parent: i_target=0x%08x " "i_connType=%d", getHuid(i_target), i_connType ); break; } @@ -743,7 +743,7 @@ TargetHandle_t getConnectedChild( TargetHandle_t i_target, TYPE i_connType, if ( TargetService::CHILD_BY_AFFINITY != assocType ) { - PRDF_ERR( PRDF_FUNC"Unsupported child connection: i_target=0x%08x " + PRDF_ERR( PRDF_FUNC "Unsupported child connection: i_target=0x%08x " "i_connType=%d", getHuid(i_target), i_connType ); break; } @@ -788,7 +788,7 @@ TargetHandle_t getConnectedPeerTarget( TargetHandle_t i_target ) { if ( NULL == i_target ) { - PRDF_ERR( PRDF_FUNC"Given target is NULL" ); + PRDF_ERR( PRDF_FUNC "Given target is NULL" ); break; } @@ -805,7 +805,7 @@ TargetHandle_t getConnectedPeerTarget( TargetHandle_t i_target ) break; default: - PRDF_ERR( PRDF_FUNC"Target type not supported: i_target=0x%08x " + PRDF_ERR( PRDF_FUNC "Target type not supported: i_target=0x%08x " "type=0x%x", getHuid(i_target), type ); } @@ -830,7 +830,7 @@ TargetHandle_t getConnectedPeerProc( TargetHandle_t i_procTarget, { if ( NULL == i_procTarget || TYPE_PROC != getTargetType(i_procTarget) ) { - PRDF_ERR( PRDF_FUNC"Given target is not of TYPE_PROC: " + PRDF_ERR( PRDF_FUNC "Given target is not of TYPE_PROC: " "i_procTarget=0x%08x", getHuid(i_procTarget) ); break; } @@ -994,7 +994,7 @@ uint32_t getTargetPosition( TARGETING::TargetHandle_t i_target ) uint16_t tmpPos = 0; if ( !i_target->tryGetAttr<ATTR_POSITION>(tmpPos) ) { - PRDF_ERR( PRDF_FUNC"Failed to get ATTR_POSITION" ); + PRDF_ERR( PRDF_FUNC "Failed to get ATTR_POSITION" ); } else o_pos = (uint32_t)tmpPos; @@ -1006,7 +1006,7 @@ uint32_t getTargetPosition( TARGETING::TargetHandle_t i_target ) break; default: - PRDF_ERR( PRDF_FUNC"Unsupported type: %d", l_type ); + PRDF_ERR( PRDF_FUNC "Unsupported type: %d", l_type ); } break; } @@ -1016,7 +1016,7 @@ uint32_t getTargetPosition( TARGETING::TargetHandle_t i_target ) uint8_t tmpPos = 0; if ( !i_target->tryGetAttr<ATTR_CHIP_UNIT>(tmpPos) ) { - PRDF_ERR( PRDF_FUNC"Failed to get ATTR_CHIP_UNIT" ); + PRDF_ERR( PRDF_FUNC "Failed to get ATTR_CHIP_UNIT" ); } else o_pos = (uint32_t)tmpPos; @@ -1028,12 +1028,12 @@ uint32_t getTargetPosition( TARGETING::TargetHandle_t i_target ) break; default: - PRDF_ERR( PRDF_FUNC"Unsupported class: %d", l_class ); + PRDF_ERR( PRDF_FUNC "Unsupported class: %d", l_class ); } if ( INVALID_POSITION_BOUND == o_pos ) { - PRDF_ERR( PRDF_FUNC"Failed: target=0x%08x", getHuid(i_target) ); + PRDF_ERR( PRDF_FUNC "Failed: target=0x%08x", getHuid(i_target) ); } #undef PRDF_FUNC @@ -1089,7 +1089,7 @@ TARGETING::MODEL getProcModel( TARGETING::TargetHandle_t i_proc ) } else { - PRDF_ERR( PRDF_FUNC"Invalid Target Huid = 0x%08x", getHuid( i_proc ) ); + PRDF_ERR( PRDF_FUNC "Invalid Target Huid = 0x%08x", getHuid( i_proc ) ); } return l_model; @@ -1111,7 +1111,7 @@ uint32_t getPhbConfig( TARGETING::TargetHandle_t i_proc ) } else { - PRDF_ERR( PRDF_FUNC"Invalid Target Huid = 0x%08x", getHuid(i_proc) ); + PRDF_ERR( PRDF_FUNC "Invalid Target Huid = 0x%08x", getHuid(i_proc) ); } return l_pciConfig; @@ -1142,20 +1142,20 @@ int32_t getMasterRanks( TargetHandle_t i_memTrgt, TargetHandle_t mbaTrgt = getConnectedParent( i_memTrgt, TYPE_MBA ); if ( NULL == mbaTrgt ) { - PRDF_ERR( PRDF_FUNC"getConnectedParent() failed" ); + PRDF_ERR( PRDF_FUNC "getConnectedParent() failed" ); break; } if( MAX_DIMM_PER_PORT < i_ds ) { - PRDF_ERR( PRDF_FUNC"Invalid value for Dimm Slct:%u", i_ds ); + PRDF_ERR( PRDF_FUNC "Invalid value for Dimm Slct:%u", i_ds ); break; } uint8_t info[MAX_PORT_PER_MBA][MAX_DIMM_PER_PORT]; if ( !mbaTrgt->tryGetAttr<ATTR_EFF_DIMM_RANKS_CONFIGED>(info) ) { - PRDF_ERR( PRDF_FUNC"Failed to get ATTR_EFF_DIMM_RANKS_CONFIGED" ); + PRDF_ERR( PRDF_FUNC "Failed to get ATTR_EFF_DIMM_RANKS_CONFIGED" ); break; } @@ -1192,7 +1192,7 @@ int32_t getMasterRanks( TargetHandle_t i_memTrgt, if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_memTrgt=0x%08x", getHuid(i_memTrgt) ); + PRDF_ERR( PRDF_FUNC "Failed: i_memTrgt=0x%08x", getHuid(i_memTrgt) ); } return o_rc; @@ -1217,7 +1217,7 @@ uint32_t getMemChnl( TARGETING::TargetHandle_t i_memTarget ) TargetHandle_t mcsTarget = getConnectedParent( i_memTarget, TYPE_MCS ); if ( NULL == mcsTarget ) { - PRDF_ERR( PRDF_FUNC"getConnectedParent() failed" ); + PRDF_ERR( PRDF_FUNC "getConnectedParent() failed" ); break; } @@ -1227,7 +1227,7 @@ uint32_t getMemChnl( TARGETING::TargetHandle_t i_memTarget ) if ( MAX_MCS_PER_PROC <= o_chnl ) // Real MCS position check. { - PRDF_ERR( PRDF_FUNC"Failed: i_memTarget=0x%08x", + PRDF_ERR( PRDF_FUNC "Failed: i_memTarget=0x%08x", getHuid(i_memTarget) ); } @@ -1298,7 +1298,7 @@ int32_t getDramGen( TARGETING::TargetHandle_t i_mba, uint8_t & o_dramGen ) { if ( TYPE_MBA != getTargetType( i_mba ) ) { - PRDF_ERR( PRDF_FUNC"Invalid Target. HUID:0X%08X", + PRDF_ERR( PRDF_FUNC "Invalid Target. HUID:0X%08X", getHuid( i_mba ) ); break; } @@ -1326,7 +1326,7 @@ int32_t getDimmRowCol( TARGETING::TargetHandle_t i_mba, uint8_t & o_rowNum, { if ( TYPE_MBA != getTargetType( i_mba ) ) { - PRDF_ERR( PRDF_FUNC"Invalid Target. HUID:0X%08X", + PRDF_ERR( PRDF_FUNC "Invalid Target. HUID:0X%08X", getHuid( i_mba ) ); break; } @@ -1362,7 +1362,7 @@ uint8_t getRanksPerDimm( TargetHandle_t i_mba, uint8_t i_ds ) { if ( MAX_DIMM_PER_PORT <= i_ds ) { - PRDF_ERR( PRDF_FUNC"Invalid parameters i_ds:%u", i_ds ); + PRDF_ERR( PRDF_FUNC "Invalid parameters i_ds:%u", i_ds ); break; } @@ -1373,7 +1373,7 @@ uint8_t getRanksPerDimm( TargetHandle_t i_mba, uint8_t i_ds ) ATTR_EFF_NUM_RANKS_PER_DIMM_type attr; if ( !i_mba->tryGetAttr<ATTR_EFF_NUM_RANKS_PER_DIMM>(attr) ) { - PRDF_ERR( PRDF_FUNC"failed to get ATTR_EFF_NUM_RANKS_PER_DIMM" ); + PRDF_ERR( PRDF_FUNC "failed to get ATTR_EFF_NUM_RANKS_PER_DIMM" ); break; } @@ -1411,7 +1411,7 @@ TARGETING::TargetHandle_t getClockId(TARGETING::TargetHandle_t { if ( i_oscPos >= MAX_PCIE_OSC_PER_NODE ) { - PRDF_ERR(PRDF_FUNC"target: 0x%.8X - invalid " + PRDF_ERR(PRDF_FUNC "target: 0x%.8X - invalid " "i_oscPos: %d", getHuid(i_pGivenTarget), i_oscPos); break; } @@ -1422,7 +1422,7 @@ TARGETING::TargetHandle_t getClockId(TARGETING::TargetHandle_t l_target = getConnectedParent(i_pGivenTarget, TYPE_PROC); if(NULL == l_target) { - PRDF_ERR(PRDF_FUNC"failed to get proc target " + PRDF_ERR(PRDF_FUNC "failed to get proc target " "connected to membuf 0x%.8X", getHuid(l_target)); break; @@ -1451,7 +1451,7 @@ TARGETING::TargetHandle_t getClockId(TARGETING::TargetHandle_t l_itr != l_clockCardlist.end(); ++l_itr) { - PRDF_TRAC(PRDF_FUNC"OSC 0x%.8X, pos: %d is connected to " + PRDF_TRAC(PRDF_FUNC "OSC 0x%.8X, pos: %d is connected to " "proc 0x%.8X, inputOscPos: %d", getHuid(*l_itr), getTargetPosition(*l_itr), getHuid(l_target), i_oscPos); diff --git a/src/usr/diag/prdf/common/mnfgtools/prdfMfgThreshold.C b/src/usr/diag/prdf/common/mnfgtools/prdfMfgThreshold.C index fa250b278..b5f93c085 100755 --- a/src/usr/diag/prdf/common/mnfgtools/prdfMfgThreshold.C +++ b/src/usr/diag/prdf/common/mnfgtools/prdfMfgThreshold.C @@ -61,7 +61,7 @@ void MfgThreshold::setup() l_sysTarget = PlatServices::getSystemTarget(); if(NULL == l_sysTarget) { - PRDF_ERR(PRDF_FUNC"No System target!"); + PRDF_ERR(PRDF_FUNC "No System target!"); break; } diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.C index 67941d698..70d7dc4fe 100644 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.C @@ -111,7 +111,7 @@ TargetHandleList getConnectedDimms( TargetHandle_t i_mba, if ( TYPE_MBA != getTargetType(i_mba) ) { - PRDF_ERR( PRDF_FUNC"Invalid target type: HUID=0x%08x", getHuid(i_mba) ); + PRDF_ERR( PRDF_FUNC "Invalid target type: HUID=0x%08x", getHuid(i_mba) ); } else { @@ -123,7 +123,7 @@ TargetHandleList getConnectedDimms( TargetHandle_t i_mba, int32_t l_rc = getMbaDimm( *dimmIt, dimmSlct ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"getMbaDimm(0x%08x) failed", + PRDF_ERR( PRDF_FUNC "getMbaDimm(0x%08x) failed", getHuid(*dimmIt) ); continue; } @@ -176,7 +176,7 @@ TargetHandleList getConnectedDimms( TargetHandle_t i_mba, int32_t l_rc = getMbaPort( *dimmIt, portSlct ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"getMbaPort(0x%08x) failed", + PRDF_ERR( PRDF_FUNC "getMbaPort(0x%08x) failed", getHuid(*dimmIt) ); continue; } @@ -210,7 +210,7 @@ TargetHandleList getConnectedDimms( TargetHandle_t i_mba, int32_t l_rc = getMbaPort( *dimmIt, portSlct ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"getMbaPort(0x%08x) failed", + PRDF_ERR( PRDF_FUNC "getMbaPort(0x%08x) failed", getHuid(*dimmIt) ); continue; } @@ -272,7 +272,7 @@ int32_t getBusEndpoints( ExtensibleChip * i_chip, if ( NULL == o_rxTrgt || NULL == o_txTrgt ) { - PRDF_ERR( PRDF_FUNC"i_chip:0x%08x o_rxTrgt:0x%08x o_txTrgt:0x%08x " + PRDF_ERR( PRDF_FUNC "i_chip:0x%08x o_rxTrgt:0x%08x o_txTrgt:0x%08x " "i_busType:%d i_busPos:%d", getHuid(chipTrgt), getHuid(o_rxTrgt), getHuid(o_txTrgt), i_busType, i_busPos ); rc = FAIL; @@ -297,7 +297,7 @@ int32_t calloutBusInterface( TargetHandle_t i_rxTrgt, TargetHandle_t i_txTrgt, // Check for valid targets. if ( NULL == i_rxTrgt || NULL == i_txTrgt ) { - PRDF_ERR( PRDF_FUNC"Given target(s) are NULL" ); + PRDF_ERR( PRDF_FUNC "Given target(s) are NULL" ); rc = FAIL; break; } @@ -322,7 +322,7 @@ int32_t calloutBusInterface( TargetHandle_t i_rxTrgt, TargetHandle_t i_txTrgt, } else { - PRDF_ERR( PRDF_FUNC"Unsupported target types" ); + PRDF_ERR( PRDF_FUNC "Unsupported target types" ); rc = FAIL; break; } @@ -331,7 +331,7 @@ int32_t calloutBusInterface( TargetHandle_t i_rxTrgt, TargetHandle_t i_txTrgt, errl = ServiceGeneratorClass::ThisServiceGenerator().getErrl(); if ( NULL == errl ) { - PRDF_ERR( PRDF_FUNC"Failed to get the global error log" ); + PRDF_ERR( PRDF_FUNC "Failed to get the global error log" ); rc = FAIL; break; } @@ -342,7 +342,7 @@ int32_t calloutBusInterface( TargetHandle_t i_rxTrgt, TargetHandle_t i_txTrgt, if ( SUCCESS != rc ) { - PRDF_ERR( PRDF_FUNC"i_rxTrgt:0x%08x i_txTrgt:0x%08x i_priority:%d", + PRDF_ERR( PRDF_FUNC "i_rxTrgt:0x%08x i_txTrgt:0x%08x i_priority:%d", getHuid(i_rxTrgt), getHuid(i_txTrgt), i_priority ); } @@ -374,7 +374,7 @@ int32_t calloutBusInterface( ExtensibleChip * i_chip, PRDpriority i_priority, if ( SUCCESS != rc ) { - PRDF_ERR( PRDF_FUNC"i_chip:0x%08x i_busType:%d i_busPos:%d " + PRDF_ERR( PRDF_FUNC "i_chip:0x%08x i_busType:%d i_busPos:%d " "i_priority:%d", i_chip->GetId(), i_busType, i_busPos, i_priority ); } diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenAddress.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenAddress.C index 12b5e0cc3..0401ab9c9 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenAddress.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenAddress.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2015 */ +/* [+] 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. */ @@ -64,13 +66,13 @@ int32_t getCenReadAddr( ExtensibleChip * i_membChip, uint32_t i_mbaPos, // Check parameters if ( TYPE_MEMBUF != getTargetType(membTrgt) ) { - PRDF_ERR( PRDF_FUNC"Unsupported target type" ); + PRDF_ERR( PRDF_FUNC "Unsupported target type" ); o_rc = FAIL; break; } if ( MAX_MBA_PER_MEMBUF <= i_mbaPos ) { - PRDF_ERR( PRDF_FUNC"Invalid MBA position" ); + PRDF_ERR( PRDF_FUNC "Invalid MBA position" ); o_rc = FAIL; break; } @@ -83,7 +85,7 @@ int32_t getCenReadAddr( ExtensibleChip * i_membChip, uint32_t i_mbaPos, o_rc = reg->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Read() failed on %s", reg_str ); break; } uint64_t addr = reg->GetBitFieldJustified( 0, 64 ); @@ -96,7 +98,7 @@ int32_t getCenReadAddr( ExtensibleChip * i_membChip, uint32_t i_mbaPos, else if ( READ_UE_ADDR == i_addrReg ) type = CenAddr::UE; else { - PRDF_ERR( PRDF_FUNC"Unsupported register" ); + PRDF_ERR( PRDF_FUNC "Unsupported register" ); o_rc = FAIL; break; } @@ -106,7 +108,7 @@ int32_t getCenReadAddr( ExtensibleChip * i_membChip, uint32_t i_mbaPos, if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_membChip=0x%08x i_mbaPos=%d i_addrReg=%s", + PRDF_ERR( PRDF_FUNC "Failed: i_membChip=0x%08x i_mbaPos=%d i_addrReg=%s", i_membChip->GetId(), i_mbaPos, i_addrReg ); } @@ -131,13 +133,13 @@ int32_t setCenReadAddr( ExtensibleChip * i_membChip, uint32_t i_mbaPos, // Check parameters if ( TYPE_MEMBUF != getTargetType(membTrgt) ) { - PRDF_ERR( PRDF_FUNC"Unsupported target type" ); + PRDF_ERR( PRDF_FUNC "Unsupported target type" ); o_rc = FAIL; break; } if ( MAX_MBA_PER_MEMBUF <= i_mbaPos ) { - PRDF_ERR( PRDF_FUNC"Invalid MBA position" ); + PRDF_ERR( PRDF_FUNC "Invalid MBA position" ); o_rc = FAIL; break; } @@ -151,7 +153,7 @@ int32_t setCenReadAddr( ExtensibleChip * i_membChip, uint32_t i_mbaPos, o_rc = reg->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", reg_str ); break; } @@ -159,7 +161,7 @@ int32_t setCenReadAddr( ExtensibleChip * i_membChip, uint32_t i_mbaPos, if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_membChip=0x%08x i_mbaPos=%d i_addrReg=%s", + PRDF_ERR( PRDF_FUNC "Failed: i_membChip=0x%08x i_mbaPos=%d i_addrReg=%s", i_membChip->GetId(), i_mbaPos, i_addrReg ); } @@ -185,7 +187,7 @@ int32_t getCenMaintStartAddr( ExtensibleChip * i_mbaChip, CenAddr & o_addr ) // Check parameters if ( TYPE_MBA != getTargetType(mbaTrgt) ) { - PRDF_ERR( PRDF_FUNC"Unsupported target type" ); + PRDF_ERR( PRDF_FUNC "Unsupported target type" ); o_rc = FAIL; break; } @@ -196,7 +198,7 @@ int32_t getCenMaintStartAddr( ExtensibleChip * i_mbaChip, CenAddr & o_addr ) o_rc = reg->ForceRead(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on MBMACA" ); + PRDF_ERR( PRDF_FUNC "Read() failed on MBMACA" ); break; } uint64_t addr = reg->GetBitFieldJustified( 0, 64 ); @@ -207,7 +209,7 @@ int32_t getCenMaintStartAddr( ExtensibleChip * i_mbaChip, CenAddr & o_addr ) if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: HUID=0x%08x", getHuid(mbaTrgt) ); + PRDF_ERR( PRDF_FUNC "Failed: HUID=0x%08x", getHuid(mbaTrgt) ); } return o_rc; @@ -231,7 +233,7 @@ int32_t setCenMaintStartAddr( ExtensibleChip * i_mbaChip, // Check parameters if ( TYPE_MBA != getTargetType(mbaTrgt) ) { - PRDF_ERR( PRDF_FUNC"Unsupported target type" ); + PRDF_ERR( PRDF_FUNC "Unsupported target type" ); o_rc = FAIL; break; } @@ -241,7 +243,7 @@ int32_t setCenMaintStartAddr( ExtensibleChip * i_mbaChip, o_rc = reg->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on MBMACA" ); + PRDF_ERR( PRDF_FUNC "Write() failed on MBMACA" ); break; } @@ -249,7 +251,7 @@ int32_t setCenMaintStartAddr( ExtensibleChip * i_mbaChip, if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: HUID=0x%08x", getHuid(mbaTrgt) ); + PRDF_ERR( PRDF_FUNC "Failed: HUID=0x%08x", getHuid(mbaTrgt) ); } return o_rc; @@ -272,7 +274,7 @@ int32_t getCenMaintEndAddr( ExtensibleChip * i_mbaChip, CenAddr & o_addr ) // Check parameters if ( TYPE_MBA != getTargetType(mbaTrgt) ) { - PRDF_ERR( PRDF_FUNC"Unsupported target type" ); + PRDF_ERR( PRDF_FUNC "Unsupported target type" ); o_rc = FAIL; break; } @@ -281,7 +283,7 @@ int32_t getCenMaintEndAddr( ExtensibleChip * i_mbaChip, CenAddr & o_addr ) o_rc = reg->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on MBMEA" ); + PRDF_ERR( PRDF_FUNC "Read() failed on MBMEA" ); break; } uint64_t addr = reg->GetBitFieldJustified( 0, 64 ); @@ -292,7 +294,7 @@ int32_t getCenMaintEndAddr( ExtensibleChip * i_mbaChip, CenAddr & o_addr ) if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: HUID=0x%08x", getHuid(mbaTrgt) ); + PRDF_ERR( PRDF_FUNC "Failed: HUID=0x%08x", getHuid(mbaTrgt) ); } return o_rc; @@ -315,7 +317,7 @@ int32_t setCenMaintEndAddr( ExtensibleChip * i_mbaChip, const CenAddr & i_addr ) // Check parameters if ( TYPE_MBA != getTargetType(mbaTrgt) ) { - PRDF_ERR( PRDF_FUNC"Unsupported target type" ); + PRDF_ERR( PRDF_FUNC "Unsupported target type" ); o_rc = FAIL; break; } @@ -325,7 +327,7 @@ int32_t setCenMaintEndAddr( ExtensibleChip * i_mbaChip, const CenAddr & i_addr ) o_rc = reg->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on MBMEA" ); + PRDF_ERR( PRDF_FUNC "Write() failed on MBMEA" ); break; } @@ -333,7 +335,7 @@ int32_t setCenMaintEndAddr( ExtensibleChip * i_mbaChip, const CenAddr & i_addr ) if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: HUID=0x%08x", getHuid(mbaTrgt) ); + PRDF_ERR( PRDF_FUNC "Failed: HUID=0x%08x", getHuid(mbaTrgt) ); } return o_rc; diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenDqBitmap.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenDqBitmap.C index d305d1879..c6cf0e50c 100644 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenDqBitmap.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenDqBitmap.C @@ -72,7 +72,7 @@ int32_t CenDqBitmap::badDqs( uint8_t i_portSlct, bool & o_badDqs ) const { if ( PORT_SLCT_PER_MBA <= i_portSlct ) { - PRDF_ERR( PRDF_FUNC"Invalid parameter: i_portSlct=%d", i_portSlct ); + PRDF_ERR( PRDF_FUNC "Invalid parameter: i_portSlct=%d", i_portSlct ); o_rc = FAIL; break; } @@ -104,13 +104,13 @@ int32_t CenDqBitmap::setDq( uint8_t i_dq, uint8_t i_portSlct ) { if ( DQS_PER_DIMM <= i_dq ) { - PRDF_ERR( PRDF_FUNC"Invalid parameter: i_dq=%d", i_dq ); + PRDF_ERR( PRDF_FUNC "Invalid parameter: i_dq=%d", i_dq ); o_rc = FAIL; break; } if ( PORT_SLCT_PER_MBA <= i_portSlct ) { - PRDF_ERR( PRDF_FUNC"Invalid parameter: i_portSlct=%d", i_portSlct ); + PRDF_ERR( PRDF_FUNC "Invalid parameter: i_portSlct=%d", i_portSlct ); o_rc = FAIL; break; } @@ -141,7 +141,7 @@ int32_t CenDqBitmap::setSymbol( const CenSymbol & i_symbol, uint8_t i_pins ) o_rc = getPortByteBitIdx( i_symbol, portSlct, byteIdx, bitIdx ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getPortByteBitIdx() failed" ); + PRDF_ERR( PRDF_FUNC "getPortByteBitIdx() failed" ); break; } @@ -171,7 +171,7 @@ int32_t CenDqBitmap::setDram( const CenSymbol & i_symbol, uint8_t i_pins ) o_rc = getPortByteBitIdx( i_symbol, portSlct, byteIdx, bitIdx ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getPortByteBitIdx() failed" ); + PRDF_ERR( PRDF_FUNC "getPortByteBitIdx() failed" ); break; } @@ -210,7 +210,7 @@ int32_t CenDqBitmap::isChipMark( const CenSymbol & i_symbol, bool & o_cm ) o_rc = getPortByteBitIdx( i_symbol, portSlct, byteIdx, bitIdx ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getPortByteBitIdx() failed" ); + PRDF_ERR( PRDF_FUNC "getPortByteBitIdx() failed" ); break; } @@ -252,7 +252,7 @@ int32_t CenDqBitmap::setDramSpare( uint8_t i_portSlct, uint8_t i_pins ) { if ( PORT_SLCT_PER_MBA <= i_portSlct ) { - PRDF_ERR( PRDF_FUNC"Invalid parameter: i_portSlct=%d", i_portSlct ); + PRDF_ERR( PRDF_FUNC "Invalid parameter: i_portSlct=%d", i_portSlct ); o_rc = FAIL; break; } @@ -261,13 +261,13 @@ int32_t CenDqBitmap::setDramSpare( uint8_t i_portSlct, uint8_t i_pins ) spareConfig ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getDimmSpareConfig() failed" ); + PRDF_ERR( PRDF_FUNC "getDimmSpareConfig() failed" ); o_rc = FAIL; break; } if ( ENUM_ATTR_VPD_DIMM_SPARE_NO_SPARE == spareConfig ) { - PRDF_ERR( PRDF_FUNC"DRAM Spare is not avaiable" ); + PRDF_ERR( PRDF_FUNC "DRAM Spare is not avaiable" ); o_rc = FAIL; break; } @@ -307,7 +307,7 @@ int32_t CenDqBitmap::setEccSpare( uint8_t i_pins ) { if ( !iv_x4Dram ) { - PRDF_ERR( PRDF_FUNC"MBA 0x %08x does not support x4 ECC spare", + PRDF_ERR( PRDF_FUNC "MBA 0x %08x does not support x4 ECC spare", getHuid(iv_mba) ); o_rc = FAIL; break; } @@ -337,7 +337,7 @@ int32_t CenDqBitmap::isDramSpareAvailable( uint8_t i_portSlct, { if ( PORT_SLCT_PER_MBA <= i_portSlct ) { - PRDF_ERR( PRDF_FUNC"Invalid parameter: i_portSlct=%d", i_portSlct ); + PRDF_ERR( PRDF_FUNC "Invalid parameter: i_portSlct=%d", i_portSlct ); o_rc = FAIL; break; } @@ -346,7 +346,7 @@ int32_t CenDqBitmap::isDramSpareAvailable( uint8_t i_portSlct, spareConfig ); if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getDimmSpareConfig() failed" ); + PRDF_ERR( PRDF_FUNC "getDimmSpareConfig() failed" ); break; } @@ -431,7 +431,7 @@ int32_t CenDqBitmap::getPortByteBitIdx( const CenSymbol & i_symbol, { if ( !i_symbol.isValid() ) { - PRDF_ERR( PRDF_FUNC"i_symbol is invalid" ); + PRDF_ERR( PRDF_FUNC "i_symbol is invalid" ); o_rc = FAIL; break; } diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMba.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMba.C index a0da4cba3..d8ad78bd3 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMba.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMba.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* [+] 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. */ @@ -93,7 +95,7 @@ int32_t MaintCmdComplete( ExtensibleChip * i_mbaChip, l_rc = mbadb->iv_tdCtlr.handleCmdCompleteEvent( i_sc ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_mbaChip=0x%08x", i_mbaChip->GetId() ); + PRDF_ERR( PRDF_FUNC "Failed: i_mbaChip=0x%08x", i_mbaChip->GetId() ); CalloutUtil::defaultError( i_sc ); } diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaCaptureData.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaCaptureData.C index ad6961e22..b8c08049f 100644 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaCaptureData.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaCaptureData.C @@ -66,13 +66,13 @@ void addMemChipletFirRegs( ExtensibleChip * i_membChip, CaptureData & io_cd ) { if ( NULL == i_membChip ) { - PRDF_ERR( PRDF_FUNC"Given target is NULL" ); + PRDF_ERR( PRDF_FUNC "Given target is NULL" ); break; } if ( TYPE_MEMBUF != getTargetType(i_membChip->GetChipHandle()) ) { - PRDF_ERR( PRDF_FUNC"Invalid target type: i_membChip=0x%08x", + PRDF_ERR( PRDF_FUNC "Invalid target type: i_membChip=0x%08x", i_membChip->GetId() ); break; } @@ -84,7 +84,7 @@ void addMemChipletFirRegs( ExtensibleChip * i_membChip, CaptureData & io_cd ) l_rc = cs_global->Read() | re_global->Read() | spa_global->Read(); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"Failed to read a GLOBAL register on " + PRDF_ERR( PRDF_FUNC "Failed to read a GLOBAL register on " "0x%08x", i_membChip->GetId() ); break; } @@ -107,7 +107,7 @@ void addMemChipletFirRegs( ExtensibleChip * i_membChip, CaptureData & io_cd ) ExtensibleChip * mbaChip = membdb->getMbaChip(i); if ( NULL == mbaChip ) { - PRDF_ERR( PRDF_FUNC"MEM_CHIPLET registers indicated an " + PRDF_ERR( PRDF_FUNC "MEM_CHIPLET registers indicated an " "attention but no chip found: i_membChip=0x%08x " "i=%d", i_membChip->GetId(), i ); continue; @@ -181,12 +181,12 @@ void captureDramRepairsData( TARGETING::TargetHandle_t i_mbaTrgt, rc = getMasterRanks( i_mbaTrgt, masterRanks ); if ( SUCCESS != rc ) { - PRDF_ERR( PRDF_FUNC"getMasterRanks() failed" ); + PRDF_ERR( PRDF_FUNC "getMasterRanks() failed" ); break; } if( masterRanks.empty() ) { - PRDF_ERR( PRDF_FUNC"Master Rank list size is 0"); + PRDF_ERR( PRDF_FUNC "Master Rank list size is 0"); break;; } uint8_t spareConfig = ENUM_ATTR_VPD_DIMM_SPARE_NO_SPARE; @@ -195,7 +195,7 @@ void captureDramRepairsData( TARGETING::TargetHandle_t i_mbaTrgt, rc = getDimmSpareConfig( i_mbaTrgt, masterRanks[0], 0, spareConfig ); if( SUCCESS != rc ) { - PRDF_ERR( PRDF_FUNC"getDimmSpareConfig() failed" ); + PRDF_ERR( PRDF_FUNC "getDimmSpareConfig() failed" ); break; } @@ -211,7 +211,7 @@ void captureDramRepairsData( TARGETING::TargetHandle_t i_mbaTrgt, rc = mssGetMarkStore( i_mbaTrgt, *it, mark ); if ( SUCCESS != rc ) { - PRDF_ERR( PRDF_FUNC"mssGetMarkStore() Failed"); + PRDF_ERR( PRDF_FUNC "mssGetMarkStore() Failed"); continue; } @@ -220,7 +220,7 @@ void captureDramRepairsData( TARGETING::TargetHandle_t i_mbaTrgt, rc = mssGetSteerMux( i_mbaTrgt, *it, sp0, sp1, ecc ); if ( SUCCESS != rc ) { - PRDF_ERR( PRDF_FUNC"mssGetSteerMux() failed"); + PRDF_ERR( PRDF_FUNC "mssGetSteerMux() failed"); continue; } @@ -272,7 +272,7 @@ void captureDramRepairsData( TARGETING::TargetHandle_t i_mbaTrgt, }while(0); if( FAIL == rc ) - PRDF_ERR( PRDF_FUNC"Failed for MBA 0x%08X", getHuid( i_mbaTrgt ) ); + PRDF_ERR( PRDF_FUNC "Failed for MBA 0x%08X", getHuid( i_mbaTrgt ) ); #undef PRDF_FUNC } @@ -295,13 +295,13 @@ void captureDramRepairsVpd( TargetHandle_t i_mbaTrgt, CaptureData & io_cd ) rc = getMasterRanks( i_mbaTrgt, masterRanks ); if ( SUCCESS != rc ) { - PRDF_ERR( PRDF_FUNC"getMasterRanks() failed" ); + PRDF_ERR( PRDF_FUNC "getMasterRanks() failed" ); break; } if( masterRanks.empty() ) { - PRDF_ERR( PRDF_FUNC"Master Rank list size is 0"); + PRDF_ERR( PRDF_FUNC "Master Rank list size is 0"); break; } @@ -325,7 +325,7 @@ void captureDramRepairsVpd( TargetHandle_t i_mbaTrgt, CaptureData & io_cd ) if ( SUCCESS != getBadDqBitmap(i_mbaTrgt, *it, bitmap, true) ) { - PRDF_ERR( PRDF_FUNC"getBadDqBitmap() failed: MBA=0x%08x" + PRDF_ERR( PRDF_FUNC "getBadDqBitmap() failed: MBA=0x%08x" " rank=%d", getHuid(i_mbaTrgt), rank ); continue; // skip this rank } @@ -354,7 +354,7 @@ void captureDramRepairsVpd( TargetHandle_t i_mbaTrgt, CaptureData & io_cd ) }while(0); if( FAIL == rc ) - PRDF_ERR( PRDF_FUNC"Failed for MBA 0x%08X", getHuid( i_mbaTrgt ) ); + PRDF_ERR( PRDF_FUNC "Failed for MBA 0x%08X", getHuid( i_mbaTrgt ) ); #undef PRDF_FUNC } diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_common.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_common.C index 8a48684ec..66d59936f 100644 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_common.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_common.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -57,7 +57,7 @@ int32_t CenMbaTdCtlrCommon::initialize() // Validate iv_mbaChip. if ( TYPE_MBA != getTargetType(iv_mbaTrgt) ) { - PRDF_ERR( PRDF_FUNC"iv_mbaChip is not TYPE_MBA" ); + PRDF_ERR( PRDF_FUNC "iv_mbaChip is not TYPE_MBA" ); o_rc = FAIL; break; } @@ -66,7 +66,7 @@ int32_t CenMbaTdCtlrCommon::initialize() iv_membChip = mbadb->getMembChip(); if ( NULL == iv_membChip ) { - PRDF_ERR( PRDF_FUNC"getMembChip() failed" ); + PRDF_ERR( PRDF_FUNC "getMembChip() failed" ); o_rc = FAIL; break; } @@ -74,7 +74,7 @@ int32_t CenMbaTdCtlrCommon::initialize() iv_mbaPos = getTargetPosition( iv_mbaTrgt ); if ( MAX_MBA_PER_MEMBUF <= iv_mbaPos ) { - PRDF_ERR( PRDF_FUNC"iv_mbaPos=%d is invalid", iv_mbaPos ); + PRDF_ERR( PRDF_FUNC "iv_mbaPos=%d is invalid", iv_mbaPos ); o_rc = FAIL; break; } @@ -109,7 +109,7 @@ int32_t CenMbaTdCtlrCommon::cleanupPrevCmd() { o_rc = iv_mssCmd->cleanupCmd(); if ( SUCCESS != o_rc ) - PRDF_ERR( PRDF_FUNC"cleanupCmd() failed" ); + PRDF_ERR( PRDF_FUNC "cleanupCmd() failed" ); delete iv_mssCmd; iv_mssCmd = NULL; } @@ -124,7 +124,7 @@ int32_t CenMbaTdCtlrCommon::cleanupPrevCmd() if ( SUCCESS != firand->Write() ) { - PRDF_ERR( PRDF_FUNC"Write() failed on MBASPA_AND" ); + PRDF_ERR( PRDF_FUNC "Write() failed on MBASPA_AND" ); o_rc = FAIL; } @@ -150,7 +150,7 @@ int32_t CenMbaTdCtlrCommon::prepareNextCmd( bool i_clearStats ) o_rc = cleanupPrevCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"cleanupPrevCmd() failed" ); + PRDF_ERR( PRDF_FUNC "cleanupPrevCmd() failed" ); break; } @@ -171,7 +171,7 @@ int32_t CenMbaTdCtlrCommon::prepareNextCmd( bool i_clearStats ) o_rc = mbstr->ForceRead(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"ForceRead() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "ForceRead() failed on %s", reg_str ); break; } @@ -180,7 +180,7 @@ int32_t CenMbaTdCtlrCommon::prepareNextCmd( bool i_clearStats ) o_rc = mbstr->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", reg_str ); break; } @@ -214,7 +214,7 @@ int32_t CenMbaTdCtlrCommon::prepareNextCmd( bool i_clearStats ) o_rc = firand->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", reg_str ); break; } @@ -228,7 +228,7 @@ int32_t CenMbaTdCtlrCommon::prepareNextCmd( bool i_clearStats ) o_rc = spaAnd->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on MBASPA_AND" ); + PRDF_ERR( PRDF_FUNC "Write() failed on MBASPA_AND" ); break; } @@ -259,7 +259,7 @@ int32_t CenMbaTdCtlrCommon::chipMarkCleanup() o_rc = ddrPhyAndFir->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on MBADDRPHYFIR_AND" ); + PRDF_ERR( PRDF_FUNC "Write() failed on MBADDRPHYFIR_AND" ); break; } @@ -290,7 +290,7 @@ int32_t CenMbaTdCtlrCommon::checkEccErrors( uint16_t & o_eccErrorMask, o_rc = mbsEccFir->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Read() failed on %s", reg_str ); break; } @@ -303,7 +303,7 @@ int32_t CenMbaTdCtlrCommon::checkEccErrors( uint16_t & o_eccErrorMask, o_rc = chipMarkCleanup(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"chipMarkCleanup() failed" ); + PRDF_ERR( PRDF_FUNC "chipMarkCleanup() failed" ); break; } } @@ -326,7 +326,7 @@ int32_t CenMbaTdCtlrCommon::checkEccErrors( uint16_t & o_eccErrorMask, o_rc = mbaSpaFir->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed to read MBASPA Regsiter"); + PRDF_ERR( PRDF_FUNC "Failed to read MBASPA Regsiter"); break; } @@ -381,7 +381,7 @@ int32_t CenMbaTdCtlrCommon::handleMCE_VCM2( STEP_CODE_DATA_STRUCT & io_sc ) { if ( VCM_PHASE_2 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -406,7 +406,7 @@ int32_t CenMbaTdCtlrCommon::handleMCE_VCM2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = mssSetMarkStore( iv_mbaTrgt, iv_rank, iv_mark, blocked ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssSetMarkStore() failed" ); + PRDF_ERR( PRDF_FUNC "mssSetMarkStore() failed" ); break; } } @@ -418,7 +418,7 @@ int32_t CenMbaTdCtlrCommon::handleMCE_VCM2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = getBadDqBitmap( iv_mbaTrgt, iv_rank, bitmap ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getBadDqBitmap() failed" ); + PRDF_ERR( PRDF_FUNC "getBadDqBitmap() failed" ); break; } @@ -426,7 +426,7 @@ int32_t CenMbaTdCtlrCommon::handleMCE_VCM2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = bitmap.setDram( iv_mark.getCM() ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setDram() failed" ); + PRDF_ERR( PRDF_FUNC "setDram() failed" ); break; } @@ -436,7 +436,7 @@ int32_t CenMbaTdCtlrCommon::handleMCE_VCM2( STEP_CODE_DATA_STRUCT & io_sc ) spareConfig ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getDimmSpareConfig() failed" ); + PRDF_ERR( PRDF_FUNC "getDimmSpareConfig() failed" ); break; } @@ -449,7 +449,7 @@ int32_t CenMbaTdCtlrCommon::handleMCE_VCM2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = mssGetSteerMux( iv_mbaTrgt, iv_rank, sp0, sp1, ecc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetSteerMux() failed" ); + PRDF_ERR( PRDF_FUNC "mssGetSteerMux() failed" ); break; } @@ -474,7 +474,7 @@ int32_t CenMbaTdCtlrCommon::handleMCE_VCM2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = bitmap.isDramSpareAvailable( ps, dramSparePossible ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"isDramSpareAvailable() failed" ); + PRDF_ERR( PRDF_FUNC "isDramSpareAvailable() failed" ); break; } @@ -521,7 +521,7 @@ int32_t CenMbaTdCtlrCommon::handleMCE_VCM2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = setBadDqBitmap( iv_mbaTrgt, iv_rank, bitmap ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setBadDqBitmap() failed" ); + PRDF_ERR( PRDF_FUNC "setBadDqBitmap() failed" ); break; } @@ -531,7 +531,7 @@ int32_t CenMbaTdCtlrCommon::handleMCE_VCM2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = startDsdPhase1( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"startDsdPhase1() failed" ); + PRDF_ERR( PRDF_FUNC "startDsdPhase1() failed" ); break; } } @@ -559,7 +559,7 @@ int32_t CenMbaTdCtlrCommon::handleMCE_DSD2( STEP_CODE_DATA_STRUCT & io_sc ) { if ( DSD_PHASE_2 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -578,7 +578,7 @@ int32_t CenMbaTdCtlrCommon::handleMCE_DSD2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = getBadDqBitmap( iv_mbaTrgt, iv_rank, bitmap ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getBadDqBitmap() failed" ); + PRDF_ERR( PRDF_FUNC "getBadDqBitmap() failed" ); break; } if ( iv_isEccSteer ) @@ -590,7 +590,7 @@ int32_t CenMbaTdCtlrCommon::handleMCE_DSD2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = bitmap.setDramSpare( iv_mark.getCM().getPortSlct() ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setDramSpare() failed" ); + PRDF_ERR( PRDF_FUNC "setDramSpare() failed" ); break; } } @@ -598,7 +598,7 @@ int32_t CenMbaTdCtlrCommon::handleMCE_DSD2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = setBadDqBitmap( iv_mbaTrgt, iv_rank, bitmap ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setBadDqBitmap() failed" ); + PRDF_ERR( PRDF_FUNC "setBadDqBitmap() failed" ); break; } @@ -627,7 +627,7 @@ int32_t CenMbaTdCtlrCommon::setRtEteThresholds() o_rc = mbstr->ForceRead(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"ForceRead() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "ForceRead() failed on %s", reg_str ); break; } @@ -635,7 +635,7 @@ int32_t CenMbaTdCtlrCommon::setRtEteThresholds() o_rc = getScrubCeThreshold( iv_mbaChip, iv_rank, softIntCe ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getScrubCeThreshold() failed." ); + PRDF_ERR( PRDF_FUNC "getScrubCeThreshold() failed." ); break; } @@ -660,7 +660,7 @@ int32_t CenMbaTdCtlrCommon::setRtEteThresholds() o_rc = mbstr->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", reg_str ); break; } @@ -677,7 +677,7 @@ void CenMbaTdCtlrCommon::badPathErrorHandling( STEP_CODE_DATA_STRUCT & io_sc ) { #define PRDF_FUNC "[CenMbaTdCtlrCommon::badPathErrorHandling] " - PRDF_ERR( PRDF_FUNC"iv_mbaChip:0x%08x iv_initialized:%c iv_tdState:%d " + PRDF_ERR( PRDF_FUNC "iv_mbaChip:0x%08x iv_initialized:%c iv_tdState:%d " "iv_rank:M%dS%d iv_mark:%2d %2d", iv_mbaChip->GetId(), iv_initialized ? 'T' : 'F', iv_tdState, iv_rank.getMaster(), iv_rank.getSlave(), iv_mark.getCM().getSymbol(), diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaThresholds_common.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaThresholds_common.C index bac2f74b2..b62c88fc3 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaThresholds_common.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaThresholds_common.C @@ -152,7 +152,7 @@ int32_t getScrubCeThreshold( ExtensibleChip * i_mbaChip, const CenRank & i_rank, o_rc = getMnfgMemCeTh( i_mbaChip, i_rank, o_thr, junk1, junk2 ); if ( SUCCESS != o_rc ) - PRDF_ERR( PRDF_FUNC"getMnfgMemCeTh() failed" ); + PRDF_ERR( PRDF_FUNC "getMnfgMemCeTh() failed" ); // getMnfgMemCeTh() returns the number of CEs allowed. Will need to add // one to get the real threshold. diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMemUtils.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMemUtils.C index e35818a6f..72519211a 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMemUtils.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMemUtils.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -89,7 +89,7 @@ int32_t collectCeStats( ExtensibleChip * i_mbaChip, const CenRank & i_rank, { if ( 0 == i_thr ) // Must be non-zero { - PRDF_ERR( PRDF_FUNC"i_thr %d is invalid", i_thr ); + PRDF_ERR( PRDF_FUNC "i_thr %d is invalid", i_thr ); o_rc = FAIL; break; } @@ -98,14 +98,14 @@ int32_t collectCeStats( ExtensibleChip * i_mbaChip, const CenRank & i_rank, ExtensibleChip * membufChip = mbadb->getMembChip(); if ( NULL == membufChip ) { - PRDF_ERR( PRDF_FUNC"getMembChip() failed" ); + PRDF_ERR( PRDF_FUNC "getMembChip() failed" ); o_rc = FAIL; break; } uint8_t mbaPos = getTargetPosition( mbaTrgt ); if ( MAX_MBA_PER_MEMBUF <= mbaPos ) { - PRDF_ERR( PRDF_FUNC"mbaPos %d is invalid", mbaPos ); + PRDF_ERR( PRDF_FUNC "mbaPos %d is invalid", mbaPos ); o_rc = FAIL; break; } @@ -116,7 +116,7 @@ int32_t collectCeStats( ExtensibleChip * i_mbaChip, const CenRank & i_rank, o_rc = mssGetSteerMux( mbaTrgt, i_rank, sp0, sp1, ecc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetSteerMux() failed." ); + PRDF_ERR( PRDF_FUNC "mssGetSteerMux() failed." ); break; } @@ -134,7 +134,7 @@ int32_t collectCeStats( ExtensibleChip * i_mbaChip, const CenRank & i_rank, o_rc = reg->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Read() failed on %s", reg_str ); break; } @@ -164,7 +164,7 @@ int32_t collectCeStats( ExtensibleChip * i_mbaChip, const CenRank & i_rank, sym, CEN_SYMBOL::BOTH_SYMBOL_DQS ); if ( !symData.symbol.isValid() ) { - PRDF_ERR( PRDF_FUNC"CenSymbol() failed: symbol=%d", + PRDF_ERR( PRDF_FUNC "CenSymbol() failed: symbol=%d", sym ); o_rc = FAIL; break; @@ -236,7 +236,7 @@ int32_t collectCeStats( ExtensibleChip * i_mbaChip, const CenRank & i_rank, if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_mbaChip=0x%08x i_rank=m%ds%d i_thr=%d", + PRDF_ERR( PRDF_FUNC "Failed: i_mbaChip=0x%08x i_rank=m%ds%d i_thr=%d", i_mbaChip->GetId(), i_rank.getMaster(), i_rank.getSlave(), i_thr ); } @@ -258,7 +258,7 @@ int32_t clearPerSymbolCounters( ExtensibleChip * i_membChip, uint32_t i_mbaPos ) { if ( MAX_MBA_PER_MEMBUF <= i_mbaPos ) { - PRDF_ERR( PRDF_FUNC"i_mbaPos %d is invalid", i_mbaPos ); + PRDF_ERR( PRDF_FUNC "i_mbaPos %d is invalid", i_mbaPos ); o_rc = FAIL; break; } @@ -276,7 +276,7 @@ int32_t clearPerSymbolCounters( ExtensibleChip * i_membChip, uint32_t i_mbaPos ) o_rc = reg->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", reg_str ); break; } } @@ -287,7 +287,7 @@ int32_t clearPerSymbolCounters( ExtensibleChip * i_membChip, uint32_t i_mbaPos ) if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed. i_membChip=0x%08x i_mbaPos=%d", + PRDF_ERR( PRDF_FUNC "Failed. i_membChip=0x%08x i_mbaPos=%d", i_membChip->GetId(), i_mbaPos ); } @@ -312,7 +312,7 @@ int32_t getDramSize( ExtensibleChip *i_mbaChip, uint8_t & o_size ) ExtensibleChip * membufChip = mbadb->getMembChip(); if ( NULL == membufChip ) { - PRDF_ERR( PRDF_FUNC"getMembChip() failed: MBA=0x%08x", + PRDF_ERR( PRDF_FUNC "getMembChip() failed: MBA=0x%08x", getHuid(mbaTrgt) ); o_rc = FAIL; break; } @@ -324,7 +324,7 @@ int32_t getDramSize( ExtensibleChip *i_mbaChip, uint8_t & o_size ) o_rc = reg->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on %s. Target=0x%08x", + PRDF_ERR( PRDF_FUNC "Read() failed on %s. Target=0x%08x", reg_str, getHuid(mbaTrgt) ); break; } @@ -355,7 +355,7 @@ int32_t checkMcsChannelFail( ExtensibleChip * i_mcsChip, // Must be an MCS. if ( TYPE_MCS != getTargetType(i_mcsChip->GetChipHandle()) ) { - PRDF_ERR( PRDF_FUNC"i_mcsChip is not TYPE_MCS" ); + PRDF_ERR( PRDF_FUNC "i_mcsChip is not TYPE_MCS" ); o_rc = FAIL; break; } @@ -364,7 +364,7 @@ int32_t checkMcsChannelFail( ExtensibleChip * i_mcsChip, o_rc = mcifir->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on MCIFIR" ); + PRDF_ERR( PRDF_FUNC "Read() failed on MCIFIR" ); break; } @@ -380,7 +380,7 @@ int32_t checkMcsChannelFail( ExtensibleChip * i_mcsChip, ExtensibleChip * membChip = mcsdb->getMembChip(); if ( NULL == membChip ) { - PRDF_ERR( PRDF_FUNC"getMembChip() returned NULL" ); + PRDF_ERR( PRDF_FUNC "getMembChip() returned NULL" ); o_rc = FAIL; break; } CenMembufDataBundle * mbdb = getMembufDataBundle( membChip ); @@ -390,7 +390,7 @@ int32_t checkMcsChannelFail( ExtensibleChip * i_mcsChip, if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_mcsChip=0x%08x", i_mcsChip->GetId() ); + PRDF_ERR( PRDF_FUNC "Failed: i_mcsChip=0x%08x", i_mcsChip->GetId() ); } return o_rc; @@ -412,7 +412,7 @@ int32_t chnlCsCleanup( ExtensibleChip *i_mbChip, if( ( NULL == i_mbChip ) || ( TYPE_MEMBUF != getTargetType( i_mbChip->GetChipHandle() ))) { - PRDF_ERR( PRDF_FUNC"Invalid parameters" ); + PRDF_ERR( PRDF_FUNC "Invalid parameters" ); o_rc = FAIL; break; } @@ -430,7 +430,7 @@ int32_t chnlCsCleanup( ExtensibleChip *i_mbChip, ExtensibleChip * mcsChip = mbdb->getMcsChip(); if ( NULL == mcsChip ) { - PRDF_ERR( PRDF_FUNC"MCS chip is NULL for Membuf:0x%08X", + PRDF_ERR( PRDF_FUNC "MCS chip is NULL for Membuf:0x%08X", i_mbChip->GetId() ); o_rc = FAIL; break; } @@ -442,7 +442,7 @@ int32_t chnlCsCleanup( ExtensibleChip *i_mbChip, if ( NULL == proc ) { - PRDF_ERR( PRDF_FUNC"Proc is NULL for Mcs:0x%08X", getHuid( mcs ) ); + PRDF_ERR( PRDF_FUNC "Proc is NULL for Mcs:0x%08X", getHuid( mcs ) ); o_rc = FAIL; break; } @@ -450,7 +450,7 @@ int32_t chnlCsCleanup( ExtensibleChip *i_mbChip, if( NULL == procChip ) { - PRDF_ERR( PRDF_FUNC"Can not find Proc chip for HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "Can not find Proc chip for HUID:0x%08X", getHuid( proc) ); o_rc = FAIL; break; } @@ -514,7 +514,7 @@ int32_t chnlCsCleanup( ExtensibleChip *i_mbChip, int32_t l_rc = mdiaSendEventMsg( mba, MDIA::SKIP_MBA ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"mdiaSendEventMsg(0x%08x, SKIP_MBA) " + PRDF_ERR( PRDF_FUNC "mdiaSendEventMsg(0x%08x, SKIP_MBA) " "failed", getHuid( mba ) ); o_rc |= l_rc; } @@ -522,7 +522,7 @@ int32_t chnlCsCleanup( ExtensibleChip *i_mbChip, int32_t l_rc = DEALLOC::mbaGard( mbaChip ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"mbaGard failed. HUID: 0x%08x", + PRDF_ERR( PRDF_FUNC "mbaGard failed. HUID: 0x%08x", getHuid( mba ) ); o_rc |= l_rc; } diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C index 741c6fb83..b0888a826 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C @@ -253,7 +253,7 @@ int32_t PreAnalysis( ExtensibleChip * i_mbChip, STEP_CODE_DATA_STRUCT & i_sc, o_rc = fir->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed to read GLOBAL_CS_FIR on 0x%08x", + PRDF_ERR( PRDF_FUNC "Failed to read GLOBAL_CS_FIR on 0x%08x", i_mbChip->GetId() ); break; } @@ -298,13 +298,13 @@ int32_t PostAnalysis( ExtensibleChip * i_mbChip, STEP_CODE_DATA_STRUCT & i_sc ) l_rc = MemUtils::mcifirCleanup( i_mbChip, i_sc ); if( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"mcifirCleanup() failed"); + PRDF_ERR( PRDF_FUNC "mcifirCleanup() failed"); } l_rc = MemUtils::chnlCsCleanup( i_mbChip, i_sc ); if( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"ChnlCsCleanup() failed"); + PRDF_ERR( PRDF_FUNC "ChnlCsCleanup() failed"); } return SUCCESS; @@ -400,7 +400,7 @@ int32_t AnalyzeFetchMpe( ExtensibleChip * i_membChip, mbaChip = membdb->getMbaChip( i_mbaPos ); if ( NULL == mbaChip ) { - PRDF_ERR( PRDF_FUNC"getMbaChip() returned NULL" ); + PRDF_ERR( PRDF_FUNC "getMbaChip() returned NULL" ); l_rc = FAIL; break; } @@ -411,7 +411,7 @@ int32_t AnalyzeFetchMpe( ExtensibleChip * i_membChip, l_rc = getCenReadAddr( i_membChip, i_mbaPos, READ_MPE_ADDR, addr ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"getCenReadAddr() failed" ); + PRDF_ERR( PRDF_FUNC "getCenReadAddr() failed" ); break; } @@ -431,13 +431,13 @@ int32_t AnalyzeFetchMpe( ExtensibleChip * i_membChip, l_rc = mssGetMarkStore( mbaTrgt, rank, mark ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetMarkStore() failed"); + PRDF_ERR( PRDF_FUNC "mssGetMarkStore() failed"); break; } if ( !mark.getCM().isValid() ) { - PRDF_ERR( PRDF_FUNC"FIR bit set but no valid chip mark" ); + PRDF_ERR( PRDF_FUNC "FIR bit set but no valid chip mark" ); l_rc = FAIL; break; } @@ -449,7 +449,7 @@ int32_t AnalyzeFetchMpe( ExtensibleChip * i_membChip, CenMbaTdCtlrCommon::VCM_EVENT ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"handleTdEvent() failed." ); + PRDF_ERR( PRDF_FUNC "handleTdEvent() failed." ); break; } @@ -461,7 +461,7 @@ int32_t AnalyzeFetchMpe( ExtensibleChip * i_membChip, if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_membChip=0x%08x i_mbaPos=%d i_rank=%d", + PRDF_ERR( PRDF_FUNC "Failed: i_membChip=0x%08x i_mbaPos=%d i_rank=%d", i_membChip->GetId(), i_mbaPos, i_rank ); CalloutUtil::defaultError( i_sc ); } @@ -495,7 +495,7 @@ int32_t AnalyzeFetchNce( ExtensibleChip * i_membChip, mbaChip = membdb->getMbaChip( i_mbaPos ); if ( NULL == mbaChip ) { - PRDF_ERR( PRDF_FUNC"getMbaChip() returned NULL" ); + PRDF_ERR( PRDF_FUNC "getMbaChip() returned NULL" ); l_rc = FAIL; break; } TargetHandle_t mbaTrgt = mbaChip->GetChipHandle(); @@ -504,7 +504,7 @@ int32_t AnalyzeFetchNce( ExtensibleChip * i_membChip, l_rc = getCenReadAddr( i_membChip, i_mbaPos, READ_NCE_ADDR, addr ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"getCenReadAddr() failed" ); + PRDF_ERR( PRDF_FUNC "getCenReadAddr() failed" ); break; } CenRank rank = addr.getRank(); @@ -526,7 +526,7 @@ int32_t AnalyzeFetchNce( ExtensibleChip * i_membChip, l_rc = reg->Read(); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Read() failed on %s", reg_str ); break; } @@ -537,7 +537,7 @@ int32_t AnalyzeFetchNce( ExtensibleChip * i_membChip, mask ); if ( !symbol.isValid() ) { - PRDF_ERR( PRDF_FUNC"Failed to create symbol: galois=0x%02x " + PRDF_ERR( PRDF_FUNC "Failed to create symbol: galois=0x%02x " "mask=0x%02x", galois, mask ); break; } @@ -547,7 +547,7 @@ int32_t AnalyzeFetchNce( ExtensibleChip * i_membChip, l_rc = mssGetSteerMux( mbaTrgt, rank, sp0, sp1, ecc ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetSteerMux() failed. HUID: 0x%08x " + PRDF_ERR( PRDF_FUNC "mssGetSteerMux() failed. HUID: 0x%08x " "rank: %d", getHuid(mbaTrgt), rank.getMaster() ); break; } @@ -578,7 +578,7 @@ int32_t AnalyzeFetchNce( ExtensibleChip * i_membChip, l_rc = getMnfgMemCeTh( mbaChip, rank, dramTh, hrTh, dimmTh ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"getMnfgMemCeTh() failed: rank=m%ds%d", + PRDF_ERR( PRDF_FUNC "getMnfgMemCeTh() failed: rank=m%ds%d", rank.getMaster(), rank.getSlave() ); break; } @@ -659,7 +659,7 @@ int32_t AnalyzeFetchNce( ExtensibleChip * i_membChip, CenMbaTdCtlrCommon::TPS_EVENT ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"handleTdEvent() failed: rank=m%ds%d", + PRDF_ERR( PRDF_FUNC "handleTdEvent() failed: rank=m%ds%d", rank.getMaster(), rank.getSlave() ); break; } @@ -674,7 +674,7 @@ int32_t AnalyzeFetchNce( ExtensibleChip * i_membChip, if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_membChip=0x%08x i_mbaPos=%d", + PRDF_ERR( PRDF_FUNC "Failed: i_membChip=0x%08x i_mbaPos=%d", i_membChip->GetId(), i_mbaPos ); CalloutUtil::defaultError( i_sc ); } @@ -710,7 +710,7 @@ int32_t AnalyzeFetchRcePue( ExtensibleChip * i_membChip, mbaChip = membdb->getMbaChip( i_mbaPos ); if ( NULL == mbaChip ) { - PRDF_ERR( PRDF_FUNC"getMbaChip() returned NULL" ); + PRDF_ERR( PRDF_FUNC "getMbaChip() returned NULL" ); l_rc = FAIL; break; } @@ -726,7 +726,7 @@ int32_t AnalyzeFetchRcePue( ExtensibleChip * i_membChip, l_rc = getCenReadAddr( i_membChip, i_mbaPos, READ_UE_ADDR, addr ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"getCenReadAddr() failed" ); + PRDF_ERR( PRDF_FUNC "getCenReadAddr() failed" ); break; } CenRank rank = addr.getRank(); @@ -744,7 +744,7 @@ int32_t AnalyzeFetchRcePue( ExtensibleChip * i_membChip, CenMbaTdCtlrCommon::TPS_EVENT ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"handleTdEvent() failed." ); + PRDF_ERR( PRDF_FUNC "handleTdEvent() failed." ); break; } } @@ -757,7 +757,7 @@ int32_t AnalyzeFetchRcePue( ExtensibleChip * i_membChip, if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_membChip=0x%08x i_mbaPos=%d " + PRDF_ERR( PRDF_FUNC "Failed: i_membChip=0x%08x i_mbaPos=%d " "i_isRceError=%c", i_membChip->GetId(), i_mbaPos, i_isRceError ? 'T' : 'F' ); CalloutUtil::defaultError( i_sc ); @@ -797,7 +797,7 @@ int32_t AnalyzeFetchUe( ExtensibleChip * i_membChip, mbaChip = membdb->getMbaChip( i_mbaPos ); if ( NULL == mbaChip ) { - PRDF_ERR( PRDF_FUNC"getMbaChip() returned NULL" ); + PRDF_ERR( PRDF_FUNC "getMbaChip() returned NULL" ); l_rc = FAIL; break; } @@ -805,7 +805,7 @@ int32_t AnalyzeFetchUe( ExtensibleChip * i_membChip, l_rc = getCenReadAddr( i_membChip, i_mbaPos, READ_UE_ADDR, addr ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"getCenReadAddr() failed" ); + PRDF_ERR( PRDF_FUNC "getCenReadAddr() failed" ); break; } CenRank rank = addr.getRank(); @@ -828,7 +828,7 @@ int32_t AnalyzeFetchUe( ExtensibleChip * i_membChip, true ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"handleTdEvent() failed: rank=m%ds%d", + PRDF_ERR( PRDF_FUNC "handleTdEvent() failed: rank=m%ds%d", rank.getMaster(), rank.getSlave() ); // We are not adding break here as we still want to do lmbGard // If you want to add any code after this which depends on @@ -840,7 +840,7 @@ int32_t AnalyzeFetchUe( ExtensibleChip * i_membChip, int32_t lmbRc = DEALLOC::lmbGard( mbaChip, addr ); if ( SUCCESS != lmbRc ) { - PRDF_ERR( PRDF_FUNC"lmbGard() failed" ); + PRDF_ERR( PRDF_FUNC "lmbGard() failed" ); l_rc = lmbRc; break; } #endif @@ -854,7 +854,7 @@ int32_t AnalyzeFetchUe( ExtensibleChip * i_membChip, if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_membChip=0x%08x i_mbaPos=%d", + PRDF_ERR( PRDF_FUNC "Failed: i_membChip=0x%08x i_mbaPos=%d", i_membChip->GetId(), i_mbaPos ); CalloutUtil::defaultError( i_sc ); } @@ -891,7 +891,7 @@ int32_t ClearMbsSecondaryBits( ExtensibleChip * i_chip, l_rc |= mbsFirMask->Read(); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"MBSFIR/MBSFIR_MASK read failed" + PRDF_ERR( PRDF_FUNC "MBSFIR/MBSFIR_MASK read failed" "for 0x%08x", i_chip->GetId()); break; } @@ -916,7 +916,7 @@ int32_t ClearMbsSecondaryBits( ExtensibleChip * i_chip, // Do not break from here, just print error trace. // If there are other secondary bits ( e.g. 26, 27 ), // we want to clear them. - PRDF_ERR( PRDF_FUNC"MBIFIR/MASK read failed" + PRDF_ERR( PRDF_FUNC "MBIFIR/MASK read failed" "for 0x%08x", i_chip->GetId()); } else if ( mbiFir->IsBitSet( 0 ) && ( ! mbiFirMask->IsBitSet( 0 )) ) @@ -929,7 +929,7 @@ int32_t ClearMbsSecondaryBits( ExtensibleChip * i_chip, l_rc = mbsFirAnd->Write(); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"MBSFIR_AND write failed" + PRDF_ERR( PRDF_FUNC "MBSFIR_AND write failed" "for 0x%08x", i_chip->GetId()); break; } @@ -965,7 +965,7 @@ int32_t ClearMbaCalSecondaryBits( ExtensibleChip * i_chip, l_rc |= mbsFirMask->Read(); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"MBSFIR/MBSFIR_MASK read failed" + PRDF_ERR( PRDF_FUNC "MBSFIR/MBSFIR_MASK read failed" "for 0x%08x", i_chip->GetId()); break; } @@ -984,7 +984,7 @@ int32_t ClearMbaCalSecondaryBits( ExtensibleChip * i_chip, { // Do not break. Just print error trace and look for // other MBA. - PRDF_ERR( PRDF_FUNC"MBACALFIR read failed" + PRDF_ERR( PRDF_FUNC "MBACALFIR read failed" "for 0x%08x", mbaChip->GetId()); continue; } @@ -1005,7 +1005,7 @@ int32_t ClearMbaCalSecondaryBits( ExtensibleChip * i_chip, { // Do not break. Just print error trace and look for // other MBA. - PRDF_ERR( PRDF_FUNC"MBACALFIR_AND write failed" + PRDF_ERR( PRDF_FUNC "MBACALFIR_AND write failed" "for 0x%08x", mbaChip->GetId()); } } @@ -1040,7 +1040,7 @@ int32_t MaskMbsSecondaryBits( ExtensibleChip * i_chip, l_rc = mbsFirMaskOr->Write(); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"MBSFIR_MASK_OR write failed" + PRDF_ERR( PRDF_FUNC "MBSFIR_MASK_OR write failed" "for 0x%08x", i_chip->GetId()); break; } @@ -1086,7 +1086,7 @@ int32_t MaskMbaCalSecondaryBits( ExtensibleChip * i_chip, { // Do not break. Just print error trace and look for // other MBA. - PRDF_ERR( PRDF_FUNC"MBACALFIR_MASK_OR write failed" + PRDF_ERR( PRDF_FUNC "MBACALFIR_MASK_OR write failed" "for 0x%08x", mbaChip->GetId()); } } @@ -1138,7 +1138,7 @@ int32_t handleMcsChnlCs( ExtensibleChip * i_membChip, if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"MCIFIR/MCIFIR_MASK read failed for 0x%08x", + PRDF_ERR( PRDF_FUNC "MCIFIR/MCIFIR_MASK read failed for 0x%08x", mcsChip->GetId()); break; } @@ -1236,7 +1236,7 @@ int32_t CaptureL4CacheErr( ExtensibleChip * i_mbChip, if ( SUCCESS != mbcelogReg->Write() ) { - PRDF_ERR( PRDF_FUNC"MBCELOG write failed for 0x%08x", + PRDF_ERR( PRDF_FUNC "MBCELOG write failed for 0x%08x", i_mbChip->GetId()); break; } diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C index 53a2d8370..c8923a5f3 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C @@ -70,7 +70,7 @@ int32_t QueryPll( ExtensibleChip * i_chip, rc = TP_LFIR->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"TP_LFIR read failed" + PRDF_ERR(PRDF_FUNC "TP_LFIR read failed" "for 0x%08x", i_chip->GetId()); break; } @@ -78,7 +78,7 @@ int32_t QueryPll( ExtensibleChip * i_chip, rc = TP_LFIRmask->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"TP_LFIR_MASK read failed" + PRDF_ERR(PRDF_FUNC "TP_LFIR_MASK read failed" "for 0x%08x", i_chip->GetId()); break; } @@ -121,7 +121,7 @@ int32_t ClearPll( ExtensibleChip * i_chip, rc = TP_LFIR->Write(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"TP_LFIR_AND write failed" + PRDF_ERR(PRDF_FUNC "TP_LFIR_AND write failed" "for 0x%08x", i_chip->GetId()); } } @@ -155,7 +155,7 @@ int32_t MaskPll( ExtensibleChip * i_chip,void * unused) rc = TP_LFIR_maskOr->Write(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"TP_LFIR_MASK_OR write failed" + PRDF_ERR(PRDF_FUNC "TP_LFIR_MASK_OR write failed" "for 0x%08x", i_chip->GetId()); } diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenSymbol.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenSymbol.C index 4f4974d50..fc82d231b 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenSymbol.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenSymbol.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -67,7 +67,7 @@ CenSymbol CenSymbol::fromSymbol( TargetHandle_t i_mba, const CenRank & i_rank, { if ( TYPE_MBA != getTargetType(i_mba) ) { - PRDF_ERR( PRDF_FUNC"i_mba is invalid: i_mba=0x%08x", + PRDF_ERR( PRDF_FUNC "i_mba is invalid: i_mba=0x%08x", getHuid(i_mba) ); break; } @@ -76,13 +76,13 @@ CenSymbol CenSymbol::fromSymbol( TargetHandle_t i_mba, const CenRank & i_rank, int32_t l_rc = getWiringType( i_mba, i_rank, wiringType ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"getWiringType() failed" ); + PRDF_ERR( PRDF_FUNC "getWiringType() failed" ); break; } if ( BOTH_SYMBOL_DQS < i_pins ) { - PRDF_ERR( PRDF_FUNC"i_pins is invalid" ); + PRDF_ERR( PRDF_FUNC "i_pins is invalid" ); break; } @@ -109,7 +109,7 @@ CenSymbol CenSymbol::fromDimmDq( TargetHandle_t i_mba, const CenRank & i_rank, { if ( TYPE_MBA != getTargetType(i_mba) ) { - PRDF_ERR( PRDF_FUNC"i_mba is invalid" ); + PRDF_ERR( PRDF_FUNC "i_mba is invalid" ); break; } @@ -117,7 +117,7 @@ CenSymbol CenSymbol::fromDimmDq( TargetHandle_t i_mba, const CenRank & i_rank, int32_t l_rc = getWiringType( i_mba, i_rank, wiringType ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"getWiringType() failed" ); + PRDF_ERR( PRDF_FUNC "getWiringType() failed" ); break; } @@ -125,7 +125,7 @@ CenSymbol CenSymbol::fromDimmDq( TargetHandle_t i_mba, const CenRank & i_rank, l_rc = getSymbol( i_rank, wiringType, i_dimmDq, i_portSlct, symbol ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"getSymbol() failed" ); + PRDF_ERR( PRDF_FUNC "getSymbol() failed" ); break; } @@ -155,7 +155,7 @@ CenSymbol CenSymbol::fromGalois( TargetHandle_t i_mba, const CenRank & i_rank, { if ( TYPE_MBA != getTargetType(i_mba) ) { - PRDF_ERR( PRDF_FUNC"i_mba=0x%08x is invalid", getHuid(i_mba) ); + PRDF_ERR( PRDF_FUNC "i_mba=0x%08x is invalid", getHuid(i_mba) ); break; } @@ -163,7 +163,7 @@ CenSymbol CenSymbol::fromGalois( TargetHandle_t i_mba, const CenRank & i_rank, int32_t l_rc = getWiringType( i_mba, i_rank, wiringType ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"getWiringType() failed" ); + PRDF_ERR( PRDF_FUNC "getWiringType() failed" ); break; } @@ -211,7 +211,7 @@ int32_t CenSymbol::getWiringType( TargetHandle_t i_mba, const CenRank & i_rank, if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC" isMembufOnDimm() Failed " ); + PRDF_ERR( PRDF_FUNC " isMembufOnDimm() Failed " ); break; } @@ -222,7 +222,7 @@ int32_t CenSymbol::getWiringType( TargetHandle_t i_mba, const CenRank & i_rank, if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getMemBufRawCardType returned error" ); + PRDF_ERR( PRDF_FUNC "getMemBufRawCardType returned error" ); o_type = WIRING_INVALID; break; } @@ -258,13 +258,13 @@ int32_t CenSymbol::getSymbol( const CenRank & i_rank, WiringType i_wiringType, { if ( DQS_PER_DIMM <= i_dimmDq ) { - PRDF_ERR( PRDF_FUNC"i_dimmDq is invalid" ); + PRDF_ERR( PRDF_FUNC "i_dimmDq is invalid" ); o_rc = FAIL; break; } if ( PORT_SLCT_PER_MBA <= i_portSlct ) { - PRDF_ERR( PRDF_FUNC"i_portSlct is invalid" ); + PRDF_ERR( PRDF_FUNC "i_portSlct is invalid" ); o_rc = FAIL; break; } @@ -280,7 +280,7 @@ int32_t CenSymbol::getSymbol( const CenRank & i_rank, WiringType i_wiringType, if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_rank=M%dS%d i_wiringType=%d i_dimmDq=%d " + PRDF_ERR( PRDF_FUNC "Failed: i_rank=M%dS%d i_wiringType=%d i_dimmDq=%d " "i_portSlct=%d", i_rank.getMaster(), i_rank.getSlave(), i_wiringType, i_dimmDq, i_portSlct ); } @@ -301,7 +301,7 @@ int32_t CenSymbol::setPins( uint8_t i_pins ) { if ( BOTH_SYMBOL_DQS < i_pins ) { - PRDF_ERR( PRDF_FUNC"i_pins %u is invalid", i_pins ); + PRDF_ERR( PRDF_FUNC "i_pins %u is invalid", i_pins ); o_rc = FAIL; break; } diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfLaneRepair.C b/src/usr/diag/prdf/common/plat/pegasus/prdfLaneRepair.C index 8d49f8324..5eeeef810 100644 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfLaneRepair.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfLaneRepair.C @@ -91,7 +91,7 @@ int32_t handleLaneRepairEvent( ExtensibleChip * i_chip, i_busType, i_busPos ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"getBusEndpoints() failed" ); + PRDF_ERR( PRDF_FUNC "getBusEndpoints() failed" ); break; } @@ -99,7 +99,7 @@ int32_t handleLaneRepairEvent( ExtensibleChip * i_chip, l_rc = readErepair(rxBusTgt, rx_lanes); if (SUCCESS != l_rc) { - PRDF_ERR( PRDF_FUNC"readErepair() failed: rxBusTgt=0x%08x", + PRDF_ERR( PRDF_FUNC "readErepair() failed: rxBusTgt=0x%08x", getHuid(rxBusTgt) ); break; } @@ -108,7 +108,7 @@ int32_t handleLaneRepairEvent( ExtensibleChip * i_chip, for (std::vector<uint8_t>::iterator lane = rx_lanes.begin(); lane != rx_lanes.end(); ++lane) { - PRDF_INF( PRDF_FUNC"New failed lane on RX HUID 0x%08x: %d", + PRDF_INF( PRDF_FUNC "New failed lane on RX HUID 0x%08x: %d", getHuid(rxBusTgt), *lane); if (*lane < 64) l_newLaneMap0to63.Set(*lane); @@ -116,7 +116,7 @@ int32_t handleLaneRepairEvent( ExtensibleChip * i_chip, l_newLaneMap64to127.Set(*lane - 64); else { - PRDF_ERR( PRDF_FUNC"Invalid lane number %d: rxBusTgt=0x%08x", + PRDF_ERR( PRDF_FUNC "Invalid lane number %d: rxBusTgt=0x%08x", *lane, getHuid(rxBusTgt) ); l_rc = FAIL; break; } @@ -139,7 +139,7 @@ int32_t handleLaneRepairEvent( ExtensibleChip * i_chip, l_rc = getVpdFailedLanes(rxBusTgt, rx_vpdLanes, tx_vpdLanes); if (SUCCESS != l_rc) { - PRDF_ERR( PRDF_FUNC"getVpdFailedLanes() failed: " + PRDF_ERR( PRDF_FUNC "getVpdFailedLanes() failed: " "rxBusTgt=0x%08x", getHuid(rxBusTgt) ); break; } @@ -154,7 +154,7 @@ int32_t handleLaneRepairEvent( ExtensibleChip * i_chip, l_vpdLaneMap64to127.Set(*lane - 64); else { - PRDF_ERR( PRDF_FUNC"Invalid VPD lane number %d: " + PRDF_ERR( PRDF_FUNC "Invalid VPD lane number %d: " "rxBusTgt=0x%08x", *lane, getHuid(rxBusTgt) ); l_rc = FAIL; break; } @@ -178,7 +178,7 @@ int32_t handleLaneRepairEvent( ExtensibleChip * i_chip, rx_lanes, thrExceeded); if (SUCCESS != l_rc) { - PRDF_ERR( PRDF_FUNC"setVpdFailedLanes() failed: " + PRDF_ERR( PRDF_FUNC "setVpdFailedLanes() failed: " "rxBusTgt=0x%08x txBusTgt=0x%08x", getHuid(rxBusTgt), getHuid(txBusTgt) ); break; @@ -198,7 +198,7 @@ int32_t handleLaneRepairEvent( ExtensibleChip * i_chip, l_rc = getVpdFailedLanes(rxBusTgt, rx_vpdLanes, tx_vpdLanes); if (SUCCESS != l_rc) { - PRDF_ERR( PRDF_FUNC"getVpdFailedLanes() before power down " + PRDF_ERR( PRDF_FUNC "getVpdFailedLanes() before power down " "failed: rxBusTgt=0x%08x", getHuid(rxBusTgt) ); break; } @@ -207,7 +207,7 @@ int32_t handleLaneRepairEvent( ExtensibleChip * i_chip, l_rc = powerDownLanes(rxBusTgt, rx_vpdLanes, tx_vpdLanes); if (SUCCESS != l_rc) { - PRDF_ERR( PRDF_FUNC"powerDownLanes() failed: rxBusTgt=0x%08x", + PRDF_ERR( PRDF_FUNC "powerDownLanes() failed: rxBusTgt=0x%08x", getHuid(rxBusTgt) ); break; } @@ -237,7 +237,7 @@ int32_t handleLaneRepairEvent( ExtensibleChip * i_chip, // return SUCCESS. if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"i_chip: 0x%08x i_busType:%d i_busPos:%d", + PRDF_ERR( PRDF_FUNC "i_chip: 0x%08x i_busType:%d i_busPos:%d", i_chip->GetId(), i_busType, i_busPos ); i_sc.service_data->SetErrorSig( PRDFSIG_ERepair_ERROR ); diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfMemoryMru.C b/src/usr/diag/prdf/common/plat/pegasus/prdfMemoryMru.C index 134b1b39c..bb50bcb99 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfMemoryMru.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfMemoryMru.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2008,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2015 */ +/* [+] 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. */ @@ -62,7 +64,7 @@ MemoryMru::MemoryMru( uint32_t i_memMru ) : if ( NULL == system ) { - PRDF_ERR( PRDF_FUNC"Could not find system target" ); + PRDF_ERR( PRDF_FUNC "Could not find system target" ); break; } @@ -70,7 +72,7 @@ MemoryMru::MemoryMru( uint32_t i_memMru ) : iv_memMruMeld.s.nodePos ); if ( NULL == node ) { - PRDF_ERR( PRDF_FUNC"Could not find functional node attached to " + PRDF_ERR( PRDF_FUNC "Could not find functional node attached to " "system at pos: %u", iv_memMruMeld.s.nodePos ); break; } @@ -79,7 +81,7 @@ MemoryMru::MemoryMru( uint32_t i_memMru ) : iv_memMruMeld.s.procPos ); if ( NULL == proc ) { - PRDF_ERR( PRDF_FUNC"Could not find functional proc attached to " + PRDF_ERR( PRDF_FUNC "Could not find functional proc attached to " "node 0x%08X at pos: %u", getHuid( node ), iv_memMruMeld.s.procPos ); break; @@ -89,7 +91,7 @@ MemoryMru::MemoryMru( uint32_t i_memMru ) : iv_memMruMeld.s.cenPos ); if ( NULL == membuff ) { - PRDF_ERR( PRDF_FUNC"Could not find functional membuff attached to " + PRDF_ERR( PRDF_FUNC "Could not find functional membuff attached to " "proc 0x%08X at pos: %u", getHuid( proc ), iv_memMruMeld.s.cenPos ); break; @@ -99,7 +101,7 @@ MemoryMru::MemoryMru( uint32_t i_memMru ) : iv_memMruMeld.s.mbaPos ); if ( NULL == iv_mbaTarget ) { - PRDF_ERR( PRDF_FUNC"Could not find functional MBA attached to " + PRDF_ERR( PRDF_FUNC "Could not find functional MBA attached to " "membuff 0x%08X at pos: %u", getHuid( membuff ), iv_memMruMeld.s.mbaPos ); break; @@ -121,7 +123,7 @@ MemoryMru::MemoryMru( uint32_t i_memMru ) : { if ( SYMBOLS_PER_RANK <= iv_memMruMeld.s.symbol ) { - PRDF_ERR( PRDF_FUNC"Invalid symbol value :%u", + PRDF_ERR( PRDF_FUNC "Invalid symbol value :%u", iv_memMruMeld.s.symbol ); break; } @@ -131,7 +133,7 @@ MemoryMru::MemoryMru( uint32_t i_memMru ) : iv_memMruMeld.s.pins ); if ( !iv_symbol.isValid() ) { - PRDF_ERR( PRDF_FUNC"fromSymbol() failed" ); + PRDF_ERR( PRDF_FUNC "fromSymbol() failed" ); break; } @@ -143,7 +145,7 @@ MemoryMru::MemoryMru( uint32_t i_memMru ) : if ( type != CEN_SYMBOL::WiringType (iv_memMruMeld.s.wiringType)) { - PRDF_ERR( PRDF_FUNC"Wiring Type does not match type:%u " + PRDF_ERR( PRDF_FUNC "Wiring Type does not match type:%u " "iv_memMruMeld.s.wiringType :%u", type, iv_memMruMeld.s.wiringType); break; @@ -175,7 +177,7 @@ MemoryMru::MemoryMru( TARGETING::TargetHandle_t i_mbaTarget, TargetHandle_t node = getConnectedParent( iv_mbaTarget, TYPE_NODE ); if ( NULL == node ) { - PRDF_ERR( PRDF_FUNC"Could not find node attached to MBA 0x%08x", + PRDF_ERR( PRDF_FUNC "Could not find node attached to MBA 0x%08x", getHuid(iv_mbaTarget) ); break; } @@ -183,7 +185,7 @@ MemoryMru::MemoryMru( TARGETING::TargetHandle_t i_mbaTarget, TargetHandle_t proc = getConnectedParent( iv_mbaTarget, TYPE_PROC ); if ( NULL == proc ) { - PRDF_ERR( PRDF_FUNC"Could not find proc attached to MBA 0x%08x", + PRDF_ERR( PRDF_FUNC "Could not find proc attached to MBA 0x%08x", getHuid(iv_mbaTarget) ); break; } @@ -192,7 +194,7 @@ MemoryMru::MemoryMru( TARGETING::TargetHandle_t i_mbaTarget, TYPE_MEMBUF ); if ( NULL == memBuff ) { - PRDF_ERR( PRDF_FUNC"Could not find memBuff attached to MBA 0x%08x", + PRDF_ERR( PRDF_FUNC "Could not find memBuff attached to MBA 0x%08x", getHuid(iv_mbaTarget) ); break; } @@ -233,7 +235,7 @@ MemoryMru::MemoryMru( TARGETING::TargetHandle_t i_mbaTarget, TargetHandle_t node = getConnectedParent( iv_mbaTarget, TYPE_NODE ); if ( NULL == node ) { - PRDF_ERR( PRDF_FUNC"Could not find node attached to MBA 0x%08x", + PRDF_ERR( PRDF_FUNC "Could not find node attached to MBA 0x%08x", getHuid(iv_mbaTarget) ); break; } @@ -241,7 +243,7 @@ MemoryMru::MemoryMru( TARGETING::TargetHandle_t i_mbaTarget, TargetHandle_t proc = getConnectedParent( iv_mbaTarget, TYPE_PROC ); if ( NULL == proc ) { - PRDF_ERR( PRDF_FUNC"Could not find proc attached to MBA 0x%08x", + PRDF_ERR( PRDF_FUNC "Could not find proc attached to MBA 0x%08x", getHuid(iv_mbaTarget) ); break; } @@ -250,7 +252,7 @@ MemoryMru::MemoryMru( TARGETING::TargetHandle_t i_mbaTarget, TYPE_MEMBUF ); if ( NULL == memBuff ) { - PRDF_ERR( PRDF_FUNC"Could not find memBuff attached to MBA 0x%08x", + PRDF_ERR( PRDF_FUNC "Could not find memBuff attached to MBA 0x%08x", getHuid(iv_mbaTarget) ); break; } @@ -282,7 +284,7 @@ TargetHandleList MemoryMru::getCalloutList() const if ( 0 == iv_memMruMeld.s.valid ) { - PRDF_ERR( PRDF_FUNC"MemoryMru 0x%08x not valid.", iv_memMruMeld.u ); + PRDF_ERR( PRDF_FUNC "MemoryMru 0x%08x not valid.", iv_memMruMeld.u ); } else { @@ -303,7 +305,7 @@ TargetHandleList MemoryMru::getCalloutList() const o_list = CalloutUtil::getConnectedDimms( iv_mbaTarget ); break; default: - PRDF_ERR( PRDF_FUNC"MemoryMruData::Callout 0x%02x not " + PRDF_ERR( PRDF_FUNC "MemoryMruData::Callout 0x%02x not " "supported", iv_special ); } } diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Mcs.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Mcs.C index 2a02f74c2..4185d4949 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Mcs.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Mcs.C @@ -129,7 +129,7 @@ int32_t PostAnalysis( ExtensibleChip * i_mcsChip, l_rc = MemUtils::chnlCsCleanup( membChip, i_sc ); if( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"ChnlCsCleanup() failed for Membuf:0x%08X", + PRDF_ERR( PRDF_FUNC "ChnlCsCleanup() failed for Membuf:0x%08X", membChip->GetId() ); } } @@ -193,7 +193,7 @@ int32_t ClearMbsSecondaryBits( ExtensibleChip * i_chip, if( NULL == mbsAndFir ) { - PRDF_ERR( PRDF_FUNC"Can not find MBSFIR_AND " + PRDF_ERR( PRDF_FUNC "Can not find MBSFIR_AND " "for 0x%08x", membChip->GetId()); break; } @@ -204,7 +204,7 @@ int32_t ClearMbsSecondaryBits( ExtensibleChip * i_chip, l_rc = mbsAndFir->Write(); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"MBSFIR_AND write failed" + PRDF_ERR( PRDF_FUNC "MBSFIR_AND write failed" "for 0x%08x", membChip->GetId()); break; } @@ -310,7 +310,7 @@ int32_t handleMirrorAction( ExtensibleChip * i_mcsChip, ExtensibleChip * primcs = mcsdb->getPrimaryMirroredMcs(); if ( NULL == primcs ) { - PRDF_ERR( PRDF_FUNC"getPrimaryMirroredMcs() failed: " + PRDF_ERR( PRDF_FUNC "getPrimaryMirroredMcs() failed: " "i_mcsChip=0x%08x", i_mcsChip->GetId() ); break; } @@ -323,7 +323,7 @@ int32_t handleMirrorAction( ExtensibleChip * i_mcsChip, l_rc = reg->Read(); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on MCHWFM: primcs=0x%08x", + PRDF_ERR( PRDF_FUNC "Read() failed on MCHWFM: primcs=0x%08x", primcs->GetId() ); break; } @@ -352,7 +352,7 @@ int32_t handleMirrorAction( ExtensibleChip * i_mcsChip, l_rc = reg->Write(); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on MCHWFM: primcs=0x%08x", + PRDF_ERR( PRDF_FUNC "Write() failed on MCHWFM: primcs=0x%08x", primcs->GetId() ); break; } diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C index 1ded118ac..de3eabb0c 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C @@ -92,7 +92,7 @@ void GetProcPllErrRegList(ExtensibleChip * i_chip, TargetHandleList::iterator itr = exList.begin(); for( ; itr != exList.end(); ++itr) { - PRDF_DTRAC(PRDF_FUNC"EX: 0x%.8X", getHuid(*itr)); + PRDF_DTRAC(PRDF_FUNC "EX: 0x%.8X", getHuid(*itr)); exChip = (ExtensibleChip *)systemPtr->GetChip( *itr ); if( NULL == exChip ) continue; @@ -142,7 +142,7 @@ int32_t QueryProcPll( ExtensibleChip * i_chip, rc = (*itr).errReg->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"ERROR_REG read failed" + PRDF_ERR(PRDF_FUNC "ERROR_REG read failed" "for chip: 0x%08x, type: 0x%08x", (*itr).chip->GetId(), (*itr).type); break; @@ -151,7 +151,7 @@ int32_t QueryProcPll( ExtensibleChip * i_chip, rc = (*itr).configReg->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"CONFIG_REG read failed" + PRDF_ERR(PRDF_FUNC "CONFIG_REG read failed" "for chip: 0x%08x, type: 0x%08x", (*itr).chip->GetId(), (*itr).type); break; @@ -187,7 +187,7 @@ int32_t QueryProcPll( ExtensibleChip * i_chip, if( rc != SUCCESS ) { - PRDF_ERR(PRDF_FUNC"failed for proc: 0x%.8X", + PRDF_ERR(PRDF_FUNC "failed for proc: 0x%.8X", i_chip->GetId()); } @@ -222,7 +222,7 @@ int32_t QueryPll( ExtensibleChip * i_chip, rc = TP_LFIR->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"TP_LFIR read failed" + PRDF_ERR(PRDF_FUNC "TP_LFIR read failed" "for 0x%08x", i_chip->GetId()); break; } @@ -230,7 +230,7 @@ int32_t QueryPll( ExtensibleChip * i_chip, rc = TP_LFIRmask->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"TP_LFIR_MASK read failed" + PRDF_ERR(PRDF_FUNC "TP_LFIR_MASK read failed" "for 0x%08x", i_chip->GetId()); break; } @@ -249,7 +249,7 @@ int32_t QueryPll( ExtensibleChip * i_chip, if( rc != SUCCESS ) { - PRDF_ERR(PRDF_FUNC"failed for proc: 0x%.8X", + PRDF_ERR(PRDF_FUNC "failed for proc: 0x%.8X", i_chip->GetId()); } @@ -297,7 +297,7 @@ int32_t ClearPll( ExtensibleChip * i_chip, tmpRC = (*itr).errReg->Write(); if (tmpRC != SUCCESS) { - PRDF_ERR(PRDF_FUNC"ERROR_REG write failed" + PRDF_ERR(PRDF_FUNC "ERROR_REG write failed" "for chip: 0x%08x, type: 0x%08x", (*itr).chip->GetId(), (*itr).type); rc |= tmpRC; @@ -312,7 +312,7 @@ int32_t ClearPll( ExtensibleChip * i_chip, tmpRC = TP_LFIRand->Write(); if (tmpRC != SUCCESS) { - PRDF_ERR(PRDF_FUNC"TP_LFIR_AND write failed" + PRDF_ERR(PRDF_FUNC "TP_LFIR_AND write failed" "for chip: 0x%08x", i_chip->GetId()); rc |= tmpRC; } @@ -325,7 +325,7 @@ int32_t ClearPll( ExtensibleChip * i_chip, if( rc != SUCCESS ) { - PRDF_ERR(PRDF_FUNC"failed for proc: 0x%.8X", + PRDF_ERR(PRDF_FUNC "failed for proc: 0x%.8X", i_chip->GetId()); } @@ -376,7 +376,7 @@ int32_t MaskPll( ExtensibleChip * i_chip, tmpRC = (*itr).configReg->Write(); if (tmpRC != SUCCESS) { - PRDF_ERR(PRDF_FUNC"CONFIG_REG write failed" + PRDF_ERR(PRDF_FUNC "CONFIG_REG write failed" "for chip: 0x%08x, type: 0x%08x", (*itr).chip->GetId(), (*itr).type); rc |= tmpRC; @@ -396,7 +396,7 @@ int32_t MaskPll( ExtensibleChip * i_chip, if( rc != SUCCESS ) { - PRDF_ERR(PRDF_FUNC"failed for proc: 0x%.8X", + PRDF_ERR(PRDF_FUNC "failed for proc: 0x%.8X", i_chip->GetId()); } @@ -498,7 +498,7 @@ int32_t CheckParityErr( ExtensibleChip * i_chip, rc = pciErrReg->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"PCI_ERROR_REG read failed" + PRDF_ERR(PRDF_FUNC "PCI_ERROR_REG read failed" "for 0x%08x", i_chip->GetId()); break; } @@ -506,7 +506,7 @@ int32_t CheckParityErr( ExtensibleChip * i_chip, rc = pciConfigReg->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"PCI_CONFIG_REG read failed" + PRDF_ERR(PRDF_FUNC "PCI_CONFIG_REG read failed" "for 0x%08x", i_chip->GetId()); break; } @@ -530,7 +530,7 @@ int32_t CheckParityErr( ExtensibleChip * i_chip, rc = (*itr).errReg->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"ERROR_REG read failed" + PRDF_ERR(PRDF_FUNC "ERROR_REG read failed" "for chip: 0x%08x, type: 0x%08x", (*itr).chip->GetId(), (*itr).type); break; @@ -539,7 +539,7 @@ int32_t CheckParityErr( ExtensibleChip * i_chip, rc = (*itr).configReg->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"CONFIG_REG read failed" + PRDF_ERR(PRDF_FUNC "CONFIG_REG read failed" "for chip: 0x%08x, type: 0x%08x", (*itr).chip->GetId(), (*itr).type); break; @@ -557,13 +557,13 @@ int32_t CheckParityErr( ExtensibleChip * i_chip, if( ! o_parityErr ) { - PRDF_ERR(PRDF_FUNC"no parity error found for proc: 0x%.8X", + PRDF_ERR(PRDF_FUNC "no parity error found for proc: 0x%.8X", i_chip->GetId()); } if( rc != SUCCESS ) { - PRDF_ERR(PRDF_FUNC"failed for proc: 0x%.8X", i_chip->GetId()); + PRDF_ERR(PRDF_FUNC "failed for proc: 0x%.8X", i_chip->GetId()); } return rc; @@ -614,7 +614,7 @@ int32_t MaskParityErr( ExtensibleChip * i_chip, tmpRC = (*itr).configReg->Write(); if (tmpRC != SUCCESS) { - PRDF_ERR(PRDF_FUNC"CONFIG_REG write failed" + PRDF_ERR(PRDF_FUNC "CONFIG_REG write failed" "for chip: 0x%08x, type: 0x%08x", (*itr).chip->GetId(), (*itr).type); rc |= tmpRC; @@ -635,7 +635,7 @@ int32_t MaskParityErr( ExtensibleChip * i_chip, tmpRC = pciConfigReg->Write(); if (tmpRC != SUCCESS) { - PRDF_ERR(PRDF_FUNC"PCI_CONFIG_REG write failed" + PRDF_ERR(PRDF_FUNC "PCI_CONFIG_REG write failed" "for 0x%08x", i_chip->GetId()); rc |= tmpRC; } @@ -649,7 +649,7 @@ int32_t MaskParityErr( ExtensibleChip * i_chip, if( rc != SUCCESS ) { - PRDF_ERR(PRDF_FUNC"failed for proc: 0x%.8X", + PRDF_ERR(PRDF_FUNC "failed for proc: 0x%.8X", i_chip->GetId()); } @@ -692,7 +692,7 @@ int32_t ClearParityErr( ExtensibleChip * i_chip, tmpRC = (*itr).errReg->Write(); if (tmpRC != SUCCESS) { - PRDF_ERR(PRDF_FUNC"ERROR_REG write failed" + PRDF_ERR(PRDF_FUNC "ERROR_REG write failed" "for chip: 0x%08x, type: 0x%08x", (*itr).chip->GetId(), (*itr).type); rc |= tmpRC; @@ -706,7 +706,7 @@ int32_t ClearParityErr( ExtensibleChip * i_chip, tmpRC = pciErrReg->Write(); if (tmpRC != SUCCESS) { - PRDF_ERR(PRDF_FUNC"PCI_ERROR_REG write failed" + PRDF_ERR(PRDF_FUNC "PCI_ERROR_REG write failed" "for 0x%08x", i_chip->GetId()); rc |= tmpRC; } @@ -720,7 +720,7 @@ int32_t ClearParityErr( ExtensibleChip * i_chip, tmpRC = TP_LFIR_and->Write(); if (tmpRC != SUCCESS) { - PRDF_ERR(PRDF_FUNC"TP_LFIR_AND write failed" + PRDF_ERR(PRDF_FUNC "TP_LFIR_AND write failed" "for 0x%08x", i_chip->GetId()); rc |= tmpRC; } @@ -728,7 +728,7 @@ int32_t ClearParityErr( ExtensibleChip * i_chip, if( rc != SUCCESS ) { - PRDF_ERR(PRDF_FUNC"failed for proc: 0x%.8X", + PRDF_ERR(PRDF_FUNC "failed for proc: 0x%.8X", i_chip->GetId()); } @@ -777,7 +777,7 @@ int32_t AnalyzeParityErr( ExtensibleChip * i_chip, if( rc != SUCCESS ) { - PRDF_ERR(PRDF_FUNC"failed for proc: 0x%.8X", i_chip->GetId()); + PRDF_ERR(PRDF_FUNC "failed for proc: 0x%.8X", i_chip->GetId()); } return rc; diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8PllPcie.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8PllPcie.C index 3cd3c5958..60a122982 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8PllPcie.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8PllPcie.C @@ -70,7 +70,7 @@ int32_t isPllUnlockCausedByPciOscFo( ExtensibleChip * i_chip, if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"PCI Status register Read failed 0x%08x", + PRDF_ERR( PRDF_FUNC "PCI Status register Read failed 0x%08x", i_chip->GetId() ); break; } @@ -115,7 +115,7 @@ int32_t QueryPciPll( ExtensibleChip * i_chip, rc = pciErrReg->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"PCI_ERROR_REG read failed" + PRDF_ERR(PRDF_FUNC "PCI_ERROR_REG read failed" "for 0x%08x", i_chip->GetId()); break; } @@ -123,7 +123,7 @@ int32_t QueryPciPll( ExtensibleChip * i_chip, rc = pciConfigReg->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"PCI_CONFIG_REG read failed" + PRDF_ERR(PRDF_FUNC "PCI_CONFIG_REG read failed" "for 0x%08x", i_chip->GetId()); break; } @@ -138,7 +138,7 @@ int32_t QueryPciPll( ExtensibleChip * i_chip, if( rc != SUCCESS ) { - PRDF_ERR(PRDF_FUNC"failed for proc: 0x%.8X", + PRDF_ERR(PRDF_FUNC "failed for proc: 0x%.8X", i_chip->GetId()); } @@ -173,7 +173,7 @@ int32_t QueryPllIo( ExtensibleChip * i_chip, rc = TP_LFIR->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"TP_LFIR read failed" + PRDF_ERR(PRDF_FUNC "TP_LFIR read failed" "for 0x%08x", i_chip->GetId()); break; } @@ -181,7 +181,7 @@ int32_t QueryPllIo( ExtensibleChip * i_chip, rc = TP_LFIRmask->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"TP_LFIR_MASK read failed" + PRDF_ERR(PRDF_FUNC "TP_LFIR_MASK read failed" "for 0x%08x", i_chip->GetId()); break; } @@ -200,7 +200,7 @@ int32_t QueryPllIo( ExtensibleChip * i_chip, if( rc != SUCCESS ) { - PRDF_ERR(PRDF_FUNC"failed for proc: 0x%.8X", + PRDF_ERR(PRDF_FUNC "failed for proc: 0x%.8X", i_chip->GetId()); } @@ -234,7 +234,7 @@ int32_t ClearPllIo( ExtensibleChip * i_chip, tmpRC = pciErrReg->Read(); if (tmpRC != SUCCESS) { - PRDF_ERR(PRDF_FUNC"PCI_ERROR_REG read failed" + PRDF_ERR(PRDF_FUNC "PCI_ERROR_REG read failed" "for chip: 0x%08x", i_chip->GetId()); rc |= tmpRC; } @@ -247,7 +247,7 @@ int32_t ClearPllIo( ExtensibleChip * i_chip, if ( SUCCESS != tmpRC ) { - PRDF_ERR( PRDF_FUNC"Write() failed on PCI Error register: " + PRDF_ERR( PRDF_FUNC "Write() failed on PCI Error register: " "proc=0x%08x", i_chip->GetId() ); rc |= tmpRC; } @@ -261,7 +261,7 @@ int32_t ClearPllIo( ExtensibleChip * i_chip, tmpRC = TP_LFIRand->Write(); if (tmpRC != SUCCESS) { - PRDF_ERR(PRDF_FUNC"TP_LFIR_AND write failed" + PRDF_ERR(PRDF_FUNC "TP_LFIR_AND write failed" "for chip: 0x%08x", i_chip->GetId()); rc |= tmpRC; } @@ -272,7 +272,7 @@ int32_t ClearPllIo( ExtensibleChip * i_chip, tmpRC = oscCerrReg->Read(); if (tmpRC != SUCCESS) { - PRDF_ERR(PRDF_FUNC"OSCERR read failed" + PRDF_ERR(PRDF_FUNC "OSCERR read failed" "for 0x%08x", i_chip->GetId()); rc |= tmpRC; } @@ -281,7 +281,7 @@ int32_t ClearPllIo( ExtensibleChip * i_chip, tmpRC = oscCerrReg->Write(); if (tmpRC != SUCCESS) { - PRDF_ERR(PRDF_FUNC"oscCerrReg write failed" + PRDF_ERR(PRDF_FUNC "oscCerrReg write failed" "for chip: 0x%08x", i_chip->GetId()); rc |= tmpRC; } @@ -290,7 +290,7 @@ int32_t ClearPllIo( ExtensibleChip * i_chip, if( rc != SUCCESS ) { - PRDF_ERR(PRDF_FUNC"failed for proc: 0x%.8X", + PRDF_ERR(PRDF_FUNC "failed for proc: 0x%.8X", i_chip->GetId()); } @@ -325,7 +325,7 @@ int32_t MaskPllIo( ExtensibleChip * i_chip, if ( i_oscPos >= MAX_PCIE_OSC_PER_NODE ) { - PRDF_ERR(PRDF_FUNC"invalid oscPos: %d for chip: " + PRDF_ERR(PRDF_FUNC "invalid oscPos: %d for chip: " "0x%08x", i_oscPos, i_chip->GetId()); rc = FAIL; break; @@ -335,7 +335,7 @@ int32_t MaskPllIo( ExtensibleChip * i_chip, if ( oscPos != i_oscPos ) { - PRDF_DTRAC(PRDF_FUNC"skip masking for chip: 0x%08x, " + PRDF_DTRAC(PRDF_FUNC "skip masking for chip: 0x%08x, " "oscPos: %d, i_oscPos: %d", i_chip->GetId(), oscPos, i_oscPos); break; @@ -348,7 +348,7 @@ int32_t MaskPllIo( ExtensibleChip * i_chip, rc = pciConfigReg->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"PCI_CONFIG_REG read failed" + PRDF_ERR(PRDF_FUNC "PCI_CONFIG_REG read failed" "for 0x%08x", i_chip->GetId()); break; } @@ -359,7 +359,7 @@ int32_t MaskPllIo( ExtensibleChip * i_chip, rc = pciConfigReg->Write(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"PCI_CONFIG_REG write failed" + PRDF_ERR(PRDF_FUNC "PCI_CONFIG_REG write failed" "for chip: 0x%08x", i_chip->GetId()); } @@ -415,7 +415,7 @@ int32_t CalloutPllIo( ExtensibleChip * i_chip, if( SUCCESS != rc ) { - PRDF_ERR( PRDF_FUNC"PCI Osc switch analysis failed" ); + PRDF_ERR( PRDF_FUNC "PCI Osc switch analysis failed" ); break; } @@ -437,12 +437,12 @@ int32_t CalloutPllIo( ExtensibleChip * i_chip, if ( NULL == connectedOsc ) { - PRDF_ERR(PRDF_FUNC"Failed to get connected PCIe OSC for " + PRDF_ERR(PRDF_FUNC "Failed to get connected PCIe OSC for " "chip 0x%08x, oscPos: %d",i_chip->GetId(), oscPos ); connectedOsc = i_chip->GetChipHandle(); } - PRDF_DTRAC(PRDF_FUNC"PCIe OSC: 0x%08x connected to " + PRDF_DTRAC(PRDF_FUNC "PCIe OSC: 0x%08x connected to " "proc: 0x%08x", getHuid(connectedOsc), i_chip->GetId()); // callout the clock source @@ -486,7 +486,7 @@ uint32_t getIoOscPos( ExtensibleChip * i_chip, rc = pcieOscSwitchReg->Read(); if (rc != SUCCESS) { - PRDF_ERR(PRDF_FUNC"PCIE_OSC_SWITCH read failed" + PRDF_ERR(PRDF_FUNC "PCIE_OSC_SWITCH read failed" "for 0x%08x", i_chip->GetId()); break; } diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C index 86d74addd..107bb8e2d 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C @@ -419,14 +419,14 @@ int32_t maxSparesExceeded_MCS( ExtensibleChip * i_procChip, mcsTrgt = getConnectedChild( procTrgt, TYPE_MCS, i_mcsPos ); if ( NULL == mcsTrgt ) { - PRDF_ERR( PRDF_FUNC"getConnectedChild() returned NULL" ); + PRDF_ERR( PRDF_FUNC "getConnectedChild() returned NULL" ); l_rc = FAIL; break; } mcsChip = (ExtensibleChip *)systemPtr->GetChip( mcsTrgt ); if ( NULL == mcsChip ) { - PRDF_ERR( PRDF_FUNC"GetChip() returned NULL" ); + PRDF_ERR( PRDF_FUNC "GetChip() returned NULL" ); l_rc = FAIL; break; } @@ -434,7 +434,7 @@ int32_t maxSparesExceeded_MCS( ExtensibleChip * i_procChip, l_rc = MemUtils::checkMcsChannelFail( mcsChip, i_sc ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"checkMcsChannelFail() failed" ); + PRDF_ERR( PRDF_FUNC "checkMcsChannelFail() failed" ); break; } @@ -443,7 +443,7 @@ int32_t maxSparesExceeded_MCS( ExtensibleChip * i_procChip, false ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"handleLaneRepairEvent() failed" ); + PRDF_ERR( PRDF_FUNC "handleLaneRepairEvent() failed" ); break; } @@ -452,7 +452,7 @@ int32_t maxSparesExceeded_MCS( ExtensibleChip * i_procChip, membChip = mcsdb->getMembChip(); if ( NULL == membChip ) { - PRDF_ERR( PRDF_FUNC"getMembChip() returned NULL" ); + PRDF_ERR( PRDF_FUNC "getMembChip() returned NULL" ); l_rc = FAIL; break; } @@ -460,7 +460,7 @@ int32_t maxSparesExceeded_MCS( ExtensibleChip * i_procChip, l_rc = MemUtils::chnlCsCleanup( membChip, i_sc ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"chnlCsCleanup() failed" ); + PRDF_ERR( PRDF_FUNC "chnlCsCleanup() failed" ); break; } @@ -468,7 +468,7 @@ int32_t maxSparesExceeded_MCS( ExtensibleChip * i_procChip, if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_procChip=0x%08x i_mcsPos=%d", + PRDF_ERR( PRDF_FUNC "Failed: i_procChip=0x%08x i_mcsPos=%d", i_procChip->GetId(), i_mcsPos ); CalloutUtil::defaultError( i_sc ); } @@ -606,7 +606,7 @@ int32_t phbConfigured(ExtensibleChip * i_chip, { if( i_phbPos >= MAX_PCI_NUM ) { - PRDF_ERR( PRDF_FUNC"invalid PCI number: %d", i_phbPos ); + PRDF_ERR( PRDF_FUNC "invalid PCI number: %d", i_phbPos ); break; } @@ -615,7 +615,7 @@ int32_t phbConfigured(ExtensibleChip * i_chip, if(NULL == etuResetReg) { - PRDF_ERR( PRDF_FUNC"getRegister() Failed for register:%s", + PRDF_ERR( PRDF_FUNC "getRegister() Failed for register:%s", pciEtuResetReg[i_phbPos] ); break; } @@ -623,7 +623,7 @@ int32_t phbConfigured(ExtensibleChip * i_chip, o_rc = etuResetReg->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"%s Read() failed. Target=0x%08x", + PRDF_ERR( PRDF_FUNC "%s Read() failed. Target=0x%08x", pciEtuResetReg[i_phbPos], i_chip->GetId() ); break; } @@ -671,7 +671,7 @@ int32_t deadManTimerCalloutAndFFDC( ExtensibleChip * i_chip, TargetHandle_t l_masterCore = PlatServices::getMasterCore( l_procTgt ); if( NULL == l_masterCore ) { - PRDF_ERR( PRDF_FUNC"Failed to get master core: PROC = 0x%08x", + PRDF_ERR( PRDF_FUNC "Failed to get master core: PROC = 0x%08x", i_chip->GetId() ); } else @@ -711,28 +711,28 @@ int32_t combinedResponseCallout( ExtensibleChip * i_chip, l_rc = reg->Read(); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on PB_CENT_CR_ERROR" ); + PRDF_ERR( PRDF_FUNC "Read() failed on PB_CENT_CR_ERROR" ); break; } uint32_t tmp = reg->GetBitFieldJustified(0,3); if ( 0x02 != tmp ) // Must be 0b010 to continue { - PRDF_ERR( PRDF_FUNC"Unsupported reason code: 0x%02x", tmp ); + PRDF_ERR( PRDF_FUNC "Unsupported reason code: 0x%02x", tmp ); l_rc = FAIL; break; } tmp = reg->GetBitFieldJustified(38,5); if ( 0x00 != tmp ) // Must be 0b00000 to continue { - PRDF_ERR( PRDF_FUNC"Unsupported combined response encoding: 0x%02x", + PRDF_ERR( PRDF_FUNC "Unsupported combined response encoding: 0x%02x", tmp ); l_rc = FAIL; break; } if ( reg->IsBitSet(22) ) // Must be 0b0 to continue { - PRDF_ERR( PRDF_FUNC"Operation not sourced by an EX chiplet" ); + PRDF_ERR( PRDF_FUNC "Operation not sourced by an EX chiplet" ); l_rc = FAIL; break; } @@ -741,7 +741,7 @@ int32_t combinedResponseCallout( ExtensibleChip * i_chip, TargetHandle_t exTrgt = getConnectedChild( procTrgt, TYPE_EX, tmp ); if ( NULL == exTrgt ) { - PRDF_ERR( PRDF_FUNC"No connected EX chiplet at position %d", tmp ); + PRDF_ERR( PRDF_FUNC "No connected EX chiplet at position %d", tmp ); l_rc = FAIL; break; } @@ -752,7 +752,7 @@ int32_t combinedResponseCallout( ExtensibleChip * i_chip, if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"Unable to isolate to an EX chiplet. Calling out " + PRDF_ERR( PRDF_FUNC "Unable to isolate to an EX chiplet. Calling out " "PROC 0x%08x instead.", i_chip->GetId() ); io_sc.service_data->SetCallout( procTrgt, MRU_LOW ); @@ -864,7 +864,7 @@ int32_t calloutPhb( ExtensibleChip * i_procChip, STEP_CODE_DATA_STRUCT & io_sc, { if ( SUCCESS != getConfiguredPHB(procTrgt, i_iopciIdx, 0, phbATrgt) ) { - PRDF_ERR( PRDF_FUNC"getConfiguredPHB(0) failed: i_procChip=0x%08x " + PRDF_ERR( PRDF_FUNC "getConfiguredPHB(0) failed: i_procChip=0x%08x " "i_iopciIdx=%d", i_procChip->GetId(), i_iopciIdx ); l_rc = FAIL; } @@ -879,7 +879,7 @@ int32_t calloutPhb( ExtensibleChip * i_procChip, STEP_CODE_DATA_STRUCT & io_sc, { if ( SUCCESS != getConfiguredPHB(procTrgt, i_iopciIdx, 1, phbBTrgt) ) { - PRDF_ERR( PRDF_FUNC"getConfiguredPHB(1) failed: i_procChip=0x%08x " + PRDF_ERR( PRDF_FUNC "getConfiguredPHB(1) failed: i_procChip=0x%08x " "i_iopciIdx=%d", i_procChip->GetId(), i_iopciIdx ); l_rc = FAIL; } diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfPhbUtils.C b/src/usr/diag/prdf/common/plat/pegasus/prdfPhbUtils.C index c0193d6e9..5d3d2dbe4 100644 --- a/src/usr/diag/prdf/common/plat/pegasus/prdfPhbUtils.C +++ b/src/usr/diag/prdf/common/plat/pegasus/prdfPhbUtils.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2015 */ +/* [+] 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. */ @@ -98,13 +100,13 @@ int32_t getConfiguredPHB( TargetHandle_t i_procTrgt, uint32_t i_iopciIdx, // Check parameters if ( MAX_FIRS <= i_iopciIdx ) { - PRDF_ERR( PRDF_FUNC"i_iopciIdx is unsupported: %d", i_iopciIdx ); + PRDF_ERR( PRDF_FUNC "i_iopciIdx is unsupported: %d", i_iopciIdx ); o_rc = FAIL; break; } if ( MAX_CLOCKS <= i_clkIdx ) { - PRDF_ERR( PRDF_FUNC"i_clkIdx is unsupported: %d", i_clkIdx ); + PRDF_ERR( PRDF_FUNC "i_clkIdx is unsupported: %d", i_clkIdx ); o_rc = FAIL; break; } @@ -116,7 +118,7 @@ int32_t getConfiguredPHB( TargetHandle_t i_procTrgt, uint32_t i_iopciIdx, case MODEL_MURANO: modelIdx = MURANO_IDX; break; case MODEL_VENICE: modelIdx = VENICE_IDX; break; default: - PRDF_ERR( PRDF_FUNC"unsupported processor model: %d", model ); + PRDF_ERR( PRDF_FUNC "unsupported processor model: %d", model ); o_rc = FAIL; } if ( SUCCESS != o_rc ) break; @@ -125,7 +127,7 @@ int32_t getConfiguredPHB( TargetHandle_t i_procTrgt, uint32_t i_iopciIdx, uint32_t phbConfig = getPhbConfig( i_procTrgt ); if ( MAX_CONFIGS <= phbConfig ) { - PRDF_ERR( PRDF_FUNC"unsupportd PHB config: %d", phbConfig ); + PRDF_ERR( PRDF_FUNC "unsupportd PHB config: %d", phbConfig ); o_rc = FAIL; break; } @@ -136,7 +138,7 @@ int32_t getConfiguredPHB( TargetHandle_t i_procTrgt, uint32_t i_iopciIdx, o_phbTrgt = getConnectedChild( i_procTrgt, TYPE_PCI, phbPos ); if ( NULL == o_phbTrgt ) // Target should exist. { - PRDF_ERR( PRDF_FUNC"getConnectedChild(%d) failed", phbPos ); + PRDF_ERR( PRDF_FUNC "getConnectedChild(%d) failed", phbPos ); o_rc = FAIL; break; } } @@ -145,7 +147,7 @@ int32_t getConfiguredPHB( TargetHandle_t i_procTrgt, uint32_t i_iopciIdx, if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_procTrgt=0x%08x i_iopciIdx=%d " + PRDF_ERR( PRDF_FUNC "Failed: i_procTrgt=0x%08x i_iopciIdx=%d " "i_clkIdx=%d", getHuid(i_procTrgt), i_iopciIdx, i_clkIdx ); } diff --git a/src/usr/diag/prdf/common/prdfMain_common.C b/src/usr/diag/prdf/common/prdfMain_common.C index fa6991919..c74e5c94c 100755 --- a/src/usr/diag/prdf/common/prdfMain_common.C +++ b/src/usr/diag/prdf/common/prdfMain_common.C @@ -135,7 +135,7 @@ errlHndl_t noLock_initialize() delete systemPtr; systemPtr = NULL; g_initialized = false; - PRDF_ERR(PRDF_FUNC"failed to buid object model"); + PRDF_ERR(PRDF_FUNC "failed to buid object model"); } //systemPtr is populated in configurator else if( systemPtr != NULL ) diff --git a/src/usr/diag/prdf/common/runtime/prdfCenMbaDynMemDealloc_rt.C b/src/usr/diag/prdf/common/runtime/prdfCenMbaDynMemDealloc_rt.C index 113e255dc..02c9daa81 100755 --- a/src/usr/diag/prdf/common/runtime/prdfCenMbaDynMemDealloc_rt.C +++ b/src/usr/diag/prdf/common/runtime/prdfCenMbaDynMemDealloc_rt.C @@ -71,7 +71,7 @@ int32_t getCenPhyAddr( ExtensibleChip * i_mbaChip, ExtensibleChip * i_mbChip, o_rc = getDimmRowCol( mba, rowNum, colNum ); if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getDimmConfig() failed. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "getDimmConfig() failed. HUID:0x%08X", i_mbaChip->GetId()); break; } @@ -83,7 +83,7 @@ int32_t getCenPhyAddr( ExtensibleChip * i_mbaChip, ExtensibleChip * i_mbChip, o_rc = getMasterRanks( mba, configuredRanks, rank.getDimmSlct() ); if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getMasterRanks() failed. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "getMasterRanks() failed. HUID:0x%08X", i_mbaChip->GetId() ); break; } @@ -96,7 +96,7 @@ int32_t getCenPhyAddr( ExtensibleChip * i_mbaChip, ExtensibleChip * i_mbChip, o_rc = mbaxcr->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on %s. HUID:0X%08X", + PRDF_ERR( PRDF_FUNC "Read() failed on %s. HUID:0X%08X", reg_str, i_mbChip->GetId() ); break; } @@ -105,7 +105,7 @@ int32_t getCenPhyAddr( ExtensibleChip * i_mbaChip, ExtensibleChip * i_mbChip, uint8_t hash = mbaxcr->GetBitFieldJustified( 10, 2 ); if ( 3 <= hash ) { - PRDF_ERR( PRDF_FUNC"Invalid value for hash. Hash:%u HUID:0X%08X", + PRDF_ERR( PRDF_FUNC "Invalid value for hash. Hash:%u HUID:0X%08X", hash, i_mbaChip->GetId() ); o_rc = FAIL; break; } @@ -208,7 +208,7 @@ int32_t getCenPhyAddr( ExtensibleChip * i_mbaChip, ExtensibleChip * i_mbChip, o_rc = mbsxcr->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on MBSXCR. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "Read() failed on MBSXCR. HUID:0x%08X", i_mbChip->GetId() ) ; break; } @@ -220,7 +220,7 @@ int32_t getCenPhyAddr( ExtensibleChip * i_mbaChip, ExtensibleChip * i_mbChip, { if ( ( ilMode > 25 ) || ( ilMode < 16 )) { - PRDF_ERR( PRDF_FUNC"Invalid value for IL bit Mode :%u", + PRDF_ERR( PRDF_FUNC "Invalid value for IL bit Mode :%u", ilMode ); o_rc = FAIL; break; } @@ -272,13 +272,13 @@ int32_t getSystemAddr( ExtensibleChip * i_mbaChip, CenAddr i_addr, o_rc = getDramGen( mba, dramGen ); if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getDramGen() failed. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "getDramGen() failed. HUID:0x%08X", i_mbaChip->GetId()); break; } if( fapi::ENUM_ATTR_EFF_DRAM_GEN_DDR3 != dramGen ) { - PRDF_ERR( PRDF_FUNC"page Gard is only supported for DDR3." + PRDF_ERR( PRDF_FUNC "page Gard is only supported for DDR3." "HUID:0x%08X DRAM Generation : %u", i_mbaChip->GetId(), dramGen ); o_rc = FAIL; break; @@ -288,7 +288,7 @@ int32_t getSystemAddr( ExtensibleChip * i_mbaChip, CenAddr i_addr, ExtensibleChip *mbChip = mbadb->getMembChip(); if( NULL == mbChip ) { - PRDF_ERR( PRDF_FUNC" Null Membuf chip for mba. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC " Null Membuf chip for mba. HUID:0x%08X", i_mbaChip->GetId() ); o_rc = FAIL; break; } @@ -297,7 +297,7 @@ int32_t getSystemAddr( ExtensibleChip * i_mbaChip, CenAddr i_addr, if( NULL == mbChip ) { - PRDF_ERR( PRDF_FUNC" Null Mcs chip for Membuf. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC " Null Mcs chip for Membuf. HUID:0x%08X", mbChip->GetId() ); o_rc = FAIL; break; } @@ -305,7 +305,7 @@ int32_t getSystemAddr( ExtensibleChip * i_mbaChip, CenAddr i_addr, o_rc = getCenPhyAddr( i_mbaChip, mbChip, i_addr, cenAddr); if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getCenPhyAddr() failed. MBA:0x%08X " + PRDF_ERR( PRDF_FUNC "getCenPhyAddr() failed. MBA:0x%08X " "Membuf:0x%08X", i_mbaChip->GetId(), mbChip->GetId()); break; } @@ -315,7 +315,7 @@ int32_t getSystemAddr( ExtensibleChip * i_mbaChip, CenAddr i_addr, o_rc = mcgfp->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on MCFGP. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "Read() failed on MCFGP. HUID:0x%08X", mcsChip->GetId() ) ; break; } @@ -362,7 +362,7 @@ int32_t rankGard( ExtensibleChip * i_mbaChip, CenRank i_rank ) o_rc = getMemAddrRange( mba, i_rank, startAddr, endAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getMemAddrRange() Failed. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "getMemAddrRange() Failed. HUID:0x%08X", i_mbaChip->GetId() ); break; } @@ -374,13 +374,13 @@ int32_t rankGard( ExtensibleChip * i_mbaChip, CenRank i_rank ) o_rc |= getSystemAddr( i_mbaChip, endAddr, seAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getSystemAddr() failed. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "getSystemAddr() failed. HUID:0x%08X", i_mbaChip->GetId() ); break; } // Send the address range to HV sendDynMemDeallocRequest( ssAddr, seAddr ); - PRDF_TRAC( PRDF_FUNC"Rank gard for Start Addr: 0x%016llx " + PRDF_TRAC( PRDF_FUNC "Rank gard for Start Addr: 0x%016llx " "End Addr: 0x%016llX", ssAddr, seAddr ); } while( 0 ); @@ -412,13 +412,13 @@ int32_t pageGard( ExtensibleChip * i_mbaChip, CenAddr i_addr ) o_rc = getSystemAddr( i_mbaChip, i_addr, sysAddr); if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getSystemAddr() failed. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "getSystemAddr() failed. HUID:0x%08X", i_mbaChip->GetId() ); break; } sendPageGardRequest( sysAddr ); - PRDF_TRAC( PRDF_FUNC"Page gard for address: 0x%016llX", sysAddr ); + PRDF_TRAC( PRDF_FUNC "Page gard for address: 0x%016llX", sysAddr ); } while( 0 ); @@ -443,7 +443,7 @@ int32_t lmbGard( ExtensibleChip * i_mbaChip, CenAddr i_addr, bool i_isFetch ) o_rc = rankGard( i_mbaChip, i_addr.getRank() ); if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"rankGard() failed. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "rankGard() failed. HUID:0x%08X", i_mbaChip->GetId() ); break; } @@ -453,13 +453,13 @@ int32_t lmbGard( ExtensibleChip * i_mbaChip, CenAddr i_addr, bool i_isFetch ) o_rc = getSystemAddr( i_mbaChip, i_addr, sysAddr); if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getSystemAddr() failed. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "getSystemAddr() failed. HUID:0x%08X", i_mbaChip->GetId() ); break; } sendLmbGardRequest( sysAddr, i_isFetch ); - PRDF_TRAC( PRDF_FUNC"LMB gard for address: 0x%016llX", sysAddr ); + PRDF_TRAC( PRDF_FUNC "LMB gard for address: 0x%016llX", sysAddr ); } } while( 0 ); @@ -484,7 +484,7 @@ int32_t mbaGard( ExtensibleChip * i_mbaChip ) o_rc = getMemAddrRange( mba, startAddr, endAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getMemAddrRange() Failed. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "getMemAddrRange() Failed. HUID:0x%08X", i_mbaChip->GetId() ); break; } @@ -496,14 +496,14 @@ int32_t mbaGard( ExtensibleChip * i_mbaChip ) o_rc |= getSystemAddr( i_mbaChip, endAddr, seAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getSystemAddr() failed. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "getSystemAddr() failed. HUID:0x%08X", i_mbaChip->GetId() ); break; } // Send the address range to PHYP sendDynMemDeallocRequest( ssAddr, seAddr ); - PRDF_TRAC( PRDF_FUNC"MBA gard for Start Addr: 0x%016llx " + PRDF_TRAC( PRDF_FUNC "MBA gard for Start Addr: 0x%016llx " "End Addr: 0x%016llX", ssAddr, seAddr ); } while (0); @@ -528,7 +528,7 @@ int32_t dimmSlctGard( TargetHandle_t i_dimm ) ExtensibleChip * mbaChip = (ExtensibleChip *)systemPtr->GetChip( mba ); if ( NULL == mbaChip ) { - PRDF_ERR( PRDF_FUNC"No MBA chip behind DIMM" ); + PRDF_ERR( PRDF_FUNC "No MBA chip behind DIMM" ); o_rc = FAIL; break; } // Find the largest address range @@ -541,14 +541,14 @@ int32_t dimmSlctGard( TargetHandle_t i_dimm ) o_rc = getMbaDimm( i_dimm, dimmSlct ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getMbaDimm() failed" ); + PRDF_ERR( PRDF_FUNC "getMbaDimm() failed" ); break; } o_rc = getMasterRanks( mba, masterRanks, dimmSlct ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getMasterRanks() failed" ); + PRDF_ERR( PRDF_FUNC "getMasterRanks() failed" ); break; } @@ -559,7 +559,7 @@ int32_t dimmSlctGard( TargetHandle_t i_dimm ) o_rc = getMemAddrRange( mba, *it, startAddr, endAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getMemAddrRange() Failed. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "getMemAddrRange() Failed. HUID:0x%08X", mbaChip->GetId() ); break; } @@ -571,7 +571,7 @@ int32_t dimmSlctGard( TargetHandle_t i_dimm ) o_rc |= getSystemAddr( mbaChip, endAddr, seAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getSystemAddr() failed. HUID:0x%08X", + PRDF_ERR( PRDF_FUNC "getSystemAddr() failed. HUID:0x%08X", mbaChip->GetId() ); break; } @@ -582,14 +582,14 @@ int32_t dimmSlctGard( TargetHandle_t i_dimm ) // Send the address range to PHYP sendDynMemDeallocRequest( smallestAddr, largestAddr ); - PRDF_TRAC( PRDF_FUNC"DIMM Slct gard for Start Addr: 0x%016llx " + PRDF_TRAC( PRDF_FUNC "DIMM Slct gard for Start Addr: 0x%016llx " "End Addr: 0x%016llX", smallestAddr, largestAddr ); } while (0); if( FAIL == o_rc ) { - PRDF_ERR( PRDF_FUNC"failed. DIMM:0x%08X", getHuid( i_dimm ) ); + PRDF_ERR( PRDF_FUNC "failed. DIMM:0x%08X", getHuid( i_dimm ) ); } return o_rc; @@ -612,7 +612,7 @@ bool isDimmPair( TargetHandle_t i_dimm1, TargetHandle_t i_dimm2 ) if( SUCCESS != rc ) { - PRDF_ERR( PRDF_FUNC" getMbaDimm() failed" ); + PRDF_ERR( PRDF_FUNC " getMbaDimm() failed" ); break; } isDimmPair = ( ( dimm1Slct == dimm2Slct ) && @@ -640,7 +640,7 @@ bool compareDimms( TargetHandle_t i_dimm1, TargetHandle_t i_dimm2 ) if( SUCCESS != rc ) { - PRDF_ERR( PRDF_FUNC" getMbaDimm() failed" ); + PRDF_ERR( PRDF_FUNC " getMbaDimm() failed" ); break; } TargetHandle_t mba1 = getConnectedParent( i_dimm1, TYPE_MBA ); @@ -673,7 +673,7 @@ int32_t dimmListGard( TargetHandleList & i_dimmList ) int32_t l_rc = dimmSlctGard( *it ); if( SUCCESS != l_rc ) { - PRDF_ERR(PRDF_FUNC"Failed for DIMM 0x:%08X", getHuid( *it ) ); + PRDF_ERR(PRDF_FUNC "Failed for DIMM 0x:%08X", getHuid( *it ) ); o_rc |= l_rc; } } diff --git a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdCtlr_rt.C b/src/usr/diag/prdf/common/runtime/prdfCenMbaTdCtlr_rt.C index 3eca8c6e9..8d7048424 100755 --- a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdCtlr_rt.C +++ b/src/usr/diag/prdf/common/runtime/prdfCenMbaTdCtlr_rt.C @@ -86,7 +86,7 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = initialize(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"initialize() failed" ); + PRDF_ERR( PRDF_FUNC "initialize() failed" ); break; } @@ -99,7 +99,7 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = getCenMaintStartAddr( iv_mbaChip, stopAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getCenMaintStartAddr() failed" ); + PRDF_ERR( PRDF_FUNC "getCenMaintStartAddr() failed" ); break; } @@ -107,14 +107,14 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = getCenMaintEndAddr( iv_mbaChip, endAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getCenMaintEndAddr() failed" ); + PRDF_ERR( PRDF_FUNC "getCenMaintEndAddr() failed" ); break; } // Call analysis function based on state. if ( NULL == cv_cmdCompleteFuncs[iv_tdState] ) { - PRDF_ERR( PRDF_FUNC"Function for state %d not supported", + PRDF_ERR( PRDF_FUNC "Function for state %d not supported", iv_tdState ); o_rc = FAIL; break; } @@ -123,7 +123,7 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) endAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed to continue analysis" ); + PRDF_ERR( PRDF_FUNC "Failed to continue analysis" ); break; } @@ -131,12 +131,12 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed." ); + PRDF_ERR( PRDF_FUNC "Failed." ); badPathErrorHandling( io_sc ); int32_t l_rc = cleanupPrevCmd( io_sc ); // Just in case. if ( SUCCESS != l_rc ) - PRDF_ERR( PRDF_FUNC"cleanupPrevCmd() failed" ); + PRDF_ERR( PRDF_FUNC "cleanupPrevCmd() failed" ); // Will not resume background scrubbing because that may be the root // cause of the failure. @@ -167,7 +167,7 @@ int32_t CenMbaTdCtlr::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc, o_rc = initialize(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"initialize() failed" ); + PRDF_ERR( PRDF_FUNC "initialize() failed" ); break; } @@ -183,7 +183,7 @@ int32_t CenMbaTdCtlr::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc, if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed to add TD queue entry" ); + PRDF_ERR( PRDF_FUNC "Failed to add TD queue entry" ); break; } @@ -208,14 +208,14 @@ int32_t CenMbaTdCtlr::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc, iv_mbaTrgt, CenRank(0), 0 ); if ( NULL == iv_mssCmd ) { - PRDF_ERR( PRDF_FUNC"createMssCmd() failed" ); + PRDF_ERR( PRDF_FUNC "createMssCmd() failed" ); break; } o_rc = iv_mssCmd->stopCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"stopCmd() failed" ); + PRDF_ERR( PRDF_FUNC "stopCmd() failed" ); break; } @@ -229,7 +229,7 @@ int32_t CenMbaTdCtlr::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc, o_rc = iv_mssCmd->stopCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"stopCmd() failed" ); + PRDF_ERR( PRDF_FUNC "stopCmd() failed" ); break; } } @@ -243,7 +243,7 @@ int32_t CenMbaTdCtlr::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc, o_rc = maskFetchAttns(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"maskFetchAttns() failed" ); + PRDF_ERR( PRDF_FUNC "maskFetchAttns() failed" ); break; } } @@ -259,7 +259,7 @@ int32_t CenMbaTdCtlr::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc, o_rc = getCenMaintStartAddr( iv_mbaChip, stopAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getCenMaintStartAddr() failed" ); + PRDF_ERR( PRDF_FUNC "getCenMaintStartAddr() failed" ); break; } @@ -267,14 +267,14 @@ int32_t CenMbaTdCtlr::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc, o_rc = getCenMaintEndAddr( iv_mbaChip, endAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getCenMaintEndAddr() failed" ); + PRDF_ERR( PRDF_FUNC "getCenMaintEndAddr() failed" ); break; } o_rc = analyzeCmdComplete( io_sc, stopAddr, endAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"analyzeCmdComplete() failed" ); + PRDF_ERR( PRDF_FUNC "analyzeCmdComplete() failed" ); break; } @@ -282,7 +282,7 @@ int32_t CenMbaTdCtlr::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc, if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_event=%d i_rank=m%ds%d i_banTps=%c", + PRDF_ERR( PRDF_FUNC "Failed: i_event=%d i_rank=m%ds%d i_banTps=%c", i_event, i_rank.getMaster(), i_rank.getSlave(), i_banTps ? 'T' : 'F' ); @@ -290,7 +290,7 @@ int32_t CenMbaTdCtlr::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc, int32_t l_rc = cleanupPrevCmd( io_sc ); // Just in case. if ( SUCCESS != l_rc ) - PRDF_ERR( PRDF_FUNC"cleanupPrevCmd() failed" ); + PRDF_ERR( PRDF_FUNC "cleanupPrevCmd() failed" ); } else { @@ -330,7 +330,7 @@ int32_t CenMbaTdCtlr::handleRrFo() o_rc = mbmsr->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on MBMSR"); + PRDF_ERR( PRDF_FUNC "Read() failed on MBMSR"); break; } @@ -343,7 +343,7 @@ int32_t CenMbaTdCtlr::handleRrFo() o_rc = mbaSpa->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on MBASPA"); + PRDF_ERR( PRDF_FUNC "Read() failed on MBASPA"); break; } @@ -354,7 +354,7 @@ int32_t CenMbaTdCtlr::handleRrFo() o_rc = initialize(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"initialize() failed" ); + PRDF_ERR( PRDF_FUNC "initialize() failed" ); break; } @@ -370,7 +370,7 @@ int32_t CenMbaTdCtlr::handleRrFo() o_rc = startNextTd( sdc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"startBgScrub() failed" ); + PRDF_ERR( PRDF_FUNC "startBgScrub() failed" ); break; } } while (0); @@ -397,7 +397,7 @@ int32_t CenMbaTdCtlr::initialize() o_rc = CenMbaTdCtlrCommon::initialize(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"CenMbaTdCtlrCommon::initialize() failed" ); + PRDF_ERR( PRDF_FUNC "CenMbaTdCtlrCommon::initialize() failed" ); break; } @@ -405,7 +405,7 @@ int32_t CenMbaTdCtlr::initialize() o_rc = iv_masterRanks.initialize( iv_mbaTrgt ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"TdRankList::initialize() failed" ); + PRDF_ERR( PRDF_FUNC "TdRankList::initialize() failed" ); break; } @@ -414,7 +414,7 @@ int32_t CenMbaTdCtlr::initialize() o_rc = unmaskFetchAttns(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"unmaskFetchAttns() failed" ); + PRDF_ERR( PRDF_FUNC "unmaskFetchAttns() failed" ); break; } @@ -444,7 +444,7 @@ int32_t CenMbaTdCtlr::initialize() o_rc = mssGetMarkStore( iv_mbaTrgt, rank, markData ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetMarkStore() failed." ); + PRDF_ERR( PRDF_FUNC "mssGetMarkStore() failed." ); o_rc = FAIL; break; } @@ -456,7 +456,7 @@ int32_t CenMbaTdCtlr::initialize() o_rc = getBadDqBitmap( iv_mbaTrgt, rank, bitmap ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getBadDqBitmap() failed" ); + PRDF_ERR( PRDF_FUNC "getBadDqBitmap() failed" ); break; } @@ -464,7 +464,7 @@ int32_t CenMbaTdCtlr::initialize() o_rc = bitmap.isChipMark( markData.getCM(), vpdCM ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"isChipMark() failed" ); + PRDF_ERR( PRDF_FUNC "isChipMark() failed" ); break; } @@ -474,7 +474,7 @@ int32_t CenMbaTdCtlr::initialize() o_rc = addTdQueueEntryVCM( rank ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"addTdQueueEntryVCM() failed" ); + PRDF_ERR( PRDF_FUNC "addTdQueueEntryVCM() failed" ); break; } @@ -491,7 +491,7 @@ int32_t CenMbaTdCtlr::initialize() o_rc = firand->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", reg_str ); break; } } @@ -523,7 +523,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, { if ( NO_OP != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -536,7 +536,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = iv_masterRanks.setInterruptedRank( iv_rank ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setInterruptedRank() failed" ); + PRDF_ERR( PRDF_FUNC "setInterruptedRank() failed" ); break; } @@ -545,7 +545,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = checkEccErrors( eccErrorMask, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"checkEccErrors() failed" ); + PRDF_ERR( PRDF_FUNC "checkEccErrors() failed" ); break; } @@ -560,7 +560,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleSoftIntCeEte_NonTd( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleSoftIntCeEte_NonTd() failed" ); + PRDF_ERR( PRDF_FUNC "handleSoftIntCeEte_NonTd() failed" ); break; } } @@ -570,7 +570,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleHardCeEte_NonTd( io_sc, i_stopAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleHardCeEte_NonTd() failed" ); + PRDF_ERR( PRDF_FUNC "handleHardCeEte_NonTd() failed" ); break; } } @@ -580,7 +580,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleRceEte_NonTd( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleRceEte_NonTd() failed" ); + PRDF_ERR( PRDF_FUNC "handleRceEte_NonTd() failed" ); break; } } @@ -590,7 +590,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleMpe_NonTd( io_sc, i_stopAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleMpe_NonTd() failed" ); + PRDF_ERR( PRDF_FUNC "handleMpe_NonTd() failed" ); break; } } @@ -600,7 +600,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleUe_NonTd( io_sc, i_stopAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleUe_NonTd() failed" ); + PRDF_ERR( PRDF_FUNC "handleUe_NonTd() failed" ); break; } } @@ -624,7 +624,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = startBgScrub( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"startBgScrub() failed" ); + PRDF_ERR( PRDF_FUNC "startBgScrub() failed" ); break; } } @@ -634,7 +634,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = resumeScrub( io_sc, eccErrorMask ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"resumeScrub() failed" ); + PRDF_ERR( PRDF_FUNC "resumeScrub() failed" ); break; } } @@ -645,7 +645,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = startNextTd( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"startNextTd() failed" ); + PRDF_ERR( PRDF_FUNC "startNextTd() failed" ); break; } } @@ -671,7 +671,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc, { if ( VCM_PHASE_1 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -683,7 +683,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = checkEccErrors( eccErrorMask, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"checkEccErrors() failed" ); + PRDF_ERR( PRDF_FUNC "checkEccErrors() failed" ); break; } @@ -692,7 +692,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleUe_Td( io_sc, i_stopAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleUe_Td() failed" ); + PRDF_ERR( PRDF_FUNC "handleUe_Td() failed" ); break; } @@ -706,7 +706,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleRceEte_Td( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleRceEte_Td() failed" ); + PRDF_ERR( PRDF_FUNC "handleRceEte_Td() failed" ); break; } } @@ -723,7 +723,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = startVcmPhase2( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"startVcmPhase2() failed" ); + PRDF_ERR( PRDF_FUNC "startVcmPhase2() failed" ); break; } } @@ -733,7 +733,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = resumeScrub( io_sc, eccErrorMask ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"resumeScrub() failed" ); + PRDF_ERR( PRDF_FUNC "resumeScrub() failed" ); break; } } @@ -746,7 +746,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleTdComplete( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleTdComplete() failed" ); + PRDF_ERR( PRDF_FUNC "handleTdComplete() failed" ); } } @@ -769,7 +769,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, { if ( VCM_PHASE_2 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -781,7 +781,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = checkEccErrors( eccErrorMask, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"checkEccErrors() failed" ); + PRDF_ERR( PRDF_FUNC "checkEccErrors() failed" ); break; } @@ -790,7 +790,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleUe_Td( io_sc, i_stopAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleUe_Td() failed" ); + PRDF_ERR( PRDF_FUNC "handleUe_Td() failed" ); break; } @@ -804,7 +804,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleRceEte_Td( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleRceEte_Td() failed" ); + PRDF_ERR( PRDF_FUNC "handleRceEte_Td() failed" ); break; } } @@ -816,7 +816,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleMCE_VCM2( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleMCE_VCM2() failed" ); + PRDF_ERR( PRDF_FUNC "handleMCE_VCM2() failed" ); break; } } @@ -843,7 +843,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleMCE_VCM2( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleMCE_VCM2() failed" ); + PRDF_ERR( PRDF_FUNC "handleMCE_VCM2() failed" ); } } else @@ -862,7 +862,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, allowWriteBlocked ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssSetMarkStore() failed" ); + PRDF_ERR( PRDF_FUNC "mssSetMarkStore() failed" ); break; } @@ -875,7 +875,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = resumeScrub( io_sc, eccErrorMask ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"resumeScrub() failed" ); + PRDF_ERR( PRDF_FUNC "resumeScrub() failed" ); break; } } @@ -888,7 +888,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleTdComplete( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleTdComplete() failed" ); + PRDF_ERR( PRDF_FUNC "handleTdComplete() failed" ); } } @@ -911,7 +911,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc, { if ( DSD_PHASE_1 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -923,7 +923,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = checkEccErrors( eccErrorMask, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"checkEccErrors() failed" ); + PRDF_ERR( PRDF_FUNC "checkEccErrors() failed" ); break; } @@ -932,7 +932,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleUe_Td( io_sc, i_stopAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleUe_Td() failed" ); + PRDF_ERR( PRDF_FUNC "handleUe_Td() failed" ); break; } @@ -946,7 +946,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleRceEte_Td( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleRceEte_Td() failed" ); + PRDF_ERR( PRDF_FUNC "handleRceEte_Td() failed" ); break; } } @@ -971,7 +971,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc, allowWriteBlocked ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssSetMarkStore() failed" ); + PRDF_ERR( PRDF_FUNC "mssSetMarkStore() failed" ); break; } @@ -984,7 +984,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = resumeScrub( io_sc, eccErrorMask ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"resumeScrub() failed" ); + PRDF_ERR( PRDF_FUNC "resumeScrub() failed" ); break; } } @@ -998,7 +998,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleTdComplete( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleTdComplete() failed" ); + PRDF_ERR( PRDF_FUNC "handleTdComplete() failed" ); } } @@ -1021,7 +1021,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, { if ( TPS_PHASE_1 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -1029,7 +1029,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = mssGetMarkStore( iv_mbaTrgt, iv_rank, iv_mark ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetMarkStore() failed." ); + PRDF_ERR( PRDF_FUNC "mssGetMarkStore() failed." ); break; } @@ -1040,7 +1040,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = checkEccErrors( eccErrorMask, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"checkEccErrors() failed" ); + PRDF_ERR( PRDF_FUNC "checkEccErrors() failed" ); break; } @@ -1058,7 +1058,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleMpe_Tps( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleMpe_Tps() failed" ); + PRDF_ERR( PRDF_FUNC "handleMpe_Tps() failed" ); break; } @@ -1083,7 +1083,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleCeEte_Tps( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleCeEte_Tps() failed" ); + PRDF_ERR( PRDF_FUNC "handleCeEte_Tps() failed" ); break; } } @@ -1093,7 +1093,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleRceEte_Td( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleRceEte_Td() failed" ); + PRDF_ERR( PRDF_FUNC "handleRceEte_Td() failed" ); break; } } @@ -1103,7 +1103,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleUe_Td( io_sc, i_stopAddr, false ); // No TPS request. if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleUe_Td() failed" ); + PRDF_ERR( PRDF_FUNC "handleUe_Td() failed" ); break; } } @@ -1119,7 +1119,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleTpsFalseAlarm( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleTpsFalseAlarm() failed" ); + PRDF_ERR( PRDF_FUNC "handleTpsFalseAlarm() failed" ); break; } } @@ -1134,7 +1134,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = resumeScrub( io_sc, eccErrorMask ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"resumeScrub() failed" ); + PRDF_ERR( PRDF_FUNC "resumeScrub() failed" ); break; } @@ -1154,7 +1154,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleTdComplete( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleTdComplete() failed" ); + PRDF_ERR( PRDF_FUNC "handleTdComplete() failed" ); } } @@ -1183,14 +1183,14 @@ int32_t CenMbaTdCtlr::startVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = mssGetMarkStore( iv_mbaTrgt, iv_rank, iv_mark ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetMarkStore() failed"); + PRDF_ERR( PRDF_FUNC "mssGetMarkStore() failed"); break; } o_rc = prepareNextCmd( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -1198,7 +1198,7 @@ int32_t CenMbaTdCtlr::startVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = doTdScrubCmd( COND_RT_VCM_DSD ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"doTdScrubCmd() failed" ); + PRDF_ERR( PRDF_FUNC "doTdScrubCmd() failed" ); break; } @@ -1228,7 +1228,7 @@ int32_t CenMbaTdCtlr::startVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = prepareNextCmd( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -1236,7 +1236,7 @@ int32_t CenMbaTdCtlr::startVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = doTdScrubCmd( COND_RT_VCM_DSD | mss_MaintCmd::STOP_ON_MCE ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"doTdScrubCmd() failed" ); + PRDF_ERR( PRDF_FUNC "doTdScrubCmd() failed" ); break; } @@ -1266,7 +1266,7 @@ int32_t CenMbaTdCtlr::startDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = prepareNextCmd( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -1275,7 +1275,7 @@ int32_t CenMbaTdCtlr::startDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc ) iv_isEccSteer ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssSetSteerMux() failed" ); + PRDF_ERR( PRDF_FUNC "mssSetSteerMux() failed" ); break; } @@ -1283,7 +1283,7 @@ int32_t CenMbaTdCtlr::startDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = doTdScrubCmd( COND_RT_VCM_DSD ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"doTdScrubCmd() failed" ); + PRDF_ERR( PRDF_FUNC "doTdScrubCmd() failed" ); break; } @@ -1316,7 +1316,7 @@ int32_t CenMbaTdCtlr::startTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = prepareNextCmd( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -1324,7 +1324,7 @@ int32_t CenMbaTdCtlr::startTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = setTpsThresholds(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setTpsThresholds() failed" ); + PRDF_ERR( PRDF_FUNC "setTpsThresholds() failed" ); break; } @@ -1339,7 +1339,7 @@ int32_t CenMbaTdCtlr::startTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = doTdScrubCmd( stopCond, mss_MaintCmdWrapper::SLAVE_RANK_ONLY ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"doTdScrubCmd() failed" ); + PRDF_ERR( PRDF_FUNC "doTdScrubCmd() failed" ); break; } @@ -1371,7 +1371,7 @@ int32_t CenMbaTdCtlr::startBgScrub( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = prepareNextCmd( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -1379,7 +1379,7 @@ int32_t CenMbaTdCtlr::startBgScrub( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = setRtEteThresholds(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setRtEteThresholds() failed" ); + PRDF_ERR( PRDF_FUNC "setRtEteThresholds() failed" ); break; } @@ -1388,7 +1388,7 @@ int32_t CenMbaTdCtlr::startBgScrub( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = unmaskFetchAttns(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"unmaskFetchAttns() failed" ); + PRDF_ERR( PRDF_FUNC "unmaskFetchAttns() failed" ); break; } @@ -1427,7 +1427,7 @@ int32_t CenMbaTdCtlr::startBgScrub( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = doBgScrubCmd( COND_BG_SCRUB ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"doBgScrubCmd() failed" ); + PRDF_ERR( PRDF_FUNC "doBgScrubCmd() failed" ); break; } @@ -1454,7 +1454,7 @@ int32_t CenMbaTdCtlr::startNextTd( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = startBgScrub( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"startBgScrub() failed" ); + PRDF_ERR( PRDF_FUNC "startBgScrub() failed" ); break; } } @@ -1472,7 +1472,7 @@ int32_t CenMbaTdCtlr::startNextTd( STEP_CODE_DATA_STRUCT & io_sc ) } if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"failed to start procedure for event %d", + PRDF_ERR( PRDF_FUNC "failed to start procedure for event %d", entry.type ); break; } @@ -1485,7 +1485,7 @@ int32_t CenMbaTdCtlr::startNextTd( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = maskFetchAttns(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"maskFetchAttns() failed" ); + PRDF_ERR( PRDF_FUNC "maskFetchAttns() failed" ); break; } @@ -1513,7 +1513,7 @@ int32_t CenMbaTdCtlr::resumeScrub( STEP_CODE_DATA_STRUCT & io_sc, (VCM_PHASE_1 != iv_tdState) && (VCM_PHASE_2 != iv_tdState) && (DSD_PHASE_1 != iv_tdState) && (TPS_PHASE_1 != iv_tdState) ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -1521,7 +1521,7 @@ int32_t CenMbaTdCtlr::resumeScrub( STEP_CODE_DATA_STRUCT & io_sc, o_rc = clearCeCounters( i_eccErrorMask ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"clearCeCounters() failed" ); + PRDF_ERR( PRDF_FUNC "clearCeCounters() failed" ); break; } @@ -1530,7 +1530,7 @@ int32_t CenMbaTdCtlr::resumeScrub( STEP_CODE_DATA_STRUCT & io_sc, o_rc = prepareNextCmd( io_sc, false ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -1538,14 +1538,14 @@ int32_t CenMbaTdCtlr::resumeScrub( STEP_CODE_DATA_STRUCT & io_sc, iv_mssCmd = createIncAddrMssCmd( iv_mbaTrgt ); if ( NULL == iv_mssCmd ) { - PRDF_ERR( PRDF_FUNC"createIncAddrMssCmd returned NULL" ); + PRDF_ERR( PRDF_FUNC "createIncAddrMssCmd returned NULL" ); o_rc = FAIL; break; } o_rc = iv_mssCmd->setupAndExecuteCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setupAndExecuteCmd() failed" ); + PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() failed" ); break; } @@ -1554,7 +1554,7 @@ int32_t CenMbaTdCtlr::resumeScrub( STEP_CODE_DATA_STRUCT & io_sc, o_rc = getCenMaintStartAddr( iv_mbaChip, addr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getCenMaintStartAddr() failed" ); + PRDF_ERR( PRDF_FUNC "getCenMaintStartAddr() failed" ); break; } @@ -1562,7 +1562,7 @@ int32_t CenMbaTdCtlr::resumeScrub( STEP_CODE_DATA_STRUCT & io_sc, o_rc = prepareNextCmd( io_sc, false ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -1610,7 +1610,7 @@ int32_t CenMbaTdCtlr::resumeScrub( STEP_CODE_DATA_STRUCT & io_sc, o_rc = doBgScrubCmd( stopCond, flags, &addr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"doBgScrubCmd() failed" ); + PRDF_ERR( PRDF_FUNC "doBgScrubCmd() failed" ); break; } } @@ -1620,7 +1620,7 @@ int32_t CenMbaTdCtlr::resumeScrub( STEP_CODE_DATA_STRUCT & io_sc, o_rc = doTdScrubCmd( stopCond, flags, &addr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"doTdScrubCmd() failed" ); + PRDF_ERR( PRDF_FUNC "doTdScrubCmd() failed" ); break; } } @@ -1661,7 +1661,7 @@ int32_t CenMbaTdCtlr::handleTdComplete( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = removeTdQueueEntry(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"removeTdQueueEntry() failed" ); + PRDF_ERR( PRDF_FUNC "removeTdQueueEntry() failed" ); break; } @@ -1669,7 +1669,7 @@ int32_t CenMbaTdCtlr::handleTdComplete( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = startNextTd( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"startNextTd() failed" ); + PRDF_ERR( PRDF_FUNC "startNextTd() failed" ); break; } @@ -1695,12 +1695,12 @@ int32_t CenMbaTdCtlr::addTdQueueEntryVCM( const CenRank & i_rank ) o_rc = mssGetMarkStore( iv_mbaTrgt, i_rank, mark ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetMarkStore() failed"); + PRDF_ERR( PRDF_FUNC "mssGetMarkStore() failed"); break; } if ( !mark.getCM().isValid() ) { - PRDF_ERR( PRDF_FUNC"VCM event but no valid chip mark" ); + PRDF_ERR( PRDF_FUNC "VCM event but no valid chip mark" ); o_rc = FAIL; break; } @@ -1711,7 +1711,7 @@ int32_t CenMbaTdCtlr::addTdQueueEntryVCM( const CenRank & i_rank ) o_rc = iv_masterRanks.setBad( i_rank ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setBad() failed" ); + PRDF_ERR( PRDF_FUNC "setBad() failed" ); break; } @@ -1719,7 +1719,7 @@ int32_t CenMbaTdCtlr::addTdQueueEntryVCM( const CenRank & i_rank ) if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_rank=m%ds%d", + PRDF_ERR( PRDF_FUNC "Failed: i_rank=m%ds%d", i_rank.getMaster(), i_rank.getSlave() ); } @@ -1752,7 +1752,7 @@ int32_t CenMbaTdCtlr::addTdQueueEntryTPS( const CenRank & i_rank, o_rc = mssGetMarkStore( iv_mbaTrgt, i_rank, mark ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetMarkStore() failed." ); + PRDF_ERR( PRDF_FUNC "mssGetMarkStore() failed." ); break; } if ( mark.getCM().isValid() && @@ -1763,7 +1763,7 @@ int32_t CenMbaTdCtlr::addTdQueueEntryTPS( const CenRank & i_rank, o_rc |= checkForAvailableSpares( 1, port1Available ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"checkForAvailableSpares() failed." ); + PRDF_ERR( PRDF_FUNC "checkForAvailableSpares() failed." ); break; } @@ -1791,7 +1791,7 @@ int32_t CenMbaTdCtlr::addTdQueueEntryTPS( const CenRank & i_rank, o_rc = iv_masterRanks.setBad( i_rank ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setBad() failed" ); + PRDF_ERR( PRDF_FUNC "setBad() failed" ); break; } @@ -1799,7 +1799,7 @@ int32_t CenMbaTdCtlr::addTdQueueEntryTPS( const CenRank & i_rank, if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_rank=m%ds%d i_banTps=%c", + PRDF_ERR( PRDF_FUNC "Failed: i_rank=m%ds%d i_banTps=%c", i_rank.getMaster(), i_rank.getSlave(), i_banTps ? 'T' : 'F' ); } @@ -1825,7 +1825,7 @@ int32_t CenMbaTdCtlr::removeTdQueueEntry() { o_rc = iv_masterRanks.setGood( iv_rank ); if ( SUCCESS != o_rc ) - PRDF_ERR( PRDF_FUNC"setGood() failed" ); + PRDF_ERR( PRDF_FUNC "setGood() failed" ); } return o_rc; @@ -1892,7 +1892,7 @@ int32_t CenMbaTdCtlr::handleUe_Td( STEP_CODE_DATA_STRUCT & io_sc, o_rc = DEALLOC::lmbGard( iv_mbaChip, i_stopAddr, false ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"lmbGard() failed" ); + PRDF_ERR( PRDF_FUNC "lmbGard() failed" ); break; } } @@ -1903,7 +1903,7 @@ int32_t CenMbaTdCtlr::handleUe_Td( STEP_CODE_DATA_STRUCT & io_sc, o_rc = addTdQueueEntryTPS( i_stopAddr.getRank(), io_sc, true ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"addTdQueueEntryTPS() failed" ); + PRDF_ERR( PRDF_FUNC "addTdQueueEntryTPS() failed" ); break; } } @@ -1962,7 +1962,7 @@ int32_t CenMbaTdCtlr::handleMpe_Tps( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = addTdQueueEntryVCM( iv_rank ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"addTdQueueEntryVCM() failed" ); + PRDF_ERR( PRDF_FUNC "addTdQueueEntryVCM() failed" ); break; } @@ -1978,7 +1978,7 @@ int32_t CenMbaTdCtlr::handleMpe_Tps( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = fir->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", fir_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", fir_str ); break; } @@ -2001,7 +2001,7 @@ int32_t CenMbaTdCtlr::handleCeEte_Tps( STEP_CODE_DATA_STRUCT & io_sc ) { if ( TPS_PHASE_1 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -2010,7 +2010,7 @@ int32_t CenMbaTdCtlr::handleCeEte_Tps( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = getTpsCeThr( thr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getTpsCeThr() failed." ); + PRDF_ERR( PRDF_FUNC "getTpsCeThr() failed." ); break; } @@ -2020,7 +2020,7 @@ int32_t CenMbaTdCtlr::handleCeEte_Tps( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = collectCeStats( iv_mbaChip, iv_rank, symData, targetCM, thr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"collectCeStats() failed." ); + PRDF_ERR( PRDF_FUNC "collectCeStats() failed." ); break; } @@ -2045,7 +2045,7 @@ int32_t CenMbaTdCtlr::handleCeEte_Tps( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = getBadDqBitmap( iv_mbaTrgt, iv_rank, bitmap ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getBadDqBitmap() failed" ); + PRDF_ERR( PRDF_FUNC "getBadDqBitmap() failed" ); break; } @@ -2058,7 +2058,7 @@ int32_t CenMbaTdCtlr::handleCeEte_Tps( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = setBadDqBitmap( iv_mbaTrgt, iv_rank, bitmap ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setBadDqBitmap() failed" ); + PRDF_ERR( PRDF_FUNC "setBadDqBitmap() failed" ); break; } @@ -2073,7 +2073,7 @@ int32_t CenMbaTdCtlr::handleCeEte_Tps( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = tpsChipMark( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"tpsChipMark() failed." ); + PRDF_ERR( PRDF_FUNC "tpsChipMark() failed." ); break; } @@ -2091,7 +2091,7 @@ int32_t CenMbaTdCtlr::handleCeEte_Tps( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = tpsChipMark( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"tpsChipMark() failed." ); + PRDF_ERR( PRDF_FUNC "tpsChipMark() failed." ); break; } @@ -2117,7 +2117,7 @@ int32_t CenMbaTdCtlr::handleCeEte_Tps( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = tpsSymbolMark( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"tpsSymbolMark() failed." ); + PRDF_ERR( PRDF_FUNC "tpsSymbolMark() failed." ); break; } } @@ -2139,7 +2139,7 @@ int32_t CenMbaTdCtlr::handleCeEte_Tps( STEP_CODE_DATA_STRUCT & io_sc ) available ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"checkForAvailableSpares() failed" ); + PRDF_ERR( PRDF_FUNC "checkForAvailableSpares() failed" ); break; } @@ -2184,7 +2184,7 @@ int32_t CenMbaTdCtlr::handleUe_NonTd( STEP_CODE_DATA_STRUCT & io_sc, o_rc = addTdQueueEntryTPS( iv_rank, io_sc, true ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"addTdQueueEntryTPS() failed" ); + PRDF_ERR( PRDF_FUNC "addTdQueueEntryTPS() failed" ); break; } @@ -2192,7 +2192,7 @@ int32_t CenMbaTdCtlr::handleUe_NonTd( STEP_CODE_DATA_STRUCT & io_sc, o_rc = DEALLOC::lmbGard( iv_mbaChip, i_addr, false ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"lmbGard() failed" ); + PRDF_ERR( PRDF_FUNC "lmbGard() failed" ); break; } @@ -2224,7 +2224,7 @@ int32_t CenMbaTdCtlr::handleMpe_NonTd( STEP_CODE_DATA_STRUCT & io_sc, o_rc = addTdQueueEntryVCM( iv_rank ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"addTdQueueEntryVCM() failed" ); + PRDF_ERR( PRDF_FUNC "addTdQueueEntryVCM() failed" ); break; } @@ -2233,7 +2233,7 @@ int32_t CenMbaTdCtlr::handleMpe_NonTd( STEP_CODE_DATA_STRUCT & io_sc, o_rc = mssGetMarkStore( iv_mbaTrgt, iv_rank, mark ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetMarkStore() failed"); + PRDF_ERR( PRDF_FUNC "mssGetMarkStore() failed"); break; } @@ -2274,7 +2274,7 @@ int32_t CenMbaTdCtlr::handleRceEte_NonTd( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = mbsec1->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Read() failed on %s", reg_str ); break; } @@ -2292,7 +2292,7 @@ int32_t CenMbaTdCtlr::handleRceEte_NonTd( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = addTdQueueEntryTPS( iv_rank, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"addTdQueueEntryTPS() failed" ); + PRDF_ERR( PRDF_FUNC "addTdQueueEntryTPS() failed" ); break; } } @@ -2321,7 +2321,7 @@ int32_t CenMbaTdCtlr::handleHardCeEte_NonTd( STEP_CODE_DATA_STRUCT & io_sc, o_rc = DEALLOC::pageGard( iv_mbaChip, i_addr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"pageGard() failed" ); + PRDF_ERR( PRDF_FUNC "pageGard() failed" ); break; } @@ -2332,13 +2332,13 @@ int32_t CenMbaTdCtlr::handleHardCeEte_NonTd( STEP_CODE_DATA_STRUCT & io_sc, o_rc = collectCeStats( iv_mbaChip, iv_rank, symData, junk ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"collectCeStats() failed." ); + PRDF_ERR( PRDF_FUNC "collectCeStats() failed." ); break; } if ( 1 != symData.size() ) { - PRDF_ERR( PRDF_FUNC"collectCeStats() return size %d, but was " + PRDF_ERR( PRDF_FUNC "collectCeStats() return size %d, but was " "expecting size 1", symData.size() ); o_rc = FAIL; break; @@ -2357,7 +2357,7 @@ int32_t CenMbaTdCtlr::handleHardCeEte_NonTd( STEP_CODE_DATA_STRUCT & io_sc, o_rc = addTdQueueEntryTPS( iv_rank, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"addTdQueueEntryTPS() failed" ); + PRDF_ERR( PRDF_FUNC "addTdQueueEntryTPS() failed" ); break; } } @@ -2394,7 +2394,7 @@ int32_t CenMbaTdCtlr::handleSoftIntCeEte_NonTd( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = addTdQueueEntryTPS( iv_rank, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"addTdQueueEntryTPS() failed" ); + PRDF_ERR( PRDF_FUNC "addTdQueueEntryTPS() failed" ); break; } @@ -2419,7 +2419,7 @@ int32_t CenMbaTdCtlr::handleTpsFalseAlarm( STEP_CODE_DATA_STRUCT & io_sc ) { if ( TPS_PHASE_1 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -2428,7 +2428,7 @@ int32_t CenMbaTdCtlr::handleTpsFalseAlarm( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = collectCeStats( iv_mbaChip, iv_rank, symData, junk ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"collectCeStats() failed." ); + PRDF_ERR( PRDF_FUNC "collectCeStats() failed." ); break; } @@ -2472,7 +2472,7 @@ int32_t CenMbaTdCtlr::handleTpsFalseAlarm( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = tpsSymbolMark( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"tpsSymbolMark() failed." ); + PRDF_ERR( PRDF_FUNC "tpsSymbolMark() failed." ); break; } @@ -2481,7 +2481,7 @@ int32_t CenMbaTdCtlr::handleTpsFalseAlarm( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = getBadDqBitmap( iv_mbaTrgt, iv_rank, bitmap ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getBadDqBitmap() failed" ); + PRDF_ERR( PRDF_FUNC "getBadDqBitmap() failed" ); break; } @@ -2490,7 +2490,7 @@ int32_t CenMbaTdCtlr::handleTpsFalseAlarm( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = setBadDqBitmap( iv_mbaTrgt, iv_rank, bitmap ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setBadDqBitmap() failed" ); + PRDF_ERR( PRDF_FUNC "setBadDqBitmap() failed" ); break; } } @@ -2501,7 +2501,7 @@ int32_t CenMbaTdCtlr::handleTpsFalseAlarm( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = tpsChipMark( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"tpsChipMark() failed" ); + PRDF_ERR( PRDF_FUNC "tpsChipMark() failed" ); break; } } @@ -2531,7 +2531,7 @@ int32_t CenMbaTdCtlr::getTpsCeThr( uint16_t & o_thr ) { if ( TPS_PHASE_1 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -2545,7 +2545,7 @@ int32_t CenMbaTdCtlr::getTpsCeThr( uint16_t & o_thr ) o_rc = getScrubCeThreshold( iv_mbaChip, iv_rank, o_thr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getScrubCeThreshold() failed." ); + PRDF_ERR( PRDF_FUNC "getScrubCeThreshold() failed." ); break; } } @@ -2569,7 +2569,7 @@ int32_t CenMbaTdCtlr::setTpsThresholds() { if ( TPS_PHASE_1 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -2581,7 +2581,7 @@ int32_t CenMbaTdCtlr::setTpsThresholds() o_rc = mbstr->ForceRead(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"ForceRead() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "ForceRead() failed on %s", reg_str ); break; } @@ -2608,7 +2608,7 @@ int32_t CenMbaTdCtlr::setTpsThresholds() o_rc = mbstr->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", reg_str ); break; } @@ -2633,7 +2633,7 @@ int32_t CenMbaTdCtlr::tpsChipMark( STEP_CODE_DATA_STRUCT & io_sc ) { if ( TPS_PHASE_1 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -2644,7 +2644,7 @@ int32_t CenMbaTdCtlr::tpsChipMark( STEP_CODE_DATA_STRUCT & io_sc ) allowWriteBlocked ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssSetMarkStore() failed" ); + PRDF_ERR( PRDF_FUNC "mssSetMarkStore() failed" ); break; } @@ -2662,7 +2662,7 @@ int32_t CenMbaTdCtlr::tpsChipMark( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = addTdQueueEntryVCM( iv_rank ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"addTdQueueEntryVCM() failed" ); + PRDF_ERR( PRDF_FUNC "addTdQueueEntryVCM() failed" ); break; } } @@ -2688,7 +2688,7 @@ int32_t CenMbaTdCtlr::tpsSymbolMark( STEP_CODE_DATA_STRUCT & io_sc ) { if ( TPS_PHASE_1 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -2699,7 +2699,7 @@ int32_t CenMbaTdCtlr::tpsSymbolMark( STEP_CODE_DATA_STRUCT & io_sc ) allowWriteBlocked ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssSetMarkStore() failed." ); + PRDF_ERR( PRDF_FUNC "mssSetMarkStore() failed." ); o_rc = FAIL; break; } @@ -2709,7 +2709,7 @@ int32_t CenMbaTdCtlr::tpsSymbolMark( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = addTdQueueEntryVCM( iv_rank ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"addTdQueueEntryVCM() failed" ); + PRDF_ERR( PRDF_FUNC "addTdQueueEntryVCM() failed" ); break; } @@ -2722,7 +2722,7 @@ int32_t CenMbaTdCtlr::tpsSymbolMark( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = firand->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", reg_str ); break; } @@ -2732,7 +2732,7 @@ int32_t CenMbaTdCtlr::tpsSymbolMark( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = mssSetMarkStore( iv_mbaTrgt, iv_rank, iv_mark, blocked ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssSetMarkStore() failed on retry." ); + PRDF_ERR( PRDF_FUNC "mssSetMarkStore() failed on retry." ); break; } @@ -2768,7 +2768,7 @@ int32_t CenMbaTdCtlr::maskFetchAttns() o_rc = reg->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", reg_str ); break; } @@ -2812,14 +2812,14 @@ int32_t CenMbaTdCtlr::unmaskFetchAttns() o_rc = fir->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", fir_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", fir_str ); break; } o_rc = msk->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", msk_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", msk_str ); break; } @@ -2851,7 +2851,7 @@ int32_t CenMbaTdCtlr::clearCeCounters( uint32_t i_eccErrorMask ) o_rc = ec0Reg->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on %s", ec0Reg_str ); + PRDF_ERR( PRDF_FUNC "Read() failed on %s", ec0Reg_str ); break; } @@ -2881,7 +2881,7 @@ int32_t CenMbaTdCtlr::clearCeCounters( uint32_t i_eccErrorMask ) o_rc = clearPerSymbolCounters( iv_membChip, iv_mbaPos ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"clearCeStats() failed " ); + PRDF_ERR( PRDF_FUNC "clearCeStats() failed " ); break; } } @@ -2897,7 +2897,7 @@ int32_t CenMbaTdCtlr::clearCeCounters( uint32_t i_eccErrorMask ) o_rc = ec1Reg->Read(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on %s", ec1Reg_str ); + PRDF_ERR( PRDF_FUNC "Read() failed on %s", ec1Reg_str ); break; } @@ -2906,7 +2906,7 @@ int32_t CenMbaTdCtlr::clearCeCounters( uint32_t i_eccErrorMask ) o_rc = ec1Reg->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", ec1Reg_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", ec1Reg_str ); break; } } @@ -2916,7 +2916,7 @@ int32_t CenMbaTdCtlr::clearCeCounters( uint32_t i_eccErrorMask ) o_rc = ec0Reg->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", ec0Reg_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", ec0Reg_str ); break; } } @@ -2948,14 +2948,14 @@ int32_t CenMbaTdCtlr::doBgScrubCmd( uint32_t i_stopCond, uint32_t i_flags, cmdSpeed, i_flags, i_sAddrOverride ); if ( NULL == iv_mssCmd ) { - PRDF_ERR( PRDF_FUNC"createMssCmd() failed"); + PRDF_ERR( PRDF_FUNC "createMssCmd() failed"); o_rc = FAIL; break; } o_rc = iv_mssCmd->setupAndExecuteCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setupAndExecuteCmd() failed" ); + PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() failed" ); break; } @@ -2986,14 +2986,14 @@ int32_t CenMbaTdCtlr::doTdScrubCmd( uint32_t i_stopCond, uint32_t i_flags, cmdSpeed, i_flags, i_sAddrOverride ); if ( NULL == iv_mssCmd ) { - PRDF_ERR( PRDF_FUNC"createMssCmd() failed"); + PRDF_ERR( PRDF_FUNC "createMssCmd() failed"); o_rc = FAIL; break; } o_rc = iv_mssCmd->setupAndExecuteCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setupAndExecuteCmd() failed" ); + PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() failed" ); break; } @@ -3023,7 +3023,7 @@ int32_t CenMbaTdCtlr::checkForAvailableSpares( uint8_t i_ps, bool & o_avail ) o_rc = getBadDqBitmap( iv_mbaTrgt, iv_rank, bitmap ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getBadDqBitmap() failed" ); + PRDF_ERR( PRDF_FUNC "getBadDqBitmap() failed" ); break; } @@ -3031,7 +3031,7 @@ int32_t CenMbaTdCtlr::checkForAvailableSpares( uint8_t i_ps, bool & o_avail ) o_rc = bitmap.isDramSpareAvailable( i_ps, dramSparePossible ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"isDramSpareAvailable() failed" ); + PRDF_ERR( PRDF_FUNC "isDramSpareAvailable() failed" ); break; } @@ -3043,7 +3043,7 @@ int32_t CenMbaTdCtlr::checkForAvailableSpares( uint8_t i_ps, bool & o_avail ) o_rc = mssGetSteerMux( iv_mbaTrgt, iv_rank, sp0, sp1, ecc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetSteerMux() failed" ); + PRDF_ERR( PRDF_FUNC "mssGetSteerMux() failed" ); break; } diff --git a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdRankData.C b/src/usr/diag/prdf/common/runtime/prdfCenMbaTdRankData.C index 06cbec5f7..0e1999db1 100644 --- a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdRankData.C +++ b/src/usr/diag/prdf/common/runtime/prdfCenMbaTdRankData.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014 */ +/* Contributors Listed Below - COPYRIGHT 2014,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -54,14 +54,14 @@ int32_t TdRankList::initialize( TargetHandle_t i_mbaTrgt ) o_rc = getMasterRanks( i_mbaTrgt, ranks ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getMasterRanks() failed" ); + PRDF_ERR( PRDF_FUNC "getMasterRanks() failed" ); break; } // Make sure the list is not empty for some reason. if ( ranks.empty() ) { - PRDF_ERR( PRDF_FUNC"getMasterRanks() returned an empty list" ); + PRDF_ERR( PRDF_FUNC "getMasterRanks() returned an empty list" ); o_rc = FAIL; break; } @@ -125,7 +125,7 @@ int32_t TdRankList::setInterruptedRank( const CenRank & i_rank ) ListItr it = findRank( i_rank ); if ( iv_list.end() == it ) { - PRDF_ERR( PRDF_FUNC"findRank() failed: i_rank=%d", i_rank.getMaster() ); + PRDF_ERR( PRDF_FUNC "findRank() failed: i_rank=%d", i_rank.getMaster() ); o_rc = FAIL; } else @@ -149,7 +149,7 @@ int32_t TdRankList::setRankStatus( const CenRank & i_rank, bool i_isGood ) ListItr it = findRank( i_rank ); if ( iv_list.end() == it ) { - PRDF_ERR( PRDF_FUNC"findRank() failed: i_rank=%d i_isGood=%c", + PRDF_ERR( PRDF_FUNC "findRank() failed: i_rank=%d i_isGood=%c", i_rank.getMaster(), i_isGood ? 'T' : 'F' ); o_rc = FAIL; } diff --git a/src/usr/diag/prdf/framework/config/prdfMbaDomain.C b/src/usr/diag/prdf/framework/config/prdfMbaDomain.C index fff0bc20e..a53c83522 100644 --- a/src/usr/diag/prdf/framework/config/prdfMbaDomain.C +++ b/src/usr/diag/prdf/framework/config/prdfMbaDomain.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2015 */ +/* [+] 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. */ @@ -56,7 +58,7 @@ int32_t MbaDomain::startScrub() int32_t l_rc = mbadb->iv_tdCtlr.startInitialBgScrub(); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"startInitialBgScrub() failed: MBA=0x%08x", + PRDF_ERR( PRDF_FUNC "startInitialBgScrub() failed: MBA=0x%08x", mbaChip->GetId() ); o_rc = FAIL; continue; // Keep going. } diff --git a/src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.C b/src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.C index e5357d8db..0189c3567 100755 --- a/src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.C +++ b/src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.C @@ -61,7 +61,7 @@ errlHndl_t FileScomAccessor::Access( bs.SetFieldJustify(32, 32, data ); break; default: - PRDF_ERR(PRDF_FUNC"Wrong Operation:%u", operation); + PRDF_ERR(PRDF_FUNC "Wrong Operation:%u", operation); } return errlH; diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.C b/src/usr/diag/prdf/framework/service/prdfPlatServices.C index 7236f8f90..724b1a11c 100644 --- a/src/usr/diag/prdf/framework/service/prdfPlatServices.C +++ b/src/usr/diag/prdf/framework/service/prdfPlatServices.C @@ -126,7 +126,7 @@ TARGETING::TargetHandle_t getMasterCore( TARGETING::TargetHandle_t i_procTgt ) { #define PRDF_FUNC "[PlatServices::getMasterCore] " - PRDF_ERR( PRDF_FUNC"MasterCore info not available in hostboot: PROC = " + PRDF_ERR( PRDF_FUNC "MasterCore info not available in hostboot: PROC = " "0x%08x ",getHuid( i_procTgt ) ); return NULL; @@ -158,7 +158,7 @@ int32_t getCfam( ExtensibleChip * i_chip, if( l_pMasterProcChip == l_procTgt ) { - PRDF_DTRAC( PRDF_FUNC"can't access CFAM from master " + PRDF_DTRAC( PRDF_FUNC "can't access CFAM from master " "proc: 0x%.8X", i_chip->GetId() ); break; } @@ -180,7 +180,7 @@ int32_t getCfam( ExtensibleChip * i_chip, else { rc = FAIL; - PRDF_ERR( PRDF_FUNC"chip: 0x%.8X, failed to get cfam address: " + PRDF_ERR( PRDF_FUNC "chip: 0x%.8X, failed to get cfam address: " "0x%X", i_chip->GetId(), i_addr ); PRDF_COMMIT_ERRL(errH, ERRL_ACTION_SA|ERRL_ACTION_REPORT); break; diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C b/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C index 6eb63d5e0..d53d3711c 100644 --- a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C +++ b/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014 */ +/* Contributors Listed Below - COPYRIGHT 2014,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -83,7 +83,7 @@ int32_t mdiaSendEventMsg( TargetHandle_t i_mbaTarget, TYPE l_type = getTargetType(i_mbaTarget); if ( TYPE_MBA != l_type ) { - PRDF_ERR( PRDF_FUNC"unsupported target type %d", l_type ); + PRDF_ERR( PRDF_FUNC "unsupported target type %d", l_type ); o_rc = FAIL; break; } @@ -97,7 +97,7 @@ int32_t mdiaSendEventMsg( TargetHandle_t i_mbaTarget, errlHndl_t errl = MDIA::processEvent( l_mdiaEvent ); if ( NULL != errl ) { - PRDF_ERR( PRDF_FUNC"MDIA::processEvent() failed" ); + PRDF_ERR( PRDF_FUNC "MDIA::processEvent() failed" ); PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT ); o_rc = FAIL; break; @@ -107,7 +107,7 @@ int32_t mdiaSendEventMsg( TargetHandle_t i_mbaTarget, if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed: i_target=0x%08x i_eventType=%d", + PRDF_ERR( PRDF_FUNC "Failed: i_target=0x%08x i_eventType=%d", getHuid(i_mbaTarget), i_eventType ); } @@ -160,7 +160,7 @@ int32_t mssIplUeIsolation( TargetHandle_t i_mba, const CenRank & i_rank, i_rank.getMaster(), data ); if ( NULL != errl ) { - PRDF_ERR( PRDF_FUNC"mss_IPL_UE_isolation() failed: MBA=0x%08x " + PRDF_ERR( PRDF_FUNC "mss_IPL_UE_isolation() failed: MBA=0x%08x " "rank=%d", getHuid(i_mba), i_rank.getMaster() ); PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT ); o_rc = FAIL; diff --git a/src/usr/diag/prdf/mnfgtools/prdfMfgSync.C b/src/usr/diag/prdf/mnfgtools/prdfMfgSync.C index e632c75cc..0c8302ea1 100755 --- a/src/usr/diag/prdf/mnfgtools/prdfMfgSync.C +++ b/src/usr/diag/prdf/mnfgtools/prdfMfgSync.C @@ -77,7 +77,7 @@ errlHndl_t MfgSync::syncMfgTraceToFsp( ErrorSignature *i_esig, if( NULL != l_err ) { - PRDF_ERR( PRDF_FUNC" failed to send mbox msg" ); + PRDF_ERR( PRDF_FUNC " failed to send mbox msg" ); break; } }while(0); @@ -122,7 +122,7 @@ errlHndl_t MfgSync::sendMboxMsg( msg_t * i_msg, bool i_expectResponse ) if( NULL != l_errl ) { - PRDF_TRAC(FUNC" failed to send mbox msg"); + PRDF_TRAC(FUNC " failed to send mbox msg"); } PRDF_EXIT( FUNC ); diff --git a/src/usr/diag/prdf/occ_firdata/prdfReadPnorFirData.C b/src/usr/diag/prdf/occ_firdata/prdfReadPnorFirData.C index 7f4b02dd9..b0edf2a82 100644 --- a/src/usr/diag/prdf/occ_firdata/prdfReadPnorFirData.C +++ b/src/usr/diag/prdf/occ_firdata/prdfReadPnorFirData.C @@ -149,7 +149,7 @@ errlHndl_t readPnorData( uint8_t * & o_pBuf, size_t & o_pBufSize ) errlHndl_t errl = PNOR::getSectionInfo( PNOR::FIRDATA, info ); if ( NULL != errl ) { - PRDF_ERR( FUNC"getSectionInfo() failed" ); + PRDF_ERR( FUNC "getSectionInfo() failed" ); } else { @@ -183,7 +183,7 @@ errlHndl_t readPnorFirData( bool & o_validData, PnorTrgtMap & o_trgtMap, errl = readPnorData( pBuf, sz_pBuf ); if ( NULL != errl ) { - PRDF_ERR( FUNC"readPnorData() failed" ); + PRDF_ERR( FUNC "readPnorData() failed" ); break; } @@ -214,7 +214,7 @@ errlHndl_t readPnorFirData( bool & o_validData, PnorTrgtMap & o_trgtMap, TargetHandle_t trgtHndl = getTargetHandle( pTrgt ); if ( NULL == trgtHndl ) { - PRDF_ERR( FUNC"getTargetHandle() failed" ); + PRDF_ERR( FUNC "getTargetHandle() failed" ); /*@ * @errortype @@ -268,7 +268,7 @@ errlHndl_t readPnorFirData( bool & o_validData, PnorTrgtMap & o_trgtMap, if ( full ) { - PRDF_ERR( FUNC"Needed more data than availabe in PNOR (%d bytes)", + PRDF_ERR( FUNC "Needed more data than availabe in PNOR (%d bytes)", sz_pBuf ); /*@ * @errortype diff --git a/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C b/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C index 5ac21fdbb..560285f2f 100644 --- a/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C +++ b/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C @@ -487,7 +487,7 @@ errlHndl_t getHwConfig( HOMER_Data_t & o_data ) errl = PNOR::getSectionInfo( PNOR::FIRDATA, sectionInfo ); if ( NULL != errl ) { - PRDF_ERR( FUNC"getSectionInfo() failed" ); + PRDF_ERR( FUNC "getSectionInfo() failed" ); break; } @@ -507,7 +507,7 @@ errlHndl_t getHwConfig( HOMER_Data_t & o_data ) TargetHandle_t masterProc = getMasterProc(); if ( NULL == masterProc ) { - PRDF_ERR( FUNC"master PROC is NULL" ); + PRDF_ERR( FUNC "master PROC is NULL" ); /*@ * @errortype @@ -613,7 +613,7 @@ errlHndl_t writeHomerFirData( uint8_t * i_hBuf, size_t i_hBufSize ) errl = getHwConfig( data ); if ( NULL != errl ) { - PRDF_ERR( FUNC"getHwConfig() failed" ); + PRDF_ERR( FUNC "getHwConfig() failed" ); break; } @@ -643,7 +643,7 @@ errlHndl_t writeHomerFirData( uint8_t * i_hBuf, size_t i_hBufSize ) // Verify data will fit in HOMER. if ( i_hBufSize < sz_hBuf ) { - PRDF_ERR( FUNC"Required data size %d is greater that available " + PRDF_ERR( FUNC "Required data size %d is greater that available " "HOMER data %d", sz_hBuf, i_hBufSize ); /*@ * @errortype diff --git a/src/usr/diag/prdf/plat/pegasus/prdfCenMbaIplCeStats.C b/src/usr/diag/prdf/plat/pegasus/prdfCenMbaIplCeStats.C index 7792e3178..d0da2919b 100755 --- a/src/usr/diag/prdf/plat/pegasus/prdfCenMbaIplCeStats.C +++ b/src/usr/diag/prdf/plat/pegasus/prdfCenMbaIplCeStats.C @@ -101,7 +101,7 @@ int32_t CenMbaIplCeStats::collectStats( const CenRank & i_stopRank ) o_rc = MemUtils::collectCeStats( iv_mbaChip, i_stopRank, symData, junk); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"MemUtils::collectCeStats() failed. MBA:0X%08X", + PRDF_ERR( PRDF_FUNC "MemUtils::collectCeStats() failed. MBA:0X%08X", getHuid( iv_mbaChip->GetChipHandle() ) ); break; } @@ -171,7 +171,7 @@ int32_t CenMbaIplCeStats::analyzeStats( bool & o_callOutsMade ) o_rc = calloutCePerDram( o_callOutsMade ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC" calloutCePerDram() failed. MBA:0X%08X", + PRDF_ERR( PRDF_FUNC " calloutCePerDram() failed. MBA:0X%08X", getHuid( mbaTrgt ) ); break; } @@ -179,7 +179,7 @@ int32_t CenMbaIplCeStats::analyzeStats( bool & o_callOutsMade ) o_rc = calloutCePerRank( o_callOutsMade ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"calloutCePerRank() failed. MBA:0X%08X", + PRDF_ERR( PRDF_FUNC "calloutCePerRank() failed. MBA:0X%08X", getHuid( mbaTrgt ) ); break; } @@ -187,7 +187,7 @@ int32_t CenMbaIplCeStats::analyzeStats( bool & o_callOutsMade ) o_rc = calloutCePerDs( o_callOutsMade ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC" calloutCePerDs() failed. MBA:0X%08X", + PRDF_ERR( PRDF_FUNC " calloutCePerDs() failed. MBA:0X%08X", getHuid( mbaTrgt ) ); break; } @@ -211,7 +211,7 @@ int32_t CenMbaIplCeStats::calloutHardCes( const CenRank & i_stopRank ) o_rc = MemUtils::collectCeStats( iv_mbaChip, i_stopRank, symData, junk); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"MemUtils::collectCeStats() failed. MBA:0X%08X", + PRDF_ERR( PRDF_FUNC "MemUtils::collectCeStats() failed. MBA:0X%08X", getHuid( iv_mbaChip->GetChipHandle() ) ); break; } diff --git a/src/usr/diag/prdf/plat/pegasus/prdfCenMbaTdCtlr_ipl.C b/src/usr/diag/prdf/plat/pegasus/prdfCenMbaTdCtlr_ipl.C index 229661cf3..9ecb1914a 100644 --- a/src/usr/diag/prdf/plat/pegasus/prdfCenMbaTdCtlr_ipl.C +++ b/src/usr/diag/prdf/plat/pegasus/prdfCenMbaTdCtlr_ipl.C @@ -85,7 +85,7 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) { if ( !isInMdiaMode() ) { - PRDF_ERR( PRDF_FUNC"A hostboot maintenance command complete " + PRDF_ERR( PRDF_FUNC "A hostboot maintenance command complete " "attention occurred while MDIA was not running." ); o_rc = FAIL; break; @@ -94,7 +94,7 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = initialize(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"initialize() failed" ); + PRDF_ERR( PRDF_FUNC "initialize() failed" ); break; } @@ -102,7 +102,7 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = mdiaSendEventMsg( iv_mbaTrgt, MDIA::RESET_TIMER ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mdiaSendEventMsg(RESET_TIMER) failed" ); + PRDF_ERR( PRDF_FUNC "mdiaSendEventMsg(RESET_TIMER) failed" ); break; } @@ -113,7 +113,7 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = getCenMaintStartAddr( iv_mbaChip, stopAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getCenMaintStartAddr() failed" ); + PRDF_ERR( PRDF_FUNC "getCenMaintStartAddr() failed" ); break; } @@ -121,14 +121,14 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = getCenMaintEndAddr( iv_mbaChip, endAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getCenMaintEndAddr() failed" ); + PRDF_ERR( PRDF_FUNC "getCenMaintEndAddr() failed" ); break; } // Call analysis function based on state. if ( NULL == cv_cmdCompleteFuncs[iv_tdState] ) { - PRDF_ERR( PRDF_FUNC"Function for state %d not supported", + PRDF_ERR( PRDF_FUNC "Function for state %d not supported", iv_tdState ); o_rc = FAIL; break; } @@ -137,7 +137,7 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) endAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed to continue analysis" ); + PRDF_ERR( PRDF_FUNC "Failed to continue analysis" ); break; } @@ -150,7 +150,7 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = prepareNextCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -162,7 +162,7 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = signalMdiaCmdComplete(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"signalMdiaCmdComplete() failed" ); + PRDF_ERR( PRDF_FUNC "signalMdiaCmdComplete() failed" ); break; } @@ -176,17 +176,17 @@ int32_t CenMbaTdCtlr::handleCmdCompleteEvent( STEP_CODE_DATA_STRUCT & io_sc ) if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Failed." ); + PRDF_ERR( PRDF_FUNC "Failed." ); badPathErrorHandling( io_sc ); int32_t l_rc = cleanupPrevCmd(); // Just in case. if ( SUCCESS != l_rc ) - PRDF_ERR( PRDF_FUNC"cleanupPrevCmd() failed" ); + PRDF_ERR( PRDF_FUNC "cleanupPrevCmd() failed" ); // Tell MDIA to skip further analysis on this MBA. l_rc = mdiaSendEventMsg( iv_mbaTrgt, MDIA::SKIP_MBA ); if ( SUCCESS != l_rc ) - PRDF_ERR( PRDF_FUNC"mdiaSendEventMsg(SKIP_MBA) failed" ); + PRDF_ERR( PRDF_FUNC "mdiaSendEventMsg(SKIP_MBA) failed" ); } return o_rc; @@ -207,7 +207,7 @@ int32_t CenMbaTdCtlr::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc, // at this time. Instead, print a trace statement indicating the intended // request. Note that any VCM request will eventually be found during the // initialization of the runtime TD controller. - PRDF_INF( PRDF_FUNC"TD request found during Hostboot: iv_mbaChip=0x%08x " + PRDF_INF( PRDF_FUNC "TD request found during Hostboot: iv_mbaChip=0x%08x " "i_rank=M%dS%d i_event=%d i_banTps=%c", iv_mbaChip->GetId(), i_rank.getMaster(), i_rank.getSlave(), i_event, i_banTps ? 'T' : 'F' ); @@ -239,7 +239,7 @@ int32_t CenMbaTdCtlr::startInitialBgScrub() // logic issue. if ( !iv_initialized ) { - PRDF_ERR( PRDF_FUNC"TD controller not initialized." ); + PRDF_ERR( PRDF_FUNC "TD controller not initialized." ); break; } @@ -249,7 +249,7 @@ int32_t CenMbaTdCtlr::startInitialBgScrub() o_rc = prepareNextCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -257,7 +257,7 @@ int32_t CenMbaTdCtlr::startInitialBgScrub() o_rc = setRtEteThresholds(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setRtEteThresholds() failed" ); + PRDF_ERR( PRDF_FUNC "setRtEteThresholds() failed" ); break; } @@ -266,7 +266,7 @@ int32_t CenMbaTdCtlr::startInitialBgScrub() o_rc = getMemAddrRange( iv_mbaTrgt, startAddr, junk ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getMemAddrRange() failed" ); + PRDF_ERR( PRDF_FUNC "getMemAddrRange() failed" ); break; } @@ -302,14 +302,14 @@ int32_t CenMbaTdCtlr::startInitialBgScrub() mss_MaintCmdWrapper::END_OF_MEMORY ); if ( NULL == iv_mssCmd ) { - PRDF_ERR( PRDF_FUNC"createMssCmd() failed" ); + PRDF_ERR( PRDF_FUNC "createMssCmd() failed" ); o_rc = FAIL; break; } o_rc = iv_mssCmd->setupAndExecuteCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setupAndExecuteCmd() failed" ); + PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() failed" ); break; } @@ -320,12 +320,12 @@ int32_t CenMbaTdCtlr::startInitialBgScrub() // Can't use badPathErrorHandling() because there is no SDC created when // this function is called. - PRDF_ERR( PRDF_FUNC"iv_mbaChip:0x%08x iv_initialized:%c", + PRDF_ERR( PRDF_FUNC "iv_mbaChip:0x%08x iv_initialized:%c", iv_mbaChip->GetId(), iv_initialized ? 'T' : 'F' ); int32_t l_rc = cleanupPrevCmd(); // Just in case. if ( SUCCESS != l_rc ) - PRDF_ERR( PRDF_FUNC"cleanupPrevCmd() failed" ); + PRDF_ERR( PRDF_FUNC "cleanupPrevCmd() failed" ); } return o_rc; @@ -351,7 +351,7 @@ int32_t CenMbaTdCtlr::initialize() o_rc = CenMbaTdCtlrCommon::initialize(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"CenMbaTdCtlrCommon::initialize() failed" ); + PRDF_ERR( PRDF_FUNC "CenMbaTdCtlrCommon::initialize() failed" ); break; } @@ -379,7 +379,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, { if ( NO_OP != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -392,7 +392,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = checkEccErrors( eccErrorMask, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"checkEccErrors() failed" ); + PRDF_ERR( PRDF_FUNC "checkEccErrors() failed" ); break; } @@ -402,7 +402,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleUE( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleUE() failed" ); + PRDF_ERR( PRDF_FUNC "handleUE() failed" ); break; } } @@ -411,7 +411,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleMPE( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleMPE() failed"); + PRDF_ERR( PRDF_FUNC "handleMPE() failed"); break; } } @@ -423,7 +423,7 @@ int32_t CenMbaTdCtlr::analyzeCmdComplete( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleMnfgCeEte( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleMnfgCeEte() failed" ); + PRDF_ERR( PRDF_FUNC "handleMnfgCeEte() failed" ); break; } } @@ -454,7 +454,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc, { if ( VCM_PHASE_1 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -466,7 +466,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = checkEccErrors( eccErrorMask, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"checkEccErrors() failed" ); + PRDF_ERR( PRDF_FUNC "checkEccErrors() failed" ); break; } @@ -476,7 +476,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleUE( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleUE() failed" ); + PRDF_ERR( PRDF_FUNC "handleUE() failed" ); break; } } @@ -486,7 +486,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = startVcmPhase2( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"startVcmPhase2() failed" ); + PRDF_ERR( PRDF_FUNC "startVcmPhase2() failed" ); break; } } @@ -512,7 +512,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, { if ( VCM_PHASE_2 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -524,7 +524,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = checkEccErrors( eccErrorMask, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"checkEccErrors() failed" ); + PRDF_ERR( PRDF_FUNC "checkEccErrors() failed" ); break; } @@ -534,7 +534,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleUE( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleUE() failed" ); + PRDF_ERR( PRDF_FUNC "handleUE() failed" ); break; } } @@ -546,7 +546,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleMCE_VCM2( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleMCE_VCM2() failed" ); + PRDF_ERR( PRDF_FUNC "handleMCE_VCM2() failed" ); break; } } @@ -571,7 +571,7 @@ int32_t CenMbaTdCtlr::analyzeVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = mssSetMarkStore( iv_mbaTrgt, iv_rank, iv_mark, blocked ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssSetMarkStore() failed" ); + PRDF_ERR( PRDF_FUNC "mssSetMarkStore() failed" ); break; } } @@ -597,7 +597,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc, { if ( DSD_PHASE_1 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -609,7 +609,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = checkEccErrors( eccErrorMask, io_sc ); if ( SUCCESS != o_rc) { - PRDF_ERR( PRDF_FUNC"checkEccErrors() failed" ); + PRDF_ERR( PRDF_FUNC "checkEccErrors() failed" ); break; } @@ -619,7 +619,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleUE( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleUE() failed" ); + PRDF_ERR( PRDF_FUNC "handleUE() failed" ); break; } } @@ -629,7 +629,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = startDsdPhase2( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"startDsdPhase2() failed" ); + PRDF_ERR( PRDF_FUNC "startDsdPhase2() failed" ); break; } } @@ -655,7 +655,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase2( STEP_CODE_DATA_STRUCT & io_sc, { if ( DSD_PHASE_2 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -667,7 +667,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = checkEccErrors( eccErrorMask, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"checkEccErrors() failed" ); + PRDF_ERR( PRDF_FUNC "checkEccErrors() failed" ); break; } @@ -677,7 +677,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleUE( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleUE() failed" ); + PRDF_ERR( PRDF_FUNC "handleUE() failed" ); break; } } @@ -689,7 +689,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleMCE_DSD2( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleMCE_DSD2() failed" ); + PRDF_ERR( PRDF_FUNC "handleMCE_DSD2() failed" ); break; } } @@ -705,7 +705,7 @@ int32_t CenMbaTdCtlr::analyzeDsdPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = mssSetMarkStore( iv_mbaTrgt, iv_rank, iv_mark, blocked ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssSetMarkStore() failed" ); + PRDF_ERR( PRDF_FUNC "mssSetMarkStore() failed" ); break; } } @@ -733,7 +733,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, { if ( TPS_PHASE_1 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -742,7 +742,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = mbadb->getIplCeStats()->collectStats( iv_rank ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"collectStats() failed"); + PRDF_ERR( PRDF_FUNC "collectStats() failed"); break; } @@ -751,7 +751,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = checkEccErrors( eccErrorMask, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"checkEccErrors() failed" ); + PRDF_ERR( PRDF_FUNC "checkEccErrors() failed" ); break; } @@ -761,7 +761,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleUE( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleUE() failed" ); + PRDF_ERR( PRDF_FUNC "handleUE() failed" ); break; } } @@ -770,7 +770,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleMPE( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleMPE() failed"); + PRDF_ERR( PRDF_FUNC "handleMPE() failed"); break; } } @@ -784,7 +784,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc, o_rc = startTpsPhase2( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"startTpsPhase2() failed" ); + PRDF_ERR( PRDF_FUNC "startTpsPhase2() failed" ); break; } } @@ -810,7 +810,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase2( STEP_CODE_DATA_STRUCT & io_sc, { if ( TPS_PHASE_2 != iv_tdState ) { - PRDF_ERR( PRDF_FUNC"Invalid state machine configuration" ); + PRDF_ERR( PRDF_FUNC "Invalid state machine configuration" ); o_rc = FAIL; break; } @@ -819,7 +819,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = mbadb->getIplCeStats()->calloutHardCes( iv_rank ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"calloutHardCes() failed"); + PRDF_ERR( PRDF_FUNC "calloutHardCes() failed"); break; } @@ -828,7 +828,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = checkEccErrors( eccErrorMask, io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"checkEccErrors() failed" ); + PRDF_ERR( PRDF_FUNC "checkEccErrors() failed" ); break; } @@ -838,7 +838,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleUE( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleUE() failed" ); + PRDF_ERR( PRDF_FUNC "handleUE() failed" ); break; } } @@ -847,7 +847,7 @@ int32_t CenMbaTdCtlr::analyzeTpsPhase2( STEP_CODE_DATA_STRUCT & io_sc, o_rc = handleMPE( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"handleMPE() failed"); + PRDF_ERR( PRDF_FUNC "handleMPE() failed"); break; } } @@ -885,7 +885,7 @@ int32_t CenMbaTdCtlr::startVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = prepareNextCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -894,14 +894,14 @@ int32_t CenMbaTdCtlr::startVcmPhase1( STEP_CODE_DATA_STRUCT & io_sc ) iv_mbaTrgt, iv_rank, COND_TARGETED_CMD ); if ( NULL == iv_mssCmd ) { - PRDF_ERR( PRDF_FUNC"createMssCmd() failed"); + PRDF_ERR( PRDF_FUNC "createMssCmd() failed"); o_rc = FAIL; break; } o_rc = iv_mssCmd->setupAndExecuteCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setupAndExecuteCmd() failed" ); + PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() failed" ); break; } @@ -928,7 +928,7 @@ int32_t CenMbaTdCtlr::startVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = prepareNextCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -937,14 +937,14 @@ int32_t CenMbaTdCtlr::startVcmPhase2( STEP_CODE_DATA_STRUCT & io_sc ) iv_mbaTrgt, iv_rank, COND_TARGETED_CMD ); if ( NULL == iv_mssCmd ) { - PRDF_ERR( PRDF_FUNC"createMssCmd() failed"); + PRDF_ERR( PRDF_FUNC "createMssCmd() failed"); o_rc = FAIL; break; } o_rc = iv_mssCmd->setupAndExecuteCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setupAndExecuteCmd() failed" ); + PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() failed" ); break; } @@ -971,7 +971,7 @@ int32_t CenMbaTdCtlr::startDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = prepareNextCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -980,7 +980,7 @@ int32_t CenMbaTdCtlr::startDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc ) iv_isEccSteer ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssSetSteerMux() failed" ); + PRDF_ERR( PRDF_FUNC "mssSetSteerMux() failed" ); break; } @@ -989,14 +989,14 @@ int32_t CenMbaTdCtlr::startDsdPhase1( STEP_CODE_DATA_STRUCT & io_sc ) iv_mbaTrgt, iv_rank, COND_TARGETED_CMD ); if ( NULL == iv_mssCmd ) { - PRDF_ERR( PRDF_FUNC"createMssCmd() failed"); + PRDF_ERR( PRDF_FUNC "createMssCmd() failed"); o_rc = FAIL; break; } o_rc = iv_mssCmd->setupAndExecuteCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setupAndExecuteCmd() failed" ); + PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() failed" ); break; } @@ -1023,7 +1023,7 @@ int32_t CenMbaTdCtlr::startDsdPhase2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = prepareNextCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -1032,14 +1032,14 @@ int32_t CenMbaTdCtlr::startDsdPhase2( STEP_CODE_DATA_STRUCT & io_sc ) iv_mbaTrgt, iv_rank, COND_TARGETED_CMD ); if ( NULL == iv_mssCmd ) { - PRDF_ERR( PRDF_FUNC"createMssCmd() failed"); + PRDF_ERR( PRDF_FUNC "createMssCmd() failed"); o_rc = FAIL; break; } o_rc = iv_mssCmd->setupAndExecuteCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setupAndExecuteCmd() failed" ); + PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() failed" ); break; } @@ -1066,7 +1066,7 @@ int32_t CenMbaTdCtlr::startTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = prepareNextCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -1075,7 +1075,7 @@ int32_t CenMbaTdCtlr::startTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = mnfgCeSetup(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mnfgCeSetup() failed" ); + PRDF_ERR( PRDF_FUNC "mnfgCeSetup() failed" ); break; } @@ -1086,14 +1086,14 @@ int32_t CenMbaTdCtlr::startTpsPhase1( STEP_CODE_DATA_STRUCT & io_sc ) mss_MaintCmdWrapper::SLAVE_RANK_ONLY ); if ( NULL == iv_mssCmd ) { - PRDF_ERR( PRDF_FUNC"createMssCmd() failed"); + PRDF_ERR( PRDF_FUNC "createMssCmd() failed"); o_rc = FAIL; break; } o_rc = iv_mssCmd->setupAndExecuteCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setupAndExecuteCmd() failed" ); + PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() failed" ); break; } @@ -1120,7 +1120,7 @@ int32_t CenMbaTdCtlr::startTpsPhase2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = prepareNextCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"prepareNextCmd() failed" ); + PRDF_ERR( PRDF_FUNC "prepareNextCmd() failed" ); break; } @@ -1129,7 +1129,7 @@ int32_t CenMbaTdCtlr::startTpsPhase2( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = mnfgCeSetup(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mnfgCeSetup() failed" ); + PRDF_ERR( PRDF_FUNC "mnfgCeSetup() failed" ); break; } @@ -1140,14 +1140,14 @@ int32_t CenMbaTdCtlr::startTpsPhase2( STEP_CODE_DATA_STRUCT & io_sc ) mss_MaintCmdWrapper::SLAVE_RANK_ONLY ); if ( NULL == iv_mssCmd ) { - PRDF_ERR( PRDF_FUNC"createMssCmd() failed"); + PRDF_ERR( PRDF_FUNC "createMssCmd() failed"); o_rc = FAIL; break; } o_rc = iv_mssCmd->setupAndExecuteCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"setupAndExecuteCmd() failed" ); + PRDF_ERR( PRDF_FUNC "setupAndExecuteCmd() failed" ); break; } @@ -1182,7 +1182,7 @@ int32_t CenMbaTdCtlr::handleUE( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = cleanupPrevCmd(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"cleanupPrevCmd() failed" ); + PRDF_ERR( PRDF_FUNC "cleanupPrevCmd() failed" ); break; } @@ -1191,7 +1191,7 @@ int32_t CenMbaTdCtlr::handleUE( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = mssIplUeIsolation( iv_mbaTrgt, iv_rank, bitmap ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssIplUeIsolation() failed" ); + PRDF_ERR( PRDF_FUNC "mssIplUeIsolation() failed" ); break; } @@ -1206,7 +1206,7 @@ int32_t CenMbaTdCtlr::handleUE( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = bitmap.badDqs( ps, badDqs ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"badDqs(%d) failed", ps ); + PRDF_ERR( PRDF_FUNC "badDqs(%d) failed", ps ); break; } @@ -1215,7 +1215,7 @@ int32_t CenMbaTdCtlr::handleUE( STEP_CODE_DATA_STRUCT & io_sc ) TargetHandleList dimms = getConnectedDimms(iv_mbaTrgt, iv_rank, ps); if ( 0 == dimms.size() ) { - PRDF_ERR( PRDF_FUNC"getConnectedDimms(%d) failed", ps ); + PRDF_ERR( PRDF_FUNC "getConnectedDimms(%d) failed", ps ); o_rc = FAIL; break; } @@ -1241,7 +1241,7 @@ int32_t CenMbaTdCtlr::handleUE( STEP_CODE_DATA_STRUCT & io_sc ) callouts = getConnectedDimms( iv_mbaTrgt, iv_rank ); if ( 0 == callouts.size() ) { - PRDF_ERR( PRDF_FUNC"getConnectedDimms() failed" ); + PRDF_ERR( PRDF_FUNC "getConnectedDimms() failed" ); o_rc = FAIL; break; } @@ -1283,13 +1283,13 @@ int32_t CenMbaTdCtlr::handleMPE( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = mssGetMarkStore( iv_mbaTrgt, iv_rank, iv_mark ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mssGetMarkStore() failed"); + PRDF_ERR( PRDF_FUNC "mssGetMarkStore() failed"); break; } if ( !iv_mark.getCM().isValid() ) { - PRDF_ERR( PRDF_FUNC"No valid chip mark to verify"); + PRDF_ERR( PRDF_FUNC "No valid chip mark to verify"); o_rc = FAIL; break; } @@ -1299,7 +1299,7 @@ int32_t CenMbaTdCtlr::handleMPE( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = startVcmPhase1( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"startVcmPhase1() failed" ); + PRDF_ERR( PRDF_FUNC "startVcmPhase1() failed" ); break; } @@ -1326,7 +1326,7 @@ int32_t CenMbaTdCtlr::handleMnfgCeEte( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = MemUtils::collectCeStats( iv_mbaChip, iv_rank, symData, junk); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"MemUtils::collectCeStats() failed. MBA:0x%08x", + PRDF_ERR( PRDF_FUNC "MemUtils::collectCeStats() failed. MBA:0x%08x", iv_mbaChip->GetId() ); break; } @@ -1335,7 +1335,7 @@ int32_t CenMbaTdCtlr::handleMnfgCeEte( STEP_CODE_DATA_STRUCT & io_sc ) // here. If there is no symbol, that is an HW error. if( 0 == symData.size() ) { - PRDF_ERR( PRDF_FUNC" symData size is 0. MBA:0x%08x", + PRDF_ERR( PRDF_FUNC " symData size is 0. MBA:0x%08x", iv_mbaChip->GetId() ); o_rc = FAIL; break; } @@ -1348,7 +1348,7 @@ int32_t CenMbaTdCtlr::handleMnfgCeEte( STEP_CODE_DATA_STRUCT & io_sc ) o_rc = startTpsPhase1( io_sc ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"startTpsPhase1() failed" ); + PRDF_ERR( PRDF_FUNC "startTpsPhase1() failed" ); break; } @@ -1377,7 +1377,7 @@ int32_t CenMbaTdCtlr::signalMdiaCmdComplete() o_rc = getMemAddrRange( iv_mbaTrgt, junk, allEndAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"getMemAddrRange() failed" ); + PRDF_ERR( PRDF_FUNC "getMemAddrRange() failed" ); break; } @@ -1386,7 +1386,7 @@ int32_t CenMbaTdCtlr::signalMdiaCmdComplete() o_rc = getCenMaintStartAddr( iv_mbaChip, stoppedAddr ); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"cenGetMaintAddr() failed" ); + PRDF_ERR( PRDF_FUNC "cenGetMaintAddr() failed" ); break; } @@ -1423,7 +1423,7 @@ int32_t CenMbaTdCtlr::mnfgCeSetup() o_rc = mbstr->ForceRead(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Read() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Read() failed on %s", reg_str ); break; } @@ -1445,14 +1445,14 @@ int32_t CenMbaTdCtlr::mnfgCeSetup() } else { - PRDF_ERR( PRDF_FUNC"Inavlid State:%u", iv_tdState ); + PRDF_ERR( PRDF_FUNC "Inavlid State:%u", iv_tdState ); o_rc = FAIL; break; } o_rc = mbstr->Write(); if ( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"Write() failed on %s", reg_str ); + PRDF_ERR( PRDF_FUNC "Write() failed on %s", reg_str ); break; } diff --git a/src/usr/diag/prdf/plat/pegasus/prdfDramRepairs.C b/src/usr/diag/prdf/plat/pegasus/prdfDramRepairs.C index c5b92b4e8..696001d27 100644 --- a/src/usr/diag/prdf/plat/pegasus/prdfDramRepairs.C +++ b/src/usr/diag/prdf/plat/pegasus/prdfDramRepairs.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -124,7 +124,7 @@ bool processRepairedRanks( TargetHandle_t i_mba, uint8_t i_repairedRankMask ) int32_t l_rc = isMembufOnDimm( i_mba, isCen ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"isMembufOnDimm() failed" ); + PRDF_ERR( PRDF_FUNC "isMembufOnDimm() failed" ); analysisErrors = true; } else @@ -143,7 +143,7 @@ bool processRepairedRanks( TargetHandle_t i_mba, uint8_t i_repairedRankMask ) if ( SUCCESS != mssGetMarkStore(i_mba, rank, mark) ) { - PRDF_ERR( PRDF_FUNC"mssGetMarkStore() failed: MBA=0x%08x " + PRDF_ERR( PRDF_FUNC "mssGetMarkStore() failed: MBA=0x%08x " "rank=%d", getHuid(i_mba), rank.getMaster() ); analysisErrors = true; continue; // skip this rank @@ -153,7 +153,7 @@ bool processRepairedRanks( TargetHandle_t i_mba, uint8_t i_repairedRankMask ) if ( SUCCESS != mssGetSteerMux(i_mba, rank, sp0, sp1, ecc) ) { - PRDF_ERR( PRDF_FUNC"mssGetSteerMux() failed: MBA=0x%08x " + PRDF_ERR( PRDF_FUNC "mssGetSteerMux() failed: MBA=0x%08x " "rank=%d", getHuid(i_mba), rank.getMaster() ); analysisErrors = true; continue; // skip this rank @@ -218,14 +218,14 @@ bool processBadDimms( TargetHandle_t i_mba, uint8_t i_badDimmMask ) if ( SUCCESS != getMbaPort(*i, port) ) { - PRDF_ERR( PRDF_FUNC"getMbaPort() failed: DIMM=0x%08x", getHuid(*i)); + PRDF_ERR( PRDF_FUNC "getMbaPort() failed: DIMM=0x%08x", getHuid(*i)); analysisErrors = true; continue; // skip this dimm } if ( SUCCESS != getMbaDimm(*i, dimm) ) { - PRDF_ERR( PRDF_FUNC"getMbaDimm() failed: DIMM=0x%08x", getHuid(*i)); + PRDF_ERR( PRDF_FUNC "getMbaDimm() failed: DIMM=0x%08x", getHuid(*i)); analysisErrors = true; continue; // skip this dimm } @@ -282,7 +282,7 @@ bool screenBadDqs( TargetHandle_t i_mba, const std::vector<CenRank> & i_ranks ) CenDqBitmap bitmap; if ( SUCCESS != getBadDqBitmap(i_mba, *rank, bitmap, true) ) { - PRDF_ERR( PRDF_FUNC"getBadDqBitmap() failed: MBA=0x%08x rank=%d", + PRDF_ERR( PRDF_FUNC "getBadDqBitmap() failed: MBA=0x%08x rank=%d", getHuid(i_mba), rank->getMaster() ); analysisErrors = true; continue; // skip this rank @@ -344,7 +344,7 @@ int32_t restoreDramRepairs( TargetHandle_t i_mba ) { #define PRDF_FUNC "PRDF::restoreDramRepairs" - PRDF_ENTER( PRDF_FUNC"(0x%08x)", getHuid(i_mba) ); + PRDF_ENTER( PRDF_FUNC "(0x%08x)", getHuid(i_mba) ); // will unlock when going out of scope PRDF_SYSTEM_SCOPELOCK; @@ -357,7 +357,7 @@ int32_t restoreDramRepairs( TargetHandle_t i_mba ) int32_t l_rc = getMasterRanks( i_mba, ranks ); if ( SUCCESS != l_rc ) { - PRDF_ERR( "["PRDF_FUNC"] getMasterRanks() failed" ); + PRDF_ERR( "[" PRDF_FUNC "] getMasterRanks() failed" ); RDR::commitSoftError( PRDF_DETECTED_FAIL_SOFTWARE, i_mba, PRDFSIG_RdrInternalFail, true ); @@ -389,7 +389,7 @@ int32_t restoreDramRepairs( TargetHandle_t i_mba ) // This is an error. The MNFG spare DRAM deply bit is set, but DRAM // Repairs have not been disabled. - PRDF_ERR( "["PRDF_FUNC"] MNFG spare deploy enabled, but DRAM " + PRDF_ERR( "[" PRDF_FUNC "] MNFG spare deploy enabled, but DRAM " "repairs are not disabled" ); RDR::commitSoftError( PRDF_INVALID_CONFIG, i_mba, @@ -402,7 +402,7 @@ int32_t restoreDramRepairs( TargetHandle_t i_mba ) if ( SUCCESS != mssRestoreDramRepairs(i_mba, rankMask, dimmMask) ) { // Can't check anything if this doesn't work. - PRDF_ERR( "["PRDF_FUNC"] mssRestoreDramRepairs() failed" ); + PRDF_ERR( "[" PRDF_FUNC "] mssRestoreDramRepairs() failed" ); break; } @@ -414,7 +414,7 @@ int32_t restoreDramRepairs( TargetHandle_t i_mba ) } while(0); - PRDF_EXIT( PRDF_FUNC"(0x%08x)", getHuid(i_mba) ); + PRDF_EXIT( PRDF_FUNC "(0x%08x)", getHuid(i_mba) ); return calloutMade ? FAIL : SUCCESS; diff --git a/src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C b/src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C index 866c2f0a5..f1886e07f 100755 --- a/src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C +++ b/src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C @@ -46,7 +46,7 @@ namespace Proc #define PLUGIN_TOD_UNEXPECTED_ATTN( FUNC ) \ int32_t FUNC( ExtensibleChip * i_procChip, STEP_CODE_DATA_STRUCT & i_sc ) \ { \ - PRDF_ERR( "["#FUNC"] Unexpected attention due to TOD errors on" \ + PRDF_ERR( "["#FUNC "] Unexpected attention due to TOD errors on" \ "Hostboot: HUID=0x%08x", i_procChip->GetId() ); \ CalloutUtil::defaultError( i_sc ); \ return SUCCESS; \ diff --git a/src/usr/diag/prdf/plat/pegasus/prdfPlatCenMba_ipl.C b/src/usr/diag/prdf/plat/pegasus/prdfPlatCenMba_ipl.C index 2d45e94cd..a38604aa4 100644 --- a/src/usr/diag/prdf/plat/pegasus/prdfPlatCenMba_ipl.C +++ b/src/usr/diag/prdf/plat/pegasus/prdfPlatCenMba_ipl.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014 */ +/* Contributors Listed Below - COPYRIGHT 2014,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -81,7 +81,7 @@ int32_t PostAnalysis( ExtensibleChip * i_mbaChip, mbadb->iv_cmdCompleteMsgData ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"PlatServices::mdiaSendEventMsg() failed" ); + PRDF_ERR( PRDF_FUNC "PlatServices::mdiaSendEventMsg() failed" ); } } diff --git a/src/usr/diag/prdf/plat/pegasus/prdfPlatCenMemUtils.C b/src/usr/diag/prdf/plat/pegasus/prdfPlatCenMemUtils.C index 3bd1c7e6c..30ef1e07d 100755 --- a/src/usr/diag/prdf/plat/pegasus/prdfPlatCenMemUtils.C +++ b/src/usr/diag/prdf/plat/pegasus/prdfPlatCenMemUtils.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014 */ +/* Contributors Listed Below - COPYRIGHT 2014,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -55,7 +55,7 @@ int32_t mcifirCleanup( ExtensibleChip *i_mbChip, ExtensibleChip * mcsChip = mbdb->getMcsChip(); if ( NULL == mcsChip ) { - PRDF_ERR( PRDF_FUNC"CenMembufDataBundle::getMcsChip() failed" ); + PRDF_ERR( PRDF_FUNC "CenMembufDataBundle::getMcsChip() failed" ); l_rc = FAIL; break; } @@ -75,7 +75,7 @@ int32_t mcifirCleanup( ExtensibleChip *i_mbChip, l_rc = firand->Write(); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"MCIFIR_AND write failed" ); + PRDF_ERR( PRDF_FUNC "MCIFIR_AND write failed" ); break; } diff --git a/src/usr/diag/prdf/plat/pegasus/prdfPlatCenPll.C b/src/usr/diag/prdf/plat/pegasus/prdfPlatCenPll.C index 4e338f249..05ac09839 100644 --- a/src/usr/diag/prdf/plat/pegasus/prdfPlatCenPll.C +++ b/src/usr/diag/prdf/plat/pegasus/prdfPlatCenPll.C @@ -67,7 +67,7 @@ int32_t PllPostAnalysis( ExtensibleChip * i_cenChip, o_rc = MemUtils::mcifirCleanup( i_cenChip, i_sc ); if( SUCCESS != o_rc ) { - PRDF_ERR( PRDF_FUNC"mcifirCleanup() failed"); + PRDF_ERR( PRDF_FUNC "mcifirCleanup() failed"); break; } @@ -84,7 +84,7 @@ int32_t PllPostAnalysis( ExtensibleChip * i_cenChip, TargetHandleList list = getConnected( cenTrgt, TYPE_MBA ); if ( 0 == list.size() ) { - PRDF_ERR( PRDF_FUNC"getConnected(0x%08x, TYPE_MBA) failed", + PRDF_ERR( PRDF_FUNC "getConnected(0x%08x, TYPE_MBA) failed", getHuid(cenTrgt) ); o_rc = FAIL; break; } @@ -96,7 +96,7 @@ int32_t PllPostAnalysis( ExtensibleChip * i_cenChip, int32_t l_rc = mdiaSendEventMsg( *mbaIt, MDIA::SKIP_MBA ); if ( SUCCESS != l_rc ) { - PRDF_ERR( PRDF_FUNC"mdiaSendEventMsg(0x%08x, SKIP_MBA) failed", + PRDF_ERR( PRDF_FUNC "mdiaSendEventMsg(0x%08x, SKIP_MBA) failed", getHuid(*mbaIt) ); o_rc |= FAIL; continue; // keep going diff --git a/src/usr/diag/prdf/plat/pegasus/prdfPllUtils.C b/src/usr/diag/prdf/plat/pegasus/prdfPllUtils.C index 34cdfe134..e72642b64 100644 --- a/src/usr/diag/prdf/plat/pegasus/prdfPllUtils.C +++ b/src/usr/diag/prdf/plat/pegasus/prdfPllUtils.C @@ -55,7 +55,7 @@ int32_t queryPciOscErr( ExtensibleChip * i_procChip, int32_t o_rc = FAIL; o_pciClkSwitchOver = false; - PRDF_TRAC( PRDF_FUNC"PCI Osc Switch over not expected during hostboot " + PRDF_TRAC( PRDF_FUNC "PCI Osc Switch over not expected during hostboot " "HUID: 0x%08x", i_procChip->GetId() ); return o_rc; @@ -76,7 +76,7 @@ int32_t analyzePciClkFailover( ExtensibleChip * i_procChip, #define PRDF_FUNC "Proc::analyzePciClkFailover " int32_t o_rc = FAIL; - PRDF_TRAC( PRDF_FUNC"PCI Osc Switch over not expected during hostboot " + PRDF_TRAC( PRDF_FUNC "PCI Osc Switch over not expected during hostboot " "HUID: 0x%08x", i_procChip->GetId() ); return o_rc; @@ -97,7 +97,7 @@ int32_t clearPciOscFailOver( ExtensibleChip * i_procChip, #define PRDF_FUNC "Proc::clearPciOscFailOver " int32_t o_rc = FAIL; - PRDF_TRAC( PRDF_FUNC"PCI Osc Switch over not expected during hostboot " + PRDF_TRAC( PRDF_FUNC "PCI Osc Switch over not expected during hostboot " "HUID: 0x%08x", i_procChip->GetId() ); return o_rc; diff --git a/src/usr/diag/prdf/prdfMain_ipl.C b/src/usr/diag/prdf/prdfMain_ipl.C index f2ec5c87c..2dbdcde41 100644 --- a/src/usr/diag/prdf/prdfMain_ipl.C +++ b/src/usr/diag/prdf/prdfMain_ipl.C @@ -68,7 +68,7 @@ int32_t analyzeIplCEStats( TargetHandle_t i_mba, bool &o_calloutMade ) { #define PRDF_FUNC "PRDF::analyzeIplCEStats" - PRDF_ENTER( PRDF_FUNC"(0x%08x)", getHuid(i_mba) ); + PRDF_ENTER( PRDF_FUNC "(0x%08x)", getHuid(i_mba) ); // will unlock when going out of scope PRDF_SYSTEM_SCOPELOCK; @@ -83,7 +83,7 @@ int32_t analyzeIplCEStats( TargetHandle_t i_mba, bool &o_calloutMade ) if ( SUCCESS != o_rc ) { - PRDF_ERR( "["PRDF_FUNC"] analyzeStats() failed"); + PRDF_ERR( "[" PRDF_FUNC "] analyzeStats() failed"); // Get user data uint64_t ud12 = PRDF_GET_UINT64_FROM_UINT32( getHuid(i_mba), 0 ); @@ -106,7 +106,7 @@ int32_t analyzeIplCEStats( TargetHandle_t i_mba, bool &o_calloutMade ) ERRORLOG::errlCommit( errl, PRDF_COMP_ID ); } - PRDF_EXIT( PRDF_FUNC"(0x%08x), o_calloutMade:%u", + PRDF_EXIT( PRDF_FUNC "(0x%08x), o_calloutMade:%u", getHuid(i_mba), o_calloutMade ); return o_rc; @@ -138,7 +138,7 @@ errlHndl_t startScrub() // This shouldn't return any error but if it does, break out if(NULL != o_errl) { - PRDF_ERR( PRDF_FUNC"noLock_refresh() failed" ); + PRDF_ERR( PRDF_FUNC "noLock_refresh() failed" ); break; } @@ -146,23 +146,23 @@ errlHndl_t startScrub() TargetHandleList list = getFunctionalTargetList( TYPE_NODE ); if ( 1 != list.size() ) { - PRDF_ERR( PRDF_FUNC"getFunctionalTargetList(TYPE_NODE) failed" ); + PRDF_ERR( PRDF_FUNC "getFunctionalTargetList(TYPE_NODE) failed" ); l_rc = FAIL; break; } nodeId = getHuid(list[0]); - PRDF_ENTER( PRDF_FUNC"HUID=0x%08x", nodeId ); + PRDF_ENTER( PRDF_FUNC "HUID=0x%08x", nodeId ); // Start scrubbing on all MBAs. MbaDomain * domain = (MbaDomain *)systemPtr->GetDomain(MBA_DOMAIN); if ( NULL == domain ) { - PRDF_ERR( PRDF_FUNC"MBA_DOMAIN not found. nodeId=0x%08x", nodeId ); + PRDF_ERR( PRDF_FUNC "MBA_DOMAIN not found. nodeId=0x%08x", nodeId ); l_rc = FAIL; break; } l_rc = domain->startScrub(); - PRDF_EXIT( PRDF_FUNC"HUID=0x%08x", nodeId ); + PRDF_EXIT( PRDF_FUNC "HUID=0x%08x", nodeId ); } while (0); diff --git a/src/usr/diag/prdf/runtime/prdfPlatServices_rt.C b/src/usr/diag/prdf/runtime/prdfPlatServices_rt.C index 2a50aa5af..dad82a0b3 100644 --- a/src/usr/diag/prdf/runtime/prdfPlatServices_rt.C +++ b/src/usr/diag/prdf/runtime/prdfPlatServices_rt.C @@ -55,7 +55,7 @@ void sendPageGardRequest( uint64_t i_systemAddress ) { if( !g_hostInterfaces || !g_hostInterfaces->memory_error ) { - PRDF_ERR(PRDF_FUNC" memory_error() interface is not defined"); + PRDF_ERR(PRDF_FUNC " memory_error() interface is not defined"); break; } @@ -64,7 +64,7 @@ void sendPageGardRequest( uint64_t i_systemAddress ) MEMORY_ERROR_CE ); if( SUCCESS != rc ) { - PRDF_ERR(PRDF_FUNC" memory_error() failed"); + PRDF_ERR(PRDF_FUNC " memory_error() failed"); break; } }while(0); @@ -88,7 +88,7 @@ void sendDynMemDeallocRequest( uint64_t i_startAddr, uint64_t i_endAddr ) { if( !g_hostInterfaces || !g_hostInterfaces->memory_error ) { - PRDF_ERR(PRDF_FUNC" memory_error() interface is not defined"); + PRDF_ERR(PRDF_FUNC " memory_error() interface is not defined"); break; } @@ -97,7 +97,7 @@ void sendDynMemDeallocRequest( uint64_t i_startAddr, uint64_t i_endAddr ) MEMORY_ERROR_UE ); if( SUCCESS != rc ) { - PRDF_ERR(PRDF_FUNC" memory_error() failed"); + PRDF_ERR(PRDF_FUNC " memory_error() failed"); break; } }while(0); diff --git a/src/usr/diag/prdf/test/prdfTest_MfgSync.H b/src/usr/diag/prdf/test/prdfTest_MfgSync.H index 2863bd822..62961c1ed 100755 --- a/src/usr/diag/prdf/test/prdfTest_MfgSync.H +++ b/src/usr/diag/prdf/test/prdfTest_MfgSync.H @@ -79,13 +79,13 @@ class PrdfTest_MfgSync: public CxxTest::TestSuite l_err = getSimMfgSync().syncMfgTraceToFsp(&l_errSig, l_pfaData); if (l_err) { - PRDF_ERR(PRDF_FUNC" MfgTraceSync test1 failed to sync to FSP"); + PRDF_ERR(PRDF_FUNC " MfgTraceSync test1 failed to sync to FSP"); PRDF_COMMIT_ERRL(l_err, ERRL_ACTION_REPORT); - TS_FAIL(PRDF_FUNC" MfgTraceSync test1 failed to sync to FSP"); + TS_FAIL(PRDF_FUNC " MfgTraceSync test1 failed to sync to FSP"); } else { - PRDF_TRAC(PRDF_FUNC" MfgTraceSync test1 is a success."); + PRDF_TRAC(PRDF_FUNC " MfgTraceSync test1 is a success."); } getSimMfgSync().setMailBoxStatus(true); @@ -94,13 +94,13 @@ class PrdfTest_MfgSync: public CxxTest::TestSuite l_err = getSimMfgSync().syncMfgTraceToFsp(&l_errSig, l_pfaData); if (l_err) { - PRDF_ERR(PRDF_FUNC" MfgTraceSync test2 failed to sync to FSP"); + PRDF_ERR(PRDF_FUNC " MfgTraceSync test2 failed to sync to FSP"); PRDF_COMMIT_ERRL(l_err, ERRL_ACTION_REPORT); - TS_FAIL(PRDF_FUNC" MfgTraceSync test2 failed to sync to FSP"); + TS_FAIL(PRDF_FUNC " MfgTraceSync test2 failed to sync to FSP"); } else { - PRDF_TRAC(PRDF_FUNC" MfgTraceSync test2 is a success."); + PRDF_TRAC(PRDF_FUNC " MfgTraceSync test2 is a success."); } // Test 3: Test with mailbox status enabled and max MRU List count @@ -115,13 +115,13 @@ class PrdfTest_MfgSync: public CxxTest::TestSuite l_err = getSimMfgSync().syncMfgTraceToFsp(&l_errSig, l_pfaData); if (l_err) { - PRDF_TRAC(PRDF_FUNC" MfgTraceSync test3 failed to sync to FSP."); + PRDF_TRAC(PRDF_FUNC " MfgTraceSync test3 failed to sync to FSP."); PRDF_COMMIT_ERRL(l_err, ERRL_ACTION_REPORT); - TS_FAIL(PRDF_FUNC" MfgTraceSync test3 failed to sync to FSP"); + TS_FAIL(PRDF_FUNC " MfgTraceSync test3 failed to sync to FSP"); } else { - PRDF_TRAC(PRDF_FUNC" MfgTraceSync test3 is a success."); + PRDF_TRAC(PRDF_FUNC " MfgTraceSync test3 is a success."); } // Test 4: Test with mailbox status enabled and zero MRU List count @@ -129,13 +129,13 @@ class PrdfTest_MfgSync: public CxxTest::TestSuite l_err = getSimMfgSync().syncMfgTraceToFsp(&l_errSig, l_pfaData); if (l_err) { - PRDF_TRAC(PRDF_FUNC" MfgTraceSync test4 failed to sync to FSP."); + PRDF_TRAC(PRDF_FUNC " MfgTraceSync test4 failed to sync to FSP."); PRDF_COMMIT_ERRL(l_err, ERRL_ACTION_REPORT); - TS_FAIL(PRDF_FUNC" MfgTraceSync test4 failed to sync to FSP"); + TS_FAIL(PRDF_FUNC " MfgTraceSync test4 failed to sync to FSP"); } else { - PRDF_TRAC(PRDF_FUNC" MfgTraceSync test4 is a success."); + PRDF_TRAC(PRDF_FUNC " MfgTraceSync test4 is a success."); } getSimMfgSync().setMailBoxStatus(false); diff --git a/src/usr/diag/prdf/test/prdfsimFspSyncSvc.C b/src/usr/diag/prdf/test/prdfsimFspSyncSvc.C index 6336858e8..b7053ee35 100755 --- a/src/usr/diag/prdf/test/prdfsimFspSyncSvc.C +++ b/src/usr/diag/prdf/test/prdfsimFspSyncSvc.C @@ -57,13 +57,13 @@ void SimFspSyncSvc::processRequestMsg(msg_t * i_msg) pError = processMfgTrace(i_msg); if(NULL != pError) { - PRDF_ERR(FUNC" processMfgTrace returned error"); + PRDF_ERR(FUNC " processMfgTrace returned error"); PRDF_COMMIT_ERRL(pError, ERRL_ACTION_REPORT); } break; default: - PRDF_ERR(FUNC" Invalid Message Type received from HB :" + PRDF_ERR(FUNC " Invalid Message Type received from HB :" "[0x%08X]", i_msg->type); } diff --git a/src/usr/diag/prdf/test/prdfsimMfgSync.C b/src/usr/diag/prdf/test/prdfsimMfgSync.C index b0ca814cc..9a5a98ff0 100755 --- a/src/usr/diag/prdf/test/prdfsimMfgSync.C +++ b/src/usr/diag/prdf/test/prdfsimMfgSync.C @@ -65,7 +65,7 @@ errlHndl_t SimMfgSync::syncMfgTraceToFsp(ErrorSignature *i_esig, if(NULL != l_err) { - PRDF_TRAC( PRDF_FUNC" syncMfgTraceToFsp failed" ); + PRDF_TRAC( PRDF_FUNC " syncMfgTraceToFsp failed" ); } } while(0); @@ -84,7 +84,7 @@ errlHndl_t SimMfgSync::sendMboxMsg( msg_t * i_msg, bool i_expectResponse ) errlHndl_t l_errl = NULL; // send a sync message - PRDF_TRAC(FUNC" sending sync mbox msg" ); + PRDF_TRAC(FUNC " sending sync mbox msg" ); PRDF_TRAC( "type: 0x%04x", i_msg->type ); PRDF_TRAC( "data0: 0x%016llx", i_msg->data[0] ); PRDF_TRAC( "data1: 0x%016llx", i_msg->data[1] ); |
