summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/usr/i2c/eepromCache.C4
-rw-r--r--src/usr/i2c/eeprom_utils.C2
-rwxr-xr-xsrc/usr/i2c/eepromdd.C4
-rw-r--r--src/usr/i2c/eepromdd_hardware.C16
-rw-r--r--src/usr/pnor/pnor_sfcdd.C4
-rw-r--r--src/usr/targeting/common/xmltohb/simics_AXONE.system.xml2
-rw-r--r--src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml2
-rw-r--r--src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml2
-rw-r--r--src/usr/vpd/ocmb_spd.C3
9 files changed, 18 insertions, 21 deletions
diff --git a/src/usr/i2c/eepromCache.C b/src/usr/i2c/eepromCache.C
index ef906302c..7fb6e3bf8 100644
--- a/src/usr/i2c/eepromCache.C
+++ b/src/usr/i2c/eepromCache.C
@@ -310,7 +310,7 @@ errlHndl_t cacheEeprom(TARGETING::Target* i_target,
// if nothing has been cached before then version should
// be set to be the latest version of the struct available
l_eecacheSectionHeaderPtr->version = EECACHE_VERSION_LATEST;
- TRACFCOMP( g_trac_eeprom,
+ TRACDCOMP( g_trac_eeprom,
"cacheEeprom() Found Empty Cache, set version of cache structure to be 0x%.02x",
EECACHE_VERSION_1);
}
@@ -322,7 +322,7 @@ errlHndl_t cacheEeprom(TARGETING::Target* i_target,
// This means the start of first eeprom's cached data will be immediately
// following the end of the EECACHE header.
l_eecacheSectionHeaderPtr->end_of_cache = sizeof(eecacheSectionHeader);
- TRACFCOMP( g_trac_eeprom,
+ TRACDCOMP( g_trac_eeprom,
"cacheEeprom() Found Empty Cache, set end of cache to be 0x%.04x (End of ToC)",
sizeof(eecacheSectionHeader));
}
diff --git a/src/usr/i2c/eeprom_utils.C b/src/usr/i2c/eeprom_utils.C
index 806a0cf31..7935094a3 100644
--- a/src/usr/i2c/eeprom_utils.C
+++ b/src/usr/i2c/eeprom_utils.C
@@ -373,7 +373,7 @@ errlHndl_t eepromReadAttributes ( TARGETING::Target * i_target,
// Printing mux info separately, if combined, nothing is displayed
char* l_muxPath = o_i2cInfo.i2cMuxPath.toString();
- TRACFCOMP(g_trac_eeprom, "eepromReadAttributes(): "
+ TRACUCOMP(g_trac_eeprom, "eepromReadAttributes(): "
"muxSelector=0x%X, muxPath=%s",
o_i2cInfo.i2cMuxBusSelector,
l_muxPath);
diff --git a/src/usr/i2c/eepromdd.C b/src/usr/i2c/eepromdd.C
index 74b6d3692..dd5f5aa11 100755
--- a/src/usr/i2c/eepromdd.C
+++ b/src/usr/i2c/eepromdd.C
@@ -91,12 +91,12 @@ errlHndl_t resolveSource(TARGETING::Target * i_target,
// then we know it exists in cache somewhere
if(lookupEepromAddr(l_eepromRecordHeader))
{
- TRACFCOMP(g_trac_eeprom,"Eeprom found in cache, looking at eecache");
+ TRACDCOMP(g_trac_eeprom,"Eeprom found in cache, looking at eecache");
o_source = EEPROM::CACHE;
}
else
{
- TRACFCOMP(g_trac_eeprom,"Eeprom not found in cache, looking at hardware");
+ TRACDCOMP(g_trac_eeprom,"Eeprom not found in cache, looking at hardware");
o_source = EEPROM::HARDWARE;
}
diff --git a/src/usr/i2c/eepromdd_hardware.C b/src/usr/i2c/eepromdd_hardware.C
index 351ca549a..b48c3889e 100644
--- a/src/usr/i2c/eepromdd_hardware.C
+++ b/src/usr/i2c/eepromdd_hardware.C
@@ -109,7 +109,7 @@ errlHndl_t eepromPerformOpHW(DeviceFW::OperationType i_opType,
( io_i2cInfo.devSize_KB * KILOBYTE ) )
{
TRACFCOMP( g_trac_eeprom,
- ERR_MRK"eepromPerformOp(): Device Overflow! "
+ ERR_MRK"eepromPerformOpHW(): Device Overflow! "
"C-e/p/dA=%d-%d/%d/0x%X, offset=0x%X, len=0x%X "
"devSizeKB=0x%X", io_i2cInfo.eepromRole, io_i2cInfo.engine,
io_i2cInfo.port, io_i2cInfo.devAddr, io_i2cInfo.offset,
@@ -155,19 +155,19 @@ errlHndl_t eepromPerformOpHW(DeviceFW::OperationType i_opType,
l_currentOpLen = l_snglChipSize - io_i2cInfo.offset;
}
- TRACFCOMP( g_trac_eeprom,
- "eepromPerformOp(): i_opType=%d "
+ TRACDCOMP( g_trac_eeprom,
+ "eepromPerformOpHW(): i_opType=%d "
"C-e/p/dA=%d-%d/%d/0x%X, offset=0x%X, len=0x%X, ",
i_opType, io_i2cInfo.eepromRole, io_i2cInfo.engine,
- io_i2cInfo.port, io_i2cInfo.devAddr, io_i2cInfo.offset, io_buflen)
+ io_i2cInfo.port, io_i2cInfo.devAddr, io_i2cInfo.offset, io_buflen);
- TRACFCOMP (g_trac_eeprom,
- "eepromPerformOp(): snglChipKB=0x%X, chipCount=0x%X, devSizeKB=0x%X",
+ TRACDCOMP (g_trac_eeprom,
+ "eepromPerformOpHW(): snglChipKB=0x%X, chipCount=0x%X, devSizeKB=0x%X",
l_snglChipSize, io_i2cInfo.chipCount, io_i2cInfo.devSize_KB);
// Printing mux info separately, if combined, nothing is displayed
char* l_muxPath = io_i2cInfo.i2cMuxPath.toString();
- TRACFCOMP(g_trac_eeprom, "eepromPerformOp(): "
+ TRACDCOMP(g_trac_eeprom, "eepromPerformOpHW(): "
"muxSelector=0x%X, muxPath=%s",
io_i2cInfo.i2cMuxBusSelector,
l_muxPath);
@@ -207,7 +207,7 @@ errlHndl_t eepromPerformOpHW(DeviceFW::OperationType i_opType,
else
{
TRACFCOMP( g_trac_eeprom,
- ERR_MRK"eepromPerformOp(): "
+ ERR_MRK"eepromPerformOpHW(): "
"Invalid EEPROM Operation!");
/*@
diff --git a/src/usr/pnor/pnor_sfcdd.C b/src/usr/pnor/pnor_sfcdd.C
index fe3f0cbae..a3d40d9b8 100644
--- a/src/usr/pnor/pnor_sfcdd.C
+++ b/src/usr/pnor/pnor_sfcdd.C
@@ -251,7 +251,7 @@ errlHndl_t PnorSfcDD::writeFlash(void* i_buffer,
size_t& io_buflen,
uint64_t i_address)
{
- TRACFCOMP(g_trac_pnor, ENTER_MRK"PnorSfcDD::writeFlash(i_address=0x%llx)> ", i_address);
+ TRACDCOMP(g_trac_pnor, ENTER_MRK"PnorSfcDD::writeFlash(i_address=0x%llx)> ", i_address);
errlHndl_t l_err = NULL;
do{
@@ -339,7 +339,7 @@ errlHndl_t PnorSfcDD::writeFlash(void* i_buffer,
{
io_buflen = 0;
}
- TRACFCOMP(g_trac_pnor,EXIT_MRK"PnorSfcDD::writeFlash(i_address=0x%llx)> io_buflen=%.8X", i_address, io_buflen);
+ TRACDCOMP(g_trac_pnor,EXIT_MRK"PnorSfcDD::writeFlash(i_address=0x%llx)> io_buflen=%.8X", i_address, io_buflen);
return l_err;
}
diff --git a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
index c3dfb86eb..011d02371 100644
--- a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
@@ -4195,7 +4195,7 @@
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>physical:sys-0/node-0/proc-0/nx-0</default>
+ <default>affinity:sys-0/node-0/proc-0/nx-0</default>
</attribute>
<attribute>
<id>ORDINAL_ID</id>
diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
index e82b9e38a..0fbb351c3 100644
--- a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
@@ -7958,7 +7958,7 @@
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>physical:sys-0/node-0/proc-0/nx-0</default>
+ <default>affinity:sys-0/node-0/proc-0/nx-0</default>
</attribute>
<attribute>
<id>ORDINAL_ID</id>
diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml
index fe3bea78c..d7f4cfa10 100644
--- a/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml
@@ -7950,7 +7950,7 @@
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>physical:sys-0/node-0/proc-0/nx-0</default>
+ <default>affinity:sys-0/node-0/proc-0/nx-0</default>
</attribute>
<attribute>
<id>ORDINAL_ID</id>
diff --git a/src/usr/vpd/ocmb_spd.C b/src/usr/vpd/ocmb_spd.C
index 4e0899c91..2ca877a3d 100644
--- a/src/usr/vpd/ocmb_spd.C
+++ b/src/usr/vpd/ocmb_spd.C
@@ -121,9 +121,6 @@ errlHndl_t ocmbGetSPD(T::TargetHandle_t i_target,
{
errlHndl_t l_errl = nullptr;
- TRACFCOMP(g_trac_spd,
- ENTER_MRK"ocmbGetSPD()");
-
assert(i_target != nullptr, "i_target is nullptr in ocmbGetSPD");
do {
OpenPOWER on IntegriCloud