summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Crowell <dcrowell@us.ibm.com>2015-08-06 22:06:41 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2015-08-10 14:50:18 -0500
commit69262b80495d705baf5e9759beab6f113481405b (patch)
treeea6c4a8a95ac5ff697c85dceafc9ee203de4fb1a
parent26a72f82cc3ab02bc486b99e2e3dd7ddfcc3b099 (diff)
downloadtalos-hostboot-69262b80495d705baf5e9759beab6f113481405b.tar.gz
talos-hostboot-69262b80495d705baf5e9759beab6f113481405b.zip
Fix up some malformed error log tags
Change-Id: Ief8c1bca26f2c630cd4699ccc1b8edec67834dfc Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19644 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Brian Silver <bsilver@us.ibm.com> Reviewed-by: Christopher Cain <cjcain@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
-rw-r--r--src/include/usr/ipmi/ipmi_reasoncodes.H1
-rw-r--r--src/usr/htmgt/htmgt_memthrottles.C4
-rw-r--r--src/usr/hwpf/hwp/bus_training/pbusLinkSvc.C10
-rw-r--r--src/usr/initservice/baseinitsvc/initservice.C6
-rw-r--r--src/usr/ipmi/ipmibt.C4
-rw-r--r--src/usr/ipmi/ipmidcmi.C2
-rw-r--r--src/usr/ipmi/ipmirp.C10
-rw-r--r--src/usr/ipmi/ipmisensor.C14
-rw-r--r--src/usr/ipmi/runtime/rt_ipmirp.C2
9 files changed, 28 insertions, 25 deletions
diff --git a/src/include/usr/ipmi/ipmi_reasoncodes.H b/src/include/usr/ipmi/ipmi_reasoncodes.H
index 01c5aaf7d..e0d01146f 100644
--- a/src/include/usr/ipmi/ipmi_reasoncodes.H
+++ b/src/include/usr/ipmi/ipmi_reasoncodes.H
@@ -36,6 +36,7 @@ namespace IPMI
MOD_IPMISENSOR = 0x03, // IPMI::sensor
MOD_IPMIDCMI = 0x04, // IPMI::sensor
MOD_IPMIRT = 0x05, // rt IPMI::send/IPMI::sendrecv
+ MOD_IPMISRV_POSTEVENT = 0x06, // IpmiRP::postEvent
};
enum IPMIReasonCode
diff --git a/src/usr/htmgt/htmgt_memthrottles.C b/src/usr/htmgt/htmgt_memthrottles.C
index 3684c71d7..2fd0e6cec 100644
--- a/src/usr/htmgt/htmgt_memthrottles.C
+++ b/src/usr/htmgt/htmgt_memthrottles.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2014 */
+/* Contributors Listed Below - COPYRIGHT 2014,2015 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -122,7 +122,7 @@ void memPowerThrottleOT(TargetHandleList & i_mbas,
{
throttleError = true;
- /**
+ /*@
* @errortype
* @reasoncode HTMGT_RC_OT_THROTTLE_INVALID_N
* @severity ERRL_SEV_UNRECOVERABLE
diff --git a/src/usr/hwpf/hwp/bus_training/pbusLinkSvc.C b/src/usr/hwpf/hwp/bus_training/pbusLinkSvc.C
index 9271dd401..c085a22f5 100644
--- a/src/usr/hwpf/hwp/bus_training/pbusLinkSvc.C
+++ b/src/usr/hwpf/hwp/bus_training/pbusLinkSvc.C
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2014 */
+/* Contributors Listed Below - COPYRIGHT 2012,2015 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -127,7 +129,7 @@ errlHndl_t PbusLinkSvc::collectPbusConections( TYPE i_busType )
TARGETING::get_huid(l_dstTgt));
// Mixed bus type connection
- /**
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid MOD_EDI_EI_IO_RUN_TRAINING
* @reasoncode RC_MIXED_PBUS_CONNECTION
@@ -157,7 +159,7 @@ errlHndl_t PbusLinkSvc::collectPbusConections( TYPE i_busType )
TARGETING::get_huid(l_dstTgt));
// connection of same chip
- /**
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid MOD_EDI_EI_IO_RUN_TRAINING
* @reasoncode RC_SAME_CHIP_PBUS_CONNECTION
@@ -230,7 +232,7 @@ errlHndl_t PbusLinkSvc::collectPbusConections( TYPE i_busType )
}
}
- /**
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid MOD_EDI_EI_IO_RUN_TRAINING
* @reasoncode RC_CONFLICT_PBUS_CONNECTION
diff --git a/src/usr/initservice/baseinitsvc/initservice.C b/src/usr/initservice/baseinitsvc/initservice.C
index cfa9f42d1..5fb305e11 100644
--- a/src/usr/initservice/baseinitsvc/initservice.C
+++ b/src/usr/initservice/baseinitsvc/initservice.C
@@ -805,15 +805,15 @@ void InitService::doShutdown(uint64_t i_status,
if (l_rc)
{
TRACFCOMP(g_trac_initsvc, "ERROR: flushing virtual memory");
- /*
+ /*@
* @errorlog tag
* @errortype ERRL_SEV_CRITICAL_SYS_TERM
* @moduleid BASE_INITSVC_MOD_ID
- * @reasoncode SHUTDOWN_FLUSH_FAILE D
+ * @reasoncode SHUTDOWN_FLUSH_FAILED
* @userdata1 returncode from mm_remove_pages()
* @userdata2 0
*
- * @defdesc Could not FLUSH virtual memory.
+ * @devdesc Could not FLUSH virtual memory.
*
*/
const bool hbSwError = true;
diff --git a/src/usr/ipmi/ipmibt.C b/src/usr/ipmi/ipmibt.C
index 42a26e024..2c6f3cbdd 100644
--- a/src/usr/ipmi/ipmibt.C
+++ b/src/usr/ipmi/ipmibt.C
@@ -258,7 +258,7 @@ namespace IPMI
// the original request will timeout.
IPMI_TRAC(ERR_MRK "msg_respond() i/o error (response) %d", rc);
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid IPMI::MOD_IPMISRV_REPLY
* @reasoncode IPMI::RC_INVALID_QRESPONSE
@@ -326,7 +326,7 @@ namespace IPMI
break;
}
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_INFORMATIONAL
* @moduleid IPMI::MOD_IPMISRV_REPLY
* @reasoncode IPMI::RC_READ_EVENT_FAILURE
diff --git a/src/usr/ipmi/ipmidcmi.C b/src/usr/ipmi/ipmidcmi.C
index c4e718b81..e3708fdf0 100644
--- a/src/usr/ipmi/ipmidcmi.C
+++ b/src/usr/ipmi/ipmidcmi.C
@@ -116,7 +116,7 @@ namespace SENSOR
{
TRACFCOMP(g_trac_ipmi,"bad completion code from BMC=0x%x",cc);
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid IPMI::MOD_IPMIDCMI
* @reasoncode IPMI::RC_DCMI_CMD_FAILED
diff --git a/src/usr/ipmi/ipmirp.C b/src/usr/ipmi/ipmirp.C
index 9a9b5060e..fb542bc03 100644
--- a/src/usr/ipmi/ipmirp.C
+++ b/src/usr/ipmi/ipmirp.C
@@ -368,9 +368,9 @@ void IpmiRP::postEvent(IPMI::oemSEL* i_event)
if (rc)
{
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
- * @moduleid IPMI::MOD_IPMISRV_SEND
+ * @moduleid IPMI::MOD_IPMISRV_POSTEVENT
* @reasoncode IPMI::RC_INVALID_SEND
* @userdata1 rc from msq_send()
* @devdesc msg_send() failed
@@ -378,7 +378,7 @@ void IpmiRP::postEvent(IPMI::oemSEL* i_event)
*/
errlHndl_t err =
new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
- IPMI::MOD_IPMISRV_SEND,
+ IPMI::MOD_IPMISRV_POSTEVENT,
IPMI::RC_INVALID_SEND,
rc,
0,
@@ -945,7 +945,7 @@ namespace IPMI
// Otherwise, lets make an errl out of our return code
else
{
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid IPMI::MOD_IPMISRV_SEND
* @reasoncode IPMI::RC_INVALID_SENDRECV
@@ -999,7 +999,7 @@ namespace IPMI
if (rc)
{
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid IPMI::MOD_IPMISRV_SEND
* @reasoncode IPMI::RC_INVALID_SEND
diff --git a/src/usr/ipmi/ipmisensor.C b/src/usr/ipmi/ipmisensor.C
index 1b3ebbd43..094231152 100644
--- a/src/usr/ipmi/ipmisensor.C
+++ b/src/usr/ipmi/ipmisensor.C
@@ -88,7 +88,7 @@ namespace SENSOR
{
case SENSOR::CC_SENSOR_READING_NOT_SETTABLE:
{
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid IPMI::MOD_IPMISENSOR
* @reasoncode IPMI::RC_SENSOR_NOT_SETTABLE
@@ -106,7 +106,7 @@ namespace SENSOR
case SENSOR::CC_EVENT_DATA_BYTES_NOT_SETTABLE:
{
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid IPMI::MOD_IPMISENSOR
* @reasoncode IPMI::RC_EVENT_DATA_NOT_SETTABLE
@@ -124,7 +124,7 @@ namespace SENSOR
case IPMI::CC_CMDSENSOR:
{
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid IPMI::MOD_IPMISENSOR
* @reasoncode IPMI::RC_INVALID_SENSOR_CMD
@@ -140,7 +140,7 @@ namespace SENSOR
case IPMI::CC_BADSENSOR:
{
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid IPMI::MOD_IPMISENSOR
* @reasoncode IPMI::RC_SENSOR_NOT_PRESENT
@@ -158,7 +158,7 @@ namespace SENSOR
{
// lump everything else into a general failure for
// now.
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid IPMI::MOD_IPMISENSOR
* @reasoncode IPMI::RC_SET_SENSOR_FAILURE
@@ -335,7 +335,7 @@ namespace SENSOR
// something happened log an error to indicate the request
// failed
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid IPMI::MOD_IPMISENSOR
* @reasoncode IPMI::RC_SENSOR_READING_NOT_AVAIL
@@ -420,7 +420,7 @@ namespace SENSOR
{
TRACFCOMP(g_trac_ipmi,"bad completion code from BMC=0x%x",cc);
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_INFORMATIONAL
* @moduleid IPMI::MOD_IPMISENSOR
* @reasoncode IPMI::RC_GET_SENSOR_TYPE_CMD_FAILED
diff --git a/src/usr/ipmi/runtime/rt_ipmirp.C b/src/usr/ipmi/runtime/rt_ipmirp.C
index 670cb31d4..f3bb8c714 100644
--- a/src/usr/ipmi/runtime/rt_ipmirp.C
+++ b/src/usr/ipmi/runtime/rt_ipmirp.C
@@ -111,7 +111,7 @@ namespace IPMI
"Failed sending ipmi msg (%x:%x) to bmc rc: %d. ",
i_cmd.first, i_cmd.second, rc);
- /* @errorlog tag
+ /*@
* @errortype ERRL_SEV_UNRECOVERABLE
* @moduleid IPMI::MOD_IPMIRT
* @reasoncode IPMI::RC_INVALID_SENDRECV
OpenPOWER on IntegriCloud