summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbroyles <mbroyles@us.ibm.com>2018-01-02 15:44:57 -0600
committerMartha Broyles <mbroyles@us.ibm.com>2018-01-05 10:45:08 -0500
commitc358181383374e84976982ac8d650db358a32c08 (patch)
tree1a0bca7114c03491788b00cc87931864625b765a
parent4d2912987d234b0d77b69f0fd2bee8a8d71e1613 (diff)
downloadtalos-occ-c358181383374e84976982ac8d650db358a32c08.tar.gz
talos-occ-c358181383374e84976982ac8d650db358a32c08.zip
OCC error log clean up
Change-Id: Id7b66bab383d69017469aced62ec23bb7f7faaef RTC: 133939 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/51369 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com> Reviewed-by: Andres A. Lugo-Reyes <aalugore@us.ibm.com> Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
-rwxr-xr-xsrc/occ_405/amec/amec_master_smh.c6
-rwxr-xr-xsrc/occ_405/dcom/dcom.c2
-rwxr-xr-xsrc/occ_405/lock/lock.c16
-rw-r--r--src/occ_405/occ_service_codes.h10
-rwxr-xr-xsrc/occ_405/occ_sys_config.h3
-rw-r--r--src/occ_405/wof/wof.c12
6 files changed, 28 insertions, 21 deletions
diff --git a/src/occ_405/amec/amec_master_smh.c b/src/occ_405/amec/amec_master_smh.c
index 74559c6..586a465 100755
--- a/src/occ_405/amec/amec_master_smh.c
+++ b/src/occ_405/amec/amec_master_smh.c
@@ -358,12 +358,6 @@ void amec_mst_check_pcaps_match(void)
ERRL_CALLOUT_TYPE_HUID,
G_sysConfigData.apss_huid,
ERRL_CALLOUT_PRIORITY_HIGH);
-
- //Callout to DPSS
- addCalloutToErrl(l_err,
- ERRL_CALLOUT_TYPE_HUID,
- G_sysConfigData.dpss_huid,
- ERRL_CALLOUT_PRIORITY_HIGH);
//Reset OCC
REQUEST_RESET(l_err);
}
diff --git a/src/occ_405/dcom/dcom.c b/src/occ_405/dcom/dcom.c
index abd442f..26565fb 100755
--- a/src/occ_405/dcom/dcom.c
+++ b/src/occ_405/dcom/dcom.c
@@ -148,7 +148,7 @@ void dcom_initialize_roles(void)
* @userdata1 PBAXCFG (upper)
* @userdata2 PBAXCFG (lower)
* @userdata4 ERC_CHIP_IDS_INVALID
- * @devdesc Failure determining OCC role
+ * @devdesc Failure to determine OCC chip ID
*/
errlHndl_t l_errl = createErrl(
DCOM_MID_INIT_ROLES, //ModId
diff --git a/src/occ_405/lock/lock.c b/src/occ_405/lock/lock.c
index 2716b01..e84217a 100755
--- a/src/occ_405/lock/lock.c
+++ b/src/occ_405/lock/lock.c
@@ -47,6 +47,7 @@
#include "common.h"
#include "state.h"
#include "i2c.h"
+#include <amec_sys.h>
extern bool G_mem_monitoring_allowed;
@@ -318,7 +319,7 @@ bool check_and_update_i2c_lock(const uint8_t i_engine)
* @reasoncode OCI_WRITE_FAILURE
* @userdata1 I2C engine number
* @userdata2 OCC Flags register
- * @devdesc Invalid memory type detected
+ * @devdesc OCI write failure setting I2C ownership bit
*/
errlHndl_t err = createErrl(I2C_LOCK_UPDATE,
OCI_WRITE_FAILURE,
@@ -328,6 +329,19 @@ bool check_and_update_i2c_lock(const uint8_t i_engine)
DEFAULT_TRACE_SIZE,
i_engine,
verify_occflags.value);
+
+ //Callout firmware
+ addCalloutToErrl(err,
+ ERRL_CALLOUT_TYPE_COMPONENT_ID,
+ ERRL_COMPONENT_ID_FIRMWARE,
+ ERRL_CALLOUT_PRIORITY_MED);
+
+ //Callout processor
+ addCalloutToErrl(err,
+ ERRL_CALLOUT_TYPE_HUID,
+ G_sysConfigData.proc_huid,
+ ERRL_CALLOUT_PRIORITY_LOW);
+
REQUEST_RESET(err);
occ_owns_lock = false;
break;
diff --git a/src/occ_405/occ_service_codes.h b/src/occ_405/occ_service_codes.h
index f357c88..1c00381 100644
--- a/src/occ_405/occ_service_codes.h
+++ b/src/occ_405/occ_service_codes.h
@@ -43,8 +43,6 @@ enum occReasonCode
OVERSUB_ALERT = 0x05,
/// Failure to maintain a hard power cap
POWER_CAP_FAILURE = 0x06,
- /// Fans are in full speed
- FAN_FULL_SPEED = 0x08,
/// Timed out reading a FRU temperature
FRU_TEMP_TIMEOUT = 0x09,
/// Processor reached error threshold
@@ -59,8 +57,6 @@ enum occReasonCode
SSX_GENERIC_FAILURE = 0x17,
/// Failure to handshake with an external fw entity (HB, FSP, PHYP, etc)
EXTERNAL_INTERFACE_FAILURE = 0x18,
- /// Incorrect number of active quads reported
- INVALID_ACTIVE_QUAD_COUNT = 0x19,
/// VRM Vdd reached error temperature threshold
VRM_VDD_ERROR_TEMP = 0x20,
/// VR_FAN - AVS Bus over-temperature reported
@@ -106,8 +102,6 @@ enum occReasonCode
OCC_SYSTEM_HALTED = 0xB5,
/// Reset PBA Queue due to PBAX Read Failure
PBAX_QUEUE_RESET = 0xBA,
- /// PBAX failure sending doorbell to slaves
- PBAX_ERROR = 0xBB,
/// Request to read APSS data failed.
APSS_GPE_FAILURE = 0xC0,
/// AVS Bus output over-current reported
@@ -120,8 +114,6 @@ enum occReasonCode
APSS_HARD_FAILURE = 0xC5,
/// Request to read redundant APSS data failed
REDUNDANT_APSS_GPE_FAILURE = 0xCB,
- /// Request to read DIMM data failed.
- DIMM_GPE_FAILURE = 0xD0,
MEMORY_INIT_FAILED = 0xD1,
DIMM_INVALID_STATE = 0xD2,
@@ -135,9 +127,7 @@ enum occReasonCode
GPE_REQUEST_TASK_NOT_IDLE = 0xD7,
GPE_REQUEST_RC_FAILURE = 0xD8,
- WOF_VFRT_REQ_FAILURE = 0xD9,
WOF_DISABLED_RC = 0xDA,
- WOF_VFRT_ALIGNMENT_ERROR = 0xDB,
INVALID_MAGIC_NUMBER = 0xDC,
INVALID_FREQUENCY = 0xDE,
WOF_RE_ENABLED = 0xDF,
diff --git a/src/occ_405/occ_sys_config.h b/src/occ_405/occ_sys_config.h
index a00157e..1aea0fd 100755
--- a/src/occ_405/occ_sys_config.h
+++ b/src/occ_405/occ_sys_config.h
@@ -345,9 +345,6 @@ typedef struct
// APSS HUID - Used by OCC for APSS error call out
uint32_t apss_huid;
- // DPSS HUID - Used by OCC for DPSS error call out
- uint32_t dpss_huid;
-
// VRM Vdd HUID - Used by OCC for VRM Vdd error call out
uint32_t vrm_vdd_huid;
diff --git a/src/occ_405/wof/wof.c b/src/occ_405/wof/wof.c
index ff72d5f..f6d1050 100644
--- a/src/occ_405/wof/wof.c
+++ b/src/occ_405/wof/wof.c
@@ -1430,6 +1430,18 @@ void set_clear_wof_disabled( uint8_t i_action,
{
if(i_bit_mask & ~(IGNORE_WOF_RESET) )
{
+ //Callout firmware
+ addCalloutToErrl(l_errl,
+ ERRL_CALLOUT_TYPE_COMPONENT_ID,
+ ERRL_COMPONENT_ID_FIRMWARE,
+ ERRL_CALLOUT_PRIORITY_HIGH);
+
+ //Callout processor
+ addCalloutToErrl(l_errl,
+ ERRL_CALLOUT_TYPE_HUID,
+ G_sysConfigData.proc_huid,
+ ERRL_CALLOUT_PRIORITY_MED);
+
REQUEST_WOF_RESET( l_errl );
}
}
OpenPOWER on IntegriCloud