diff options
| -rw-r--r-- | src/include/usr/fapi2/fapiPlatTrace.H | 6 | ||||
| -rw-r--r-- | src/usr/fapi2/plat_utils.C | 3 | ||||
| -rwxr-xr-x | src/usr/targeting/common/genHwsvMrwXml.pl | 1 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 13 | ||||
| -rw-r--r-- | src/usr/trace/compdesc.C | 15 |
5 files changed, 34 insertions, 4 deletions
diff --git a/src/include/usr/fapi2/fapiPlatTrace.H b/src/include/usr/fapi2/fapiPlatTrace.H index ff9079a22..d780832ca 100644 --- a/src/include/usr/fapi2/fapiPlatTrace.H +++ b/src/include/usr/fapi2/fapiPlatTrace.H @@ -48,6 +48,7 @@ const char * const FAPI_TRACE_NAME = "FAPI"; const char * const FAPI_IMP_TRACE_NAME = "FAPI_I"; const char * const FAPI_SCAN_TRACE_NAME = "SCAN"; +const char * const FAPI_DBG_TRACE_NAME = "FAPI_DBG"; const char * const FAPI_MFG_TRACE_NAME = "FAPI_MFG"; //****************************************************************************** @@ -56,6 +57,7 @@ const char * const FAPI_MFG_TRACE_NAME = "FAPI_MFG"; extern trace_desc_t* g_fapiTd; extern trace_desc_t* g_fapiImpTd; extern trace_desc_t* g_fapiScanTd; +extern trace_desc_t* g_fapiDbgTd; extern trace_desc_t* g_fapiMfgTd; // Information traces (go into fast trace buffer that can wrap often) @@ -67,8 +69,8 @@ extern trace_desc_t* g_fapiMfgTd; // Error traces (go into slow trace buffer that should not wrap often) #define FAPI_ERR(_fmt_, _args_...) TRACFCOMP(g_fapiImpTd, TRACE_FILENAME _fmt_, ##_args_ ) -// Debug traces (go into fast trace buffer that can wrap often) -#define FAPI_DBG(_fmt_, _args_...) TRACDCOMP(g_fapiTd, TRACE_FILENAME _fmt_, ##_args_) +// Debug traces +#define FAPI_DBG(_fmt_, _args_...) TRACSCOMP(g_fapiDbgTd, TRACE_FILENAME _fmt_, ##_args_) // Scan traces #define FAPI_SCAN(_fmt_, _args_...) TRACSCOMP(g_fapiScanTd, _fmt_, ##_args_) diff --git a/src/usr/fapi2/plat_utils.C b/src/usr/fapi2/plat_utils.C index 596e139df..3433b088a 100644 --- a/src/usr/fapi2/plat_utils.C +++ b/src/usr/fapi2/plat_utils.C @@ -47,6 +47,7 @@ trace_desc_t* g_fapiTd; trace_desc_t* g_fapiImpTd; trace_desc_t* g_fapiScanTd; +trace_desc_t* g_fapiDbgTd; trace_desc_t* g_fapiMfgTd; @@ -56,6 +57,7 @@ trace_desc_t* g_fapiMfgTd; TRAC_INIT(&g_fapiTd, FAPI_TRACE_NAME, 2*KILOBYTE); TRAC_INIT(&g_fapiImpTd, FAPI_IMP_TRACE_NAME, 2*KILOBYTE); TRAC_INIT(&g_fapiScanTd, FAPI_SCAN_TRACE_NAME, 4*KILOBYTE); +TRAC_INIT(&g_fapiDbgTd, FAPI_DBG_TRACE_NAME, 4*KILOBYTE); TRAC_INIT(&g_fapiMfgTd, FAPI_MFG_TRACE_NAME, 4*KILOBYTE); namespace fapi2 { @@ -894,6 +896,7 @@ errlHndl_t rcToErrl(ReturnCode & io_rc, l_pError->collectTrace(FAPI_TRACE_NAME, 256 ); l_pError->collectTrace(FAPI_IMP_TRACE_NAME, 384 ); l_pError->collectTrace(FAPI_SCAN_TRACE_NAME, 256 ); + l_pError->collectTrace(FAPI_DBG_TRACE_NAME, 256 ); } FAPI_DBG("Exiting rcToErrl"); diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index fb47f340c..85317d39f 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -2649,6 +2649,7 @@ sub generate_sys <default> <field><id>traceContinuous</id><value>0</value></field> <field><id>traceScanDebug</id><value>0</value></field> + <field><id>traceFapiDebug</id><value>0</value></field> <field><id>reserved</id><value>0</value></field> </default> </attribute> diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index e78024f3a..46484c8b0 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -2625,10 +2625,21 @@ <default>0</default> </field> <field> + <name>traceFapiDebug</name> + <description> + Override trace debug selection for DBG component. + 0b0: TRACS entries for DBG have default behavior. + 0b1: TRACS entries for DBG 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>6</bits> + <bits>5</bits> <default>0</default> </field> </complexType> diff --git a/src/usr/trace/compdesc.C b/src/usr/trace/compdesc.C index 72c7a2476..e5c6e46ad 100644 --- a/src/usr/trace/compdesc.C +++ b/src/usr/trace/compdesc.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -113,6 +113,19 @@ namespace TRACE l_rc->iv_debugEnabled = true; } } + else if(0 == memcmp(l_compName, "FAPI_DBG", 9)) + { + TARGETING::Target* sys = NULL; + TARGETING::targetService().getTopLevelTarget(sys); + + TARGETING::HbSettings hbSettings = + sys->getAttr<TARGETING::ATTR_HB_SETTINGS>(); + + if (hbSettings.traceFapiDebug) + { + l_rc->iv_debugEnabled = true; + } + } else if(0 == memcmp(l_compName, "FAPI_MFG",9)) { TARGETING::Target* sys = NULL; |
