Clean up traces seen during Axone IPLs

This commit is an audit of the traces that have been added
in Axone. This commit should remove ~32,000 lines of traces from
hbTracMERG which were result from a few poorly placed trace statements.
Also in this commit a few xml attribute are fixed which were causing errant
traces.

Change-Id: I6ddcfa449aa94e1c661dcf08ec1482be1d5b4b14
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77754
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Glenn Miles <milesg@ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 13 insertions, 13 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!");
 
                 /*@