TRACS override attribute for SCAN traces.

Change-Id: Ia2bd15babe8ad7bd25293e72a7285c0a278b89c2
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2792
Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

9 files changed, 73 insertions, 41 deletions

diff --git a/src/usr/spd/spd.C b/src/usr/spd/spd.C
index ff54fd217..f5fec88f4 100755
--- a/src/usr/spd/spd.C
+++ b/src/usr/spd/spd.C
@@ -1,26 +1,25 @@
-/*  IBM_PROLOG_BEGIN_TAG
- *  This is an automatically generated prolog.
- *
- *  $Source: src/usr/spd/spd.C $
- *
- *  IBM CONFIDENTIAL
- *
- *  COPYRIGHT International Business Machines Corp. 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 other-
- *  wise divested of its trade secrets, irrespective of what has
- *  been deposited with the U.S. Copyright Office.
- *
- *  Origin: 30
- *
- *  IBM_PROLOG_END_TAG
- */
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/spd/spd.C $                                           */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012,2013              */
+/*                                                                        */
+/* 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 spd.C
  *
@@ -66,8 +65,8 @@ TRAC_INIT( & g_trac_spd, "SPD", KILOBYTE );
 
 // ------------------------
 // Macros for unit testing
-#define TRACUCOMP(args...)  TRACFCOMP(args)
-//#define TRACUCOMP(args...)
+//#define TRACUCOMP(args...)  TRACFCOMP(args)
+#define TRACUCOMP(args...)
 //#define TRACSSCOMP(args...)  TRACFCOMP(args)
 #define TRACSSCOMP(args...)
 
@@ -1073,7 +1072,7 @@ errlHndl_t spdSendMboxWriteMsg ( uint64_t i_offset,
         l_err = MBOX::send( MBOX::FSP_VPD_MSGQ, msg );
         if( l_err )
         {
-            TRACFCOMP(g_trac_spd, ERR_MRK "Failed sending SPD to FSP");           
+            TRACFCOMP(g_trac_spd, ERR_MRK "Failed sending SPD to FSP");
             // just commit the log and move on, nothing else to do
             l_err->collectTrace("SPD",1024);
             errlCommit( l_err, SPD_COMP_ID );
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 2ab2a7131..b6cde6c47 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- IBM CONFIDENTIAL                                                       -->
 <!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2011,2012              -->
+<!-- COPYRIGHT International Business Machines Corp. 2011,2013              -->
 <!--                                                                        -->
 <!-- p1                                                                     -->
 <!--                                                                        -->
@@ -1663,10 +1663,21 @@
             <default>0</default>
         </field>
         <field>
+            <name>traceScanDebug</name>
+            <description>
+            Override trace debug selection for SCAN component.
+                0b0: TRACS entries for SCAN have default behavior.
+                0b1: TRACS entries for SCAN are enabled.
+            </description>
+            <type>uint8_t</type>
+            <bits>1</bits>
+            <default>0</default>
+        </field>
+        <field>
             <name>reserved</name>
             <description>Reserved for future use</description>
             <type>uint8_t</type>
-            <bits>7</bits>
+            <bits>6</bits>
             <default>0</default>
         </field>
         </complexType>
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
index c006aebc8..2bcb8a818 100644
--- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- IBM CONFIDENTIAL                                                       -->
 <!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2011,2012              -->
+<!-- COPYRIGHT International Business Machines Corp. 2011,2013              -->
 <!--                                                                        -->
 <!-- p1                                                                     -->
 <!--                                                                        -->
@@ -125,7 +125,8 @@
     <attribute>
         <id>HB_SETTINGS</id>
         <default>
-            <field><id>traceContinuous</id><value>1</value></field>            
+            <field><id>traceContinuous</id><value>1</value></field>
+            <field><id>traceScanDebug</id><value>1</value></field>            
             <field><id>reserved</id><value>0</value></field>
         </default>
     </attribute>
diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
index 4edf160a0..3f0404e1d 100644
--- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- IBM CONFIDENTIAL                                                       -->
 <!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2011,2012              -->
+<!-- COPYRIGHT International Business Machines Corp. 2011,2013              -->
 <!--                                                                        -->
 <!-- p1                                                                     -->
 <!--                                                                        -->
@@ -101,7 +101,8 @@
     <attribute>
         <id>HB_SETTINGS</id>
         <default>
-            <field><id>traceContinuous</id><value>1</value></field>            
+            <field><id>traceContinuous</id><value>1</value></field>
+            <field><id>traceScanDebug</id><value>1</value></field>
             <field><id>reserved</id><value>0</value></field>
         </default>
     </attribute>
diff --git a/src/usr/targeting/common/xmltohb/vbu.system.xml b/src/usr/targeting/common/xmltohb/vbu.system.xml
index 05e2c83ac..f08133ae4 100644
--- a/src/usr/targeting/common/xmltohb/vbu.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu.system.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- IBM CONFIDENTIAL                                                       -->
 <!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2011,2012              -->
+<!-- COPYRIGHT International Business Machines Corp. 2011,2013              -->
 <!--                                                                        -->
 <!-- p1                                                                     -->
 <!--                                                                        -->
@@ -118,7 +118,8 @@
     <attribute>
         <id>HB_SETTINGS</id>
         <default>
-            <field><id>traceContinuous</id><value>1</value></field>            
+            <field><id>traceContinuous</id><value>1</value></field>
+            <field><id>traceScanDebug</id><value>1</value></field>            
             <field><id>reserved</id><value>0</value></field>
         </default>
     </attribute>
diff --git a/src/usr/targeting/xmltohb/TULETA.mrw.xml b/src/usr/targeting/xmltohb/TULETA.mrw.xml
index 98da3540b..4874ff1ed 100644
--- a/src/usr/targeting/xmltohb/TULETA.mrw.xml
+++ b/src/usr/targeting/xmltohb/TULETA.mrw.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- IBM CONFIDENTIAL                                                       -->
 <!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2012                   -->
+<!-- COPYRIGHT International Business Machines Corp. 2012,2013              -->
 <!--                                                                        -->
 <!-- p1                                                                     -->
 <!--                                                                        -->
@@ -167,7 +167,8 @@
     <attribute>
         <id>HB_SETTINGS</id>
         <default>
-            <field><id>traceContinuous</id><value>0</value></field>            
+            <field><id>traceContinuous</id><value>0</value></field>
+            <field><id>traceScanDebug</id><value>0</value></field>
             <field><id>reserved</id><value>0</value></field>
         </default>
     </attribute>
diff --git a/src/usr/targeting/xmltohb/genHwsvMrwXml.pl b/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
index 949725a50..536e4bb48 100755
--- a/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
+++ b/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
@@ -220,7 +220,7 @@ foreach my $i (@{$vmemCentaur->{'centaur-vrd-connection'}})
     my $vmemNode = $i->{'centaur'}->{'target'}->{'node'};
     my $vmemPosition = $i->{'centaur'}->{'target'}->{'position'};
 
-    push (@unsortedVmem,[$vmemDev, $vmemAddr, $vmemValue, $vmemNode, 
+    push (@unsortedVmem,[$vmemDev, $vmemAddr, $vmemValue, $vmemNode,
                          $vmemPosition]);
 }
 
@@ -1358,6 +1358,7 @@ sub generate_sys
         <id>HB_SETTINGS</id>
         <default>
             <field><id>traceContinuous</id><value>0</value></field>
+            <field><id>traceScanDebug</id><value>0</value></field>
             <field><id>reserved</id><value>0</value></field>
         </default>
     </attribute>
diff --git a/src/usr/trace/compdesc.C b/src/usr/trace/compdesc.C
index 92b306949..ddfd860dc 100644
--- a/src/usr/trace/compdesc.C
+++ b/src/usr/trace/compdesc.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012                   */
+/* COPYRIGHT International Business Machines Corp. 2012,2013              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -26,6 +26,8 @@
 #include <string.h>
 #include <string_ext.h>
 
+#include <targeting/common/commontargeting.H>
+
 namespace TRACE
 {
     ComponentDesc::ComponentDesc(const char* i_comp, uint32_t i_size,
@@ -91,6 +93,21 @@ namespace TRACE
             l_rc = &iv_components.back();
         }
 
+        // Check for special SCAN component to force enable debug trace on.
+        if (0 == memcmp(l_compName, "SCAN", 5))
+        {
+            TARGETING::Target* sys = NULL;
+            TARGETING::targetService().getTopLevelTarget(sys);
+
+            TARGETING::HbSettings hbSettings =
+                sys->getAttr<TARGETING::ATTR_HB_SETTINGS>();
+
+            if (hbSettings.traceScanDebug)
+            {
+                l_rc->iv_debugEnabled = true;
+            }
+        }
+
         mutex_unlock(&iv_mutex);
         return l_rc;
     }
diff --git a/src/usr/trace/service.C b/src/usr/trace/service.C
index 15c69cb7a..ad9105499 100644
--- a/src/usr/trace/service.C
+++ b/src/usr/trace/service.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012                   */
+/* COPYRIGHT International Business Machines Corp. 2012,2013              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -61,7 +61,7 @@ namespace TRACE
         // Skip writing trace if debug is disabled.
         if (unlikely(i_type == TRACE_DEBUG))
         {
-            if ((!i_td->iv_debugEnabled) ||
+            if ((!i_td->iv_debugEnabled) &&
                 (!g_debugSettings.globalDebugEnable))
             {
                 return;
@@ -216,7 +216,7 @@ namespace TRACE
         // Skip writing trace if debug is disabled.
         if (unlikely(i_type == TRACE_DEBUG))
         {
-            if ((!i_td->iv_debugEnabled) ||
+            if ((!i_td->iv_debugEnabled) &&
                 (!g_debugSettings.globalDebugEnable))
             {
                 return;