diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2014-02-17 17:29:55 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-02-27 11:38:43 -0600 |
| commit | 941d3e56f1f933dba3f98c3f82fae0561a5201e7 (patch) | |
| tree | f8f907280d7176c83685739ca03797eb822bbfe9 /src/usr | |
| parent | 0f33e04d51a9ad3e37fa40db8970f166ff84432e (diff) | |
| download | talos-hostboot-941d3e56f1f933dba3f98c3f82fae0561a5201e7.tar.gz talos-hostboot-941d3e56f1f933dba3f98c3f82fae0561a5201e7.zip | |
Clean up beam errors in core.
Change-Id: I695a38ae88583a052cae19b930eb53171f8fab2b
RTC:94993
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9050
Tested-by: Jenkins Server
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rwxr-xr-x | src/usr/i2c/i2c.C | 2 | ||||
| -rw-r--r-- | src/usr/ibscom/ibscom.C | 8 | ||||
| -rw-r--r-- | src/usr/intr/intrrp.C | 2 | ||||
| -rw-r--r-- | src/usr/trace/compdesc.C | 5 | ||||
| -rw-r--r-- | src/usr/trace/entry.H | 4 | ||||
| -rw-r--r-- | src/usr/trace/runtime/rt_service.C | 4 |
6 files changed, 13 insertions, 12 deletions
diff --git a/src/usr/i2c/i2c.C b/src/usr/i2c/i2c.C index 9709026b8..606cb79bd 100755 --- a/src/usr/i2c/i2c.C +++ b/src/usr/i2c/i2c.C @@ -1498,7 +1498,7 @@ errlHndl_t i2cSetupMasters ( void ) continue; } - for( uint32_t engine = 0; /*loop doesn't iterate*/ + for( uint32_t engine = 0; engine < CENTAUR_MASTER_ENGINES; engine++ ) { diff --git a/src/usr/ibscom/ibscom.C b/src/usr/ibscom/ibscom.C index f81656002..71ea19e67 100644 --- a/src/usr/ibscom/ibscom.C +++ b/src/usr/ibscom/ibscom.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2013 */ +/* COPYRIGHT International Business Machines Corp. 2012,2014 */ /* */ /* p1 */ /* */ @@ -380,7 +380,7 @@ void err_cleanup(Target* i_target, //23=MBS_FIR_MASK_REG_HOST_INBAND_WRITE_ERROR mbs_fir &= 0xFFFFFCFFFFFFFFFF; op_size = sizeof(uint64_t); - l_err = deviceOp( DeviceFW::WRITE, + tmp_err = deviceOp( DeviceFW::WRITE, i_target, &mbs_fir, op_size, @@ -412,7 +412,7 @@ void err_cleanup(Target* i_target, l_err->setSev(ERRORLOG::ERRL_SEV_INFORMATIONAL); errlCommit(l_err,IBSCOM_COMP_ID); l_err = NULL; - } + } } @@ -932,7 +932,7 @@ void enableInbandScoms( bool i_disable ) mutex_unlock(l_mutex); } - } + } } diff --git a/src/usr/intr/intrrp.C b/src/usr/intr/intrrp.C index 9b2d125ac..1f30832c2 100644 --- a/src/usr/intr/intrrp.C +++ b/src/usr/intr/intrrp.C @@ -357,7 +357,7 @@ void IntrRp::msgHandler() TRACFCOMP(g_trac_intr, "External Interrupt recieved. XIRR=%x, PIR=%x", - xirr,pir); + xirr,pir.word); // Acknowlege msg msg->data[1] = 0; diff --git a/src/usr/trace/compdesc.C b/src/usr/trace/compdesc.C index 35f4de0c5..3d8de4ac4 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,2013 */ +/* COPYRIGHT International Business Machines Corp. 2012,2014 */ /* */ /* p1 */ /* */ @@ -95,7 +95,8 @@ namespace TRACE #ifndef __HOSTBOOT_RUNTIME // TODO: RTC 79408 // Check for special SCAN component to force enable debug trace on. - if (0 == memcmp(l_compName, "SCAN", 5)) + if (l_rc && !l_rc->iv_debugEnabled && + (0 == memcmp(l_compName, "SCAN", 5))) { TARGETING::Target* sys = NULL; TARGETING::targetService().getTopLevelTarget(sys); diff --git a/src/usr/trace/entry.H b/src/usr/trace/entry.H index 1bd47ce18..8f98468ac 100644 --- a/src/usr/trace/entry.H +++ b/src/usr/trace/entry.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012 */ +/* COPYRIGHT International Business Machines Corp. 2012,2014 */ /* */ /* p1 */ /* */ @@ -56,7 +56,7 @@ namespace TRACE ComponentDesc* comp; //< Component Descriptor for this Entry. Entry* next; //< Linked-list 'next' ptr. Entry* prev; //< Linked-list 'prev' ptr. - uint16_t committed; //< Committed status. + volatile uint16_t committed; //< Committed status. uint16_t size; //< Size of data portion. char data[0]; //< Start of 'fsp-trace' style structure. }; diff --git a/src/usr/trace/runtime/rt_service.C b/src/usr/trace/runtime/rt_service.C index e7eda7280..f5e5da27e 100644 --- a/src/usr/trace/runtime/rt_service.C +++ b/src/usr/trace/runtime/rt_service.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013 */ +/* COPYRIGHT International Business Machines Corp. 2013,2014 */ /* */ /* p1 */ /* */ @@ -139,7 +139,7 @@ namespace TRACE memcpy(bin_output, i_td->iv_compName, compName_len); size_t output_pos = compName_len + sprintf(&bin_output[compName_len], - ":~[0x%04hx]", (int) pos); + ":~[0x%04hx]", (uint16_t) pos); for (int i = 0; i < 16; ++i) { |
