summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNicholas E. Bofferding <bofferdn@us.ibm.com>2018-02-09 21:33:06 -0500
committerNicholas E. Bofferding <bofferdn@us.ibm.com>2018-02-10 11:15:35 -0500
commite770e96a5d6713b5608c1ecc5032939e6f2f4f93 (patch)
tree2783156568df3531b5171eb9da392854b905a04c /src
parent6751a48602434374fdab2e67b281a58473453623 (diff)
downloadtalos-hostboot-e770e96a5d6713b5608c1ecc5032939e6f2f4f93.tar.gz
talos-hostboot-e770e96a5d6713b5608c1ecc5032939e6f2f4f93.zip
Revert "Remove Attribute Check For TCE Settings"
This reverts commit 4f3656309da631e6a5fcf4d6cb8fe5241c61e1de. 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>
Diffstat (limited to 'src')
-rw-r--r--src/usr/util/utiltcemgr.C22
1 files changed, 16 insertions, 6 deletions
diff --git a/src/usr/util/utiltcemgr.C b/src/usr/util/utiltcemgr.C
index 6337714c4..e61ae4ca5 100644
--- a/src/usr/util/utiltcemgr.C
+++ b/src/usr/util/utiltcemgr.C
@@ -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
@@ -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);
}
+
}
@@ -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",
OpenPOWER on IntegriCloud