Skip to content

Commit

Permalink
Revert "Remove Attribute Check For TCE Settings"
Browse files Browse the repository at this point in the history
This reverts commit 4f36563.

Change-Id: I4e9de83751d970af394e4a964c096c452a3efdcc
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53808
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
  • Loading branch information
Nicholas E. Bofferding committed Feb 10, 2018
1 parent 6751a48 commit e770e96
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions src/usr/util/utiltcemgr.C
Expand Up @@ -55,8 +55,9 @@ TRAC_INIT(&g_trac_tce, UTILTCE_TRACE_NAME, 4*KILOBYTE);

// ------------------------
// Macros for unit testing - leave extra trace enabled for now
//#define TRACUCOMP(args...) TRACFCOMP(args)
#define TRACUCOMP(args...)
// @TODO RTC 168745 - Disable TRACUCOMP as the default
#define TRACUCOMP(args...) TRACFCOMP(args)
//#define TRACUCOMP(args...)


namespace TCE
Expand Down Expand Up @@ -1189,13 +1190,13 @@ UtilTceMgr::~UtilTceMgr()
// Debug for printing out iv_allocatedAddrs map
void UtilTceMgr::printIvMap(void) const
{
TRACFCOMP(g_trac_tce,"UtilTceMgr::printIvMap: size=%d", iv_allocatedAddrs.size());
TRACUCOMP(g_trac_tce,"UtilTceMgr::printIvMap: size=%d", iv_allocatedAddrs.size());

// To avoid map_itr below being an unused variable
for ( auto const& map_itr : iv_allocatedAddrs )
{
TRACFCOMP(g_trac_tce,"UtilTceMgr: printIvMap: token=0x%.8X, addr=0x%.16llX, size=0x%X", map_itr.first, map_itr.second.start_addr, map_itr.second.size);
TRACUCOMP(g_trac_tce,"UtilTceMgr: printIvMap: token=0x%.8X, addr=0x%.16llX, size=0x%X", map_itr.first, map_itr.second.start_addr, map_itr.second.size);
}

}


Expand Down Expand Up @@ -1370,7 +1371,16 @@ bool utilUseTcesForDmas(void)

if (INITSERVICE::spBaseServicesEnabled())
{
retVal = true;
// @TODO RTC 168745 - Eventually this will default to true in all cases
// where was have a FSP

// Get Target Service and the system target to get ATTR_USE_TCES_FOR_DMA
TARGETING::TargetService& tS = TARGETING::targetService();
TARGETING::Target* sys = nullptr;
(void) tS.getTopLevelTarget( sys );
assert(sys, "utilUseTcesForDmas() system target is NULL");

retVal = sys->getAttr<TARGETING::ATTR_USE_TCES_FOR_DMAS>();
}

TRACFCOMP(g_trac_tce,INFO_MRK"utilUseTcesForDmas: %s",
Expand Down

0 comments on commit e770e96

Please sign in to comment.