Move components to slow-buffer as appropriate

Change-Id: Ife675112b7522a03e1e44d838e7af8fdd1af5b56
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2521
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Tested-by: A. Patrick Williams III <iawillia@us.ibm.com>

11 files changed, 113 insertions, 109 deletions

diff --git a/src/usr/devicefw/associator.C b/src/usr/devicefw/associator.C
index 7bc3ac28b..87d3cfdb1 100644
--- a/src/usr/devicefw/associator.C
+++ b/src/usr/devicefw/associator.C
@@ -1,25 +1,25 @@
-//  IBM_PROLOG_BEGIN_TAG
-//  This is an automatically generated prolog.
-//
-//  $Source: src/usr/devicefw/associator.C $
-//
-//  IBM CONFIDENTIAL
-//
-//  COPYRIGHT International Business Machines Corp. 2011
-//
-//  p1
-//
-//  Object Code Only (OCO) source materials
-//  Licensed Internal Code Source Materials
-//  IBM HostBoot Licensed Internal Code
-//
-//  The source code for this program is not published or other-
-//  wise divested of its trade secrets, irrespective of what has
-//  been deposited with the U.S. Copyright Office.
-//
-//  Origin: 30
-//
-//  IBM_PROLOG_END
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/devicefw/associator.C $                               */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2011,2012              */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
 #include <algorithm>
 #include <errl/errlentry.H>
 #include <errl/errlmanager.H>
@@ -34,7 +34,7 @@ using namespace TARGETING;
 namespace DeviceFW
 {
     trace_desc_t* g_traceBuffer = NULL;
-    TRAC_INIT(&g_traceBuffer, "DevFW", 4096);
+    TRAC_INIT(&g_traceBuffer, "DevFW", 4096, TRACE::BUFFER_SLOW);
 
     Associator::Associator() : iv_mutex()
     {
@@ -47,7 +47,7 @@ namespace DeviceFW
     Associator::~Associator()
     {
 
-        TRACFCOMP(g_traceBuffer, EXIT_MRK "Associator::~Associator");        
+        TRACFCOMP(g_traceBuffer, EXIT_MRK "Associator::~Associator");
     }
 
     errlHndl_t Associator::registerRoute(int64_t i_opType,
@@ -59,7 +59,7 @@ namespace DeviceFW
                   i_opType, i_accType, i_targetType);
 
         // The ranges of the parameters should all be verified by the
-        // compiler due to the template specializations in driverif.H.  
+        // compiler due to the template specializations in driverif.H.
         // No assert-checks will be done here.
 
         mutex_lock(&iv_mutex);
@@ -77,7 +77,7 @@ namespace DeviceFW
                 if( l_devRoute != NULL )
                 {
                     TRACFCOMP(g_traceBuffer, "Double registration attempted : i_opType=%d, i_accType=%d, i_targetType=0x%X, existing function=%p", i_opType, i_accType, i_targetType, l_devRoute );
-                    /*@ 
+                    /*@
                      *  @errortype
                      *  @moduleid         DEVFW_MOD_ASSOCIATOR
                      *  @reasoncode       DEVFW_RC_DOUBLE_REGISTRATION
@@ -85,10 +85,10 @@ namespace DeviceFW
                      *  @userdata1[32:63] AccessType
                      *  @userdata2        TargetType
                      *
-                     *  @devdesc         A double registration was attempted 
+                     *  @devdesc         A double registration was attempted
                      *                   with the routing framework.
                      */
-                    errlHndl_t l_errl = 
+                    errlHndl_t l_errl =
                       new ErrlEntry(ERRL_SEV_INFORMATIONAL,
                                     DEVFW_MOD_ASSOCIATOR,
                                     DEVFW_RC_DOUBLE_REGISTRATION,
@@ -100,10 +100,10 @@ namespace DeviceFW
                 }
             }
         }
-        
+
         size_t ops = 0;
         AssociationData targets = AssociationData();
-        
+
         // Look up second level of map (op-type) or allocate fresh block.
         ops = iv_associations[iv_routeMap][i_accType].offset;
         if (0 == ops)
@@ -112,7 +112,7 @@ namespace DeviceFW
             ops = iv_associations.allocate(LAST_OP_TYPE + 1) + 1;
             iv_associations[iv_routeMap][i_accType].offset = ops;
         }
-        
+
         // Look up third level of map (access-type) or allocate fresh block.
         targets = iv_associations[ops][i_opType];
         if (0 == targets.offset)
@@ -140,7 +140,7 @@ namespace DeviceFW
                                                     iv_operations.end(),
                                                     i_regRoute);
         // Insert function into vector if not found.
-        if (iv_operations.end() == opLocation) 
+        if (iv_operations.end() == opLocation)
         {
             iv_operations.push_back(i_regRoute);
             opLocation = iv_operations.end() - 1;
@@ -159,10 +159,10 @@ namespace DeviceFW
     errlHndl_t Associator::performOp(OperationType i_opType,
                                      Target* i_target,
                                      void* io_buffer, size_t& io_buflen,
-                                     int64_t i_accessType, va_list i_addr) 
+                                     int64_t i_accessType, va_list i_addr)
     {
         errlHndl_t l_errl = NULL;
-        
+
         if( NULL == i_target )
         {
 	    TRACFCOMP(g_traceBuffer, "A device driver operation was attempted on a NULL target : i_opType=%d, i_accessType=%d", i_opType, i_accessType );
@@ -184,8 +184,8 @@ namespace DeviceFW
         }
 
 
-        TARGETING::TYPE l_devType = 
-            (i_target == MASTER_PROCESSOR_CHIP_TARGET_SENTINEL) ? 
+        TARGETING::TYPE l_devType =
+            (i_target == MASTER_PROCESSOR_CHIP_TARGET_SENTINEL) ?
             TYPE_PROC : i_target->getAttr<ATTR_TYPE>();
 
         TRACDCOMP(g_traceBuffer, "Device op requested for (%d, %d, %d)",
@@ -198,8 +198,8 @@ namespace DeviceFW
                                                  l_devType,
                                                  i_accessType );
 
-        mutex_unlock(&iv_mutex);        
-        
+        mutex_unlock(&iv_mutex);
+
         // Call function if one was found, create error otherwise.
         if (NULL == l_devRoute)
         {
@@ -223,7 +223,7 @@ namespace DeviceFW
         }
         else
         {
-            l_errl = (*l_devRoute)(i_opType, i_target, 
+            l_errl = (*l_devRoute)(i_opType, i_target,
                                    io_buffer, io_buflen,
                                    i_accessType, i_addr);
         }
@@ -231,7 +231,7 @@ namespace DeviceFW
         return l_errl;
     }
 
-    
+
     deviceOp_t Associator::findDeviceRoute( OperationType i_opType,
                                             TARGETING::TYPE i_devType,
                                             int64_t i_accessType )
@@ -255,7 +255,7 @@ namespace DeviceFW
                 break;
             }
 
-            const AssociationData* ops = 
+            const AssociationData* ops =
               iv_associations[routeMap[i_accessType].offset];
 
             // Check op type = WILDCARD registrations.
@@ -264,7 +264,7 @@ namespace DeviceFW
                 // Check access type = WILDCARD registrations.
                 if (ops[WILDCARD].flag)
                 {
-                    l_devRoute = 
+                    l_devRoute =
                       iv_operations[
                             iv_associations[ops[WILDCARD].offset]->offset];
                     break;
diff --git a/src/usr/errl/errlentry.C b/src/usr/errl/errlentry.C
index 154eb17fd..45259d8e3 100644
--- a/src/usr/errl/errlentry.C
+++ b/src/usr/errl/errlentry.C
@@ -47,7 +47,7 @@ namespace ERRORLOG
 
 // Trace definition
 trace_desc_t* g_trac_errl = NULL;
-TRAC_INIT(&g_trac_errl, "ERRL", 1024);
+TRAC_INIT(&g_trac_errl, "ERRL", 1024, TRACE::BUFFER_SLOW);
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/usr/intr/intrrp.C b/src/usr/intr/intrrp.C
index 2d52f1432..d8d52dac6 100644
--- a/src/usr/intr/intrrp.C
+++ b/src/usr/intr/intrrp.C
@@ -48,7 +48,7 @@
 using namespace INTR;
 
 trace_desc_t * g_trac_intr = NULL;
-TRAC_INIT(&g_trac_intr, INTR_TRACE_NAME, 2 * 1024);
+TRAC_INIT(&g_trac_intr, INTR_TRACE_NAME, 2 * 1024, TRACE::BUFFER_SLOW);
 
 /**
  * setup _start and handle barrier
diff --git a/src/usr/mbox/mailboxsp.C b/src/usr/mbox/mailboxsp.C
index c9b2b9822..48af0de02 100644
--- a/src/usr/mbox/mailboxsp.C
+++ b/src/usr/mbox/mailboxsp.C
@@ -47,7 +47,7 @@ extern trace_desc_t * g_trac_mboxmsg;
 
 const char HBMBOXMSG_TRACE_NAME[] = "MBOXMSG";
 trace_desc_t* g_trac_mboxmsg = NULL; // g_trac_mbox;
-TRAC_INIT(&g_trac_mboxmsg, HBMBOXMSG_TRACE_NAME, 2048);
+TRAC_INIT(&g_trac_mboxmsg, HBMBOXMSG_TRACE_NAME, 2048, TRACE::BUFFER_SLOW);
 
 
 
@@ -455,7 +455,7 @@ void MailboxSp::send_msg(mbox_msg_t * i_msg)
             {
                 iv_msg_to_send.msg_payload.data[0] = dma_size; // bitmap
                 iv_msg_to_send.msg_payload.data[1] =
-                  iv_dmaBuffer.toPhysAddr(dma_buffer);
+                iv_dmaBuffer.toPhysAddr(dma_buffer);
             }
             iv_sendq.pop_front();
         }
@@ -681,7 +681,7 @@ void MailboxSp::recv_msg(mbox_msg_t & i_mbox_msg)
                          i_mbox_msg.msg_queue_id
                         );
 
-                    UserDetailsMboxMsg 
+                    UserDetailsMboxMsg
                         ffdc(reinterpret_cast<uint64_t*>(&i_mbox_msg),
                              sizeof(mbox_msg_t),
                              reinterpret_cast<uint64_t*>(msg->extra_data),
@@ -710,10 +710,10 @@ void MailboxSp::recv_msg(mbox_msg_t & i_mbox_msg)
                 mbox_msg.msg_id = i_mbox_msg.msg_id;
 
                 // msg_id and msg_queue_id
-                mbox_msg.msg_payload.data[0] = 
+                mbox_msg.msg_payload.data[0] =
                     *(reinterpret_cast<uint64_t*>(&i_mbox_msg));
                 // type & flags
-                mbox_msg.msg_payload.data[1] = 
+                mbox_msg.msg_payload.data[1] =
                     *(reinterpret_cast<uint64_t*>(msg));
 
                 mbox_msg.msg_payload.extra_data = NULL;
@@ -746,7 +746,7 @@ void MailboxSp::recv_msg(mbox_msg_t & i_mbox_msg)
                      msg->type
                     );
 
-                UserDetailsMboxMsg 
+                UserDetailsMboxMsg
                     ffdc(reinterpret_cast<uint64_t*>(&i_mbox_msg),
                          sizeof(mbox_msg_t),
                          reinterpret_cast<uint64_t*>(msg->extra_data),
@@ -800,11 +800,11 @@ void MailboxSp::handle_hbmbox_msg(mbox_msg_t & i_mbox_msg)
     else if(msg->type == MSG_INVALID_MSG_QUEUE_ID ||
             msg->type == MSG_INVALID_MSG_TYPE)
     {
-        mbox_msg_t * bad_mbox_msg = 
+        mbox_msg_t * bad_mbox_msg =
             reinterpret_cast<mbox_msg_t*>(&(msg->data[0]));
         msg_t * bad_msg = &(bad_mbox_msg->msg_payload);
 
-        TRACFCOMP(g_trac_mbox, ERR_MRK"Invalid message was sent to FSP. Queue" 
+        TRACFCOMP(g_trac_mbox, ERR_MRK"Invalid message was sent to FSP. Queue"
                   " id: 0x%08x Type: %08x",
                   bad_mbox_msg->msg_queue_id,
                   bad_msg->type);
@@ -827,7 +827,7 @@ void MailboxSp::handle_hbmbox_msg(mbox_msg_t & i_mbox_msg)
              bad_msg->type
             );
 
-        UserDetailsMboxMsg 
+        UserDetailsMboxMsg
             ffdc(reinterpret_cast<uint64_t*>(&i_mbox_msg),
                  sizeof(mbox_msg_t),
                  reinterpret_cast<uint64_t*>(msg->extra_data),
@@ -839,7 +839,7 @@ void MailboxSp::handle_hbmbox_msg(mbox_msg_t & i_mbox_msg)
 
         // If the msg was sync then we need to respond to the
         // orignal sender and clean up the respondq
-        if(!msg_is_async(bad_msg)) 
+        if(!msg_is_async(bad_msg))
         {
             msg_t * key = reinterpret_cast<msg_t*>(bad_mbox_msg->msg_id);
             msg_respond_t * response = iv_respondq.find(key);
@@ -889,7 +889,7 @@ void MailboxSp::handle_hbmbox_msg(mbox_msg_t & i_mbox_msg)
              i_mbox_msg.msg_queue_id
             );
 
-        UserDetailsMboxMsg 
+        UserDetailsMboxMsg
             ffdc(reinterpret_cast<uint64_t*>(&i_mbox_msg),
                  sizeof(mbox_msg_t),
                  reinterpret_cast<uint64_t*>(msg->extra_data),
@@ -1019,7 +1019,7 @@ errlHndl_t MailboxSp::send(queue_id_t i_q_id, msg_t * io_msg)
              MBOX::MOD_MBOXSRV_SEND,                 //  moduleid
              MBOX::RC_MBOX_SERVICE_NOT_READY,        //  reason Code
              i_q_id,                                 //  queue id
-             0                                       //  
+             0                                       //
             );
     }
 
@@ -1239,7 +1239,7 @@ errlHndl_t MailboxSp::handleInterrupt()
             }
             else if(mbox_status & MBOX_ILLEGAL_OP)
             {
-                // Code problem could be FSP or HB 
+                // Code problem could be FSP or HB
                 // - log error and continue.
 
                 /*@ errorlog tag
@@ -1265,7 +1265,7 @@ errlHndl_t MailboxSp::handleInterrupt()
 
             //else if(mbox_status & MBOX_DATA_READ_ERR)
             //{
-            //    // Read when no message available 
+            //    // Read when no message available
             //    - Just ignore this one per Dean.
             //}
 
@@ -1294,10 +1294,10 @@ void MailboxSp::handleUnclaimed()
 
         mbox_msg_t * msg = &(*mbox_msg);
         // msg_id and msg_queue_id
-        r_mbox_msg.msg_payload.data[0] = 
+        r_mbox_msg.msg_payload.data[0] =
             *(reinterpret_cast<uint64_t*>(msg));
         // type & flags
-        r_mbox_msg.msg_payload.data[1] = 
+        r_mbox_msg.msg_payload.data[1] =
             *(reinterpret_cast<uint64_t*>(&(msg->msg_payload)));
 
         r_mbox_msg.msg_payload.extra_data = NULL;
@@ -1329,7 +1329,7 @@ void MailboxSp::handleUnclaimed()
              mbox_msg->msg_payload.type         //  message type
             );
 
-        UserDetailsMboxMsg 
+        UserDetailsMboxMsg
             ffdc(reinterpret_cast<uint64_t*>(msg),
                  sizeof(mbox_msg_t),
                  reinterpret_cast<uint64_t*>(msg->msg_payload.extra_data),
@@ -1485,7 +1485,7 @@ bool MBOX::mailbox_enabled()
     {
         enabled = true;
     }
-    
+
     return enabled;
 }
 
diff --git a/src/usr/mbox/mboxdd.C b/src/usr/mbox/mboxdd.C
index 7163c203a..10f9b336d 100644
--- a/src/usr/mbox/mboxdd.C
+++ b/src/usr/mbox/mboxdd.C
@@ -32,7 +32,7 @@
 
 
 trace_desc_t* g_trac_mbox = NULL;
-TRAC_INIT(&g_trac_mbox, "MBOX", 4096); //4K
+TRAC_INIT(&g_trac_mbox, "MBOX", 4096, TRACE::BUFFER_SLOW); //4K
 
 
 namespace MBOX
@@ -172,7 +172,7 @@ errlHndl_t mboxRead(TARGETING::Target* i_target,void *o_buffer,
             break;
         }
 
-        // Check to see if there is an error bit set. 
+        // Check to see if there is an error bit set.
         if ((l_IntReg[0] & MBOX_DOORBELL_ERROR) ==
              MBOX_DOORBELL_ERROR)
         {
@@ -222,7 +222,7 @@ errlHndl_t mboxRead(TARGETING::Target* i_target,void *o_buffer,
          */
 
         //If the Acknowledge bit is on and the Xup bit is on
-        if ((l_IntReg[0] & MBOX_HW_ACK) == 
+        if ((l_IntReg[0] & MBOX_HW_ACK) ==
             MBOX_HW_ACK &&
             (l_64bitBuf[0] & MBOX_XUP) == MBOX_XUP)
         {
@@ -261,7 +261,7 @@ errlHndl_t mboxRead(TARGETING::Target* i_target,void *o_buffer,
             // we are currently reading from.
             uint32_t cur_reg_cntr = 0;
             uint32_t l_data[2];
-            
+
             // Total number of registers to read to get all the data.
             uint8_t l_numRegsToRead = (io_buflen*sizeof(uint8_t))/sizeof(uint32_t);
 
@@ -275,7 +275,7 @@ errlHndl_t mboxRead(TARGETING::Target* i_target,void *o_buffer,
 
             uint32_t *local_buf = static_cast<uint32_t *>(o_buffer);
             // For the read we extract the data from the MBOX data registers.
-            // MBOX_DATA_LBUS_START = 0x00050080 and the end address is 
+            // MBOX_DATA_LBUS_START = 0x00050080 and the end address is
             // MBOX_DATA_LBUS_END   = 0x0005008F
             // each address inbetween increments by 1.
 
@@ -299,7 +299,7 @@ errlHndl_t mboxRead(TARGETING::Target* i_target,void *o_buffer,
                 if ((cur_reg_cntr -1 == l_numRegsToRead) &&
                    (l_numBytesLeft != 0))
                 {
-                // Only copy the number of bytes remaining.. 
+                // Only copy the number of bytes remaining..
                 memcpy( local_buf + cur_reg_cntr,
                         &l_data[0], l_numBytesLeft);
                 }
@@ -370,7 +370,7 @@ errlHndl_t mboxWrite(TARGETING::Target* i_target,void* i_buffer,
     do
     {
         //If the expected siZe in bytes is bigger than the max data allowed
-        // send back an error. 
+        // send back an error.
         if (i_buflen > MBOX_MAX_DATA_BYTES)
         {
             TRACFCOMP(g_trac_mbox, ERR_MRK "MBOX::write> Invalid data length : i_buflen=%d", i_buflen);
@@ -391,7 +391,7 @@ errlHndl_t mboxWrite(TARGETING::Target* i_target,void* i_buffer,
 
             // Set the i_buflen to 0 to indicate no write occured
             i_buflen = 0;
- 
+
             break;
         }
 
@@ -444,7 +444,7 @@ errlHndl_t mboxWrite(TARGETING::Target* i_target,void* i_buffer,
             uint32_t *l_buf = static_cast<uint32_t *>(i_buffer);
 
             // For the write we put the data into the MBOX data registers.
-            // MBOX_DATA_PIB_START    = 0x00050040 and the end address is 
+            // MBOX_DATA_PIB_START    = 0x00050040 and the end address is
             // MBOX_DATA_PIB_END      = 0x0005004F
             // each address inbetween increments by 1.
 
@@ -460,7 +460,7 @@ errlHndl_t mboxWrite(TARGETING::Target* i_target,void* i_buffer,
                     // zero out the data reg.
                     l_data[0] = 0;
 
-                    // Only copy the number of bytes remaining.. 
+                    // Only copy the number of bytes remaining..
                     memcpy(&l_data[0], l_buf+cur_reg_cntr,l_numBytesLeft);
 
                 }
diff --git a/src/usr/pnor/pnorrp.C b/src/usr/pnor/pnorrp.C
index 7e27bf7e6..567df83c9 100644
--- a/src/usr/pnor/pnorrp.C
+++ b/src/usr/pnor/pnorrp.C
@@ -39,7 +39,7 @@
 
 // Trace definition
 trace_desc_t* g_trac_pnor = NULL;
-TRAC_INIT(&g_trac_pnor, "PNOR", 4096); //4K
+TRAC_INIT(&g_trac_pnor, "PNOR", 4096, TRACE::BUFFER_SLOW); //4K
 
 // Easy macro replace for unit testing
 //#define TRACUCOMP(args...)  TRACFCOMP(args)
@@ -339,7 +339,7 @@ errlHndl_t PnorRP::readTOC()
 #define SIDELESS_VADDR_INDEX 2
     uint64_t nextVAddr[] = {SIDEA_VADDR, SIDEB_VADDR, SIDELESS_VADDR};
 
-    do{ 
+    do{
         // Zero out my table
         for( uint64_t side = 0; side < NUM_SIDES; side++ )
         {
@@ -459,8 +459,8 @@ errlHndl_t PnorRP::readTOC()
             //For Sections found to be sideless, both PNOR sides will map to the same virtual address.
             if(!(ffsUserData->miscFlags & FFS_MISC_SIDELESS))
             {
-                iv_TOC[cur_side][secId].virtAddr = nextVAddr[cur_side];  
-                nextVAddr[cur_side] += iv_TOC[cur_side][secId].size; 
+                iv_TOC[cur_side][secId].virtAddr = nextVAddr[cur_side];
+                nextVAddr[cur_side] += iv_TOC[cur_side][secId].size;
             }
             else
             {
@@ -877,7 +877,7 @@ errlHndl_t PnorRP::computeSection( uint64_t i_vaddr,
     }while(0);
 
     if(o_id == PNOR::INVALID_SECTION)
-    {   
+    {
         TRACFCOMP( g_trac_pnor, "PnorRP::computeSection> Invalid virtual address : i_vaddr=%X", i_vaddr );
         /*@
          * @errortype
diff --git a/src/usr/scom/scom.C b/src/usr/scom/scom.C
index 3ada9803e..3f3a895d0 100644
--- a/src/usr/scom/scom.C
+++ b/src/usr/scom/scom.C
@@ -41,7 +41,7 @@
 
 // Trace definition
 trace_desc_t* g_trac_scom = NULL;
-TRAC_INIT(&g_trac_scom, "SCOM", 1024); //1K
+TRAC_INIT(&g_trac_scom, "SCOM", 1024, TRACE::BUFFER_SLOW); //1K
 
 
 namespace SCOM
diff --git a/src/usr/targeting/common/targetservice.C b/src/usr/targeting/common/targetservice.C
index ab534100a..700c7fc35 100644
--- a/src/usr/targeting/common/targetservice.C
+++ b/src/usr/targeting/common/targetservice.C
@@ -74,7 +74,11 @@ TARGETING::TargetService& targetService()
 //******************************************************************************
 
 TARG_TD_t g_trac_targeting = {0};
+#ifdef __HOSTBOOT_MODULE
+TRAC_INIT(&g_trac_targeting, "TARG", 4096, TRACE::BUFFER_SLOW);
+#else
 TRAC_INIT(&g_trac_targeting, "TARG", 4096);
+#endif
 
 #undef TARG_CLASS
 #define TARG_CLASS "TargetService::"
@@ -293,11 +297,11 @@ Target* TargetService::toTarget(
         bool found = false;
         switch(i_entityPath.type())
         {
-            case EntityPath::PATH_PHYSICAL: 
+            case EntityPath::PATH_PHYSICAL:
                 found = (   (i_entityPath)
                          == (*iv_targets)[i].getAttr<ATTR_PHYS_PATH>());
                 break;
-            case EntityPath::PATH_AFFINITY: 
+            case EntityPath::PATH_AFFINITY:
                 found = (   (i_entityPath)
                          == (*iv_targets)[i].getAttr<ATTR_AFFINITY_PATH>());
                 break;
@@ -599,7 +603,7 @@ void TargetService::_configureTargetPool()
 
     // iv_pPnor--> points to uint32_t* --> points to --> uint32_t, targets[]
     //                   (uint32_t*)+1 --> points to ------------> targets[]
-    const AbstractPointer<uint32_t>* ppNumTargets 
+    const AbstractPointer<uint32_t>* ppNumTargets
         = static_cast<const AbstractPointer<uint32_t>*>(iv_pPnor);
     iv_targets =
            reinterpret_cast< Target(*)[] > (
@@ -638,7 +642,7 @@ uint32_t TargetService::_maxTargets()
 
     // Target count found by following the pointer pointed to by the iv_pPnor
     // pointer.
-    const AbstractPointer<uint32_t>* pNumTargetsPtr 
+    const AbstractPointer<uint32_t>* pNumTargetsPtr
         = static_cast<const AbstractPointer<uint32_t>*>(iv_pPnor);
     uint32_t* pNumTargets = TARG_TO_PLAT_PTR(*pNumTargetsPtr);
 
diff --git a/src/usr/trace/assert.C b/src/usr/trace/assert.C
index c08378392..35510ea93 100644
--- a/src/usr/trace/assert.C
+++ b/src/usr/trace/assert.C
@@ -1,25 +1,25 @@
-//  IBM_PROLOG_BEGIN_TAG
-//  This is an automatically generated prolog.
-//
-//  $Source: src/usr/trace/assert.C $
-//
-//  IBM CONFIDENTIAL
-//
-//  COPYRIGHT International Business Machines Corp. 2011
-//
-//  p1
-//
-//  Object Code Only (OCO) source materials
-//  Licensed Internal Code Source Materials
-//  IBM HostBoot Licensed Internal Code
-//
-//  The source code for this program is not published or other-
-//  wise divested of its trade secrets, irrespective of what has
-//  been deposited with the U.S. Copyright Office.
-//
-//  Origin: 30
-//
-//  IBM_PROLOG_END
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/trace/assert.C $                                      */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2011,2012              */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
 /** @file assert.C
  *  Hooks for dealing with trace in assert statements.
  *
@@ -34,8 +34,8 @@ namespace TRACE
 {
     /** Unique trace buffer for assert statements. */
     trace_desc_t* g_assertTraceBuffer;
-    TRAC_INIT(&g_assertTraceBuffer, "ASSERT", 4096);
-    
+    TRAC_INIT(&g_assertTraceBuffer, "ASSERT", 4096, TRACE::BUFFER_SLOW);
+
     /** @fn assertTrace
      *  @brief Hook to perform a trace on an assert failure.
      *
@@ -45,7 +45,7 @@ namespace TRACE
     void assertTrace(void* i_linkRegister, size_t i_lineNumber)
     {
         TRACFCOMP(g_assertTraceBuffer,
-                  "Assertion failed @%p on line %d.", 
+                  "Assertion failed @%p on line %d.",
                   i_linkRegister, i_lineNumber);
     }
 
diff --git a/src/usr/vfs/vfsrp.C b/src/usr/vfs/vfsrp.C
index 0f34782b6..1d4d7985b 100644
--- a/src/usr/vfs/vfsrp.C
+++ b/src/usr/vfs/vfsrp.C
@@ -43,7 +43,7 @@ using namespace VFS;
 
 // Trace definitions
 trace_desc_t * g_trac_vfs = NULL;
-TRAC_INIT(&g_trac_vfs, VFS_COMP_NAME, 1024);
+TRAC_INIT(&g_trac_vfs, VFS_COMP_NAME, 1024, TRACE::BUFFER_SLOW);
 
 /**
  * setup _start and handle barrier
diff --git a/src/usr/xscom/xscom.C b/src/usr/xscom/xscom.C
index 2f1308468..f97639dd0 100644
--- a/src/usr/xscom/xscom.C
+++ b/src/usr/xscom/xscom.C
@@ -46,7 +46,7 @@
 
 // Trace definition
 trace_desc_t* g_trac_xscom = NULL;
-TRAC_INIT(&g_trac_xscom, "XSCOM", 4096);
+TRAC_INIT(&g_trac_xscom, "XSCOM", 4096, TRACE::BUFFER_SLOW);
 
 namespace XSCOM
 {