Update extended RC to 2 bytes

RTC: 148702

Change-Id: I4e0c7486333a17009061c52c42bb1c96367879ae
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29331
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>

4 files changed, 101 insertions, 99 deletions

diff --git a/src/occ_405/errl/errl.c b/src/occ_405/errl/errl.c
index 45c6c62..a309279 100755
--- a/src/occ_405/errl/errl.c
+++ b/src/occ_405/errl/errl.c
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/occ/errl/errl.c $                                         */
+/* $Source: src/occ_405/errl/errl.c $                                     */
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -278,7 +278,7 @@ uint8_t getOldestErrlID()
 errlHndl_t createErrl(
             const uint16_t i_modId,
             const uint8_t i_reasonCode,
-            const uint32_t i_extReasonCode,
+            const uint16_t i_extReasonCode,
             const ERRL_SEVERITY i_sev,
             const trace_descriptor_array_t* i_trace,
             const uint16_t i_traceSz,
@@ -317,7 +317,7 @@ errlHndl_t createErrl(
         // if its a call home error then set the sev to informational
         l_rc->iv_severity = (i_sev == ERRL_SEV_CALLHOME_DATA ? (uint8_t)ERRL_SEV_INFORMATIONAL : i_sev);
 
-        l_rc->iv_userData4 = i_extReasonCode;
+        l_rc->iv_extendedRC = i_extReasonCode;
 
         // save off user detail section version
         l_rc->iv_userDetails.iv_version = ERRL_USR_DTL_STRUCT_VERSION_1;
diff --git a/src/occ_405/errl/errl.h b/src/occ_405/errl/errl.h
index ec75aca..217dde2 100755
--- a/src/occ_405/errl/errl.h
+++ b/src/occ_405/errl/errl.h
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -244,7 +244,8 @@ struct ErrlEntry
         uint8_t word;
     } iv_actions;
     // Reserved for extended reason code for uniquely identifying error if needed
-    uint32_t            iv_userData4;
+    uint16_t            iv_reserved;
+    uint16_t            iv_extendedRC;
     // Log Callout Number
     uint8_t             iv_numCallouts;
     // Callouts
@@ -279,7 +280,7 @@ extern uint8_t      G_callslot[MAX_ERRL_CALL_HOME_SZ];
 errlHndl_t createErrl(
             const uint16_t i_modId,
             const uint8_t i_reasonCode,
-            const uint32_t i_extReasonCode,
+            const uint16_t i_extReasonCode,
             const ERRL_SEVERITY i_sev,
             const trace_descriptor_array_t* i_trace,
             const uint16_t i_traceSz,
diff --git a/src/occ_405/errl/test/parser.c b/src/occ_405/errl/test/parser.c
index d0ad9f0..d5aac62 100755
--- a/src/occ_405/errl/test/parser.c
+++ b/src/occ_405/errl/test/parser.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -178,7 +178,8 @@ struct ErrlUserDetails
     uint32_t    iv_userData1;           // User Data Word 1
     uint32_t    iv_userData2;           // User Data Word 2
     uint32_t    iv_userData3;           // User Data Word 3
-    uint32_t    iv_userData4;           // User Data Word 4
+    uint16_t    iv_reserved2;
+    uint16_t    iv_extendedRC;          // Extended RC
     uint16_t    iv_entrySize;           // Log Size
     uint16_t    iv_userDetailEntrySize; // User Details Size
 } __attribute__ ((__packed__));
diff --git a/src/occ_405/occ_service_codes.h b/src/occ_405/occ_service_codes.h
index c7699f5..e867cd9 100644
--- a/src/occ_405/occ_service_codes.h
+++ b/src/occ_405/occ_service_codes.h
@@ -117,96 +117,96 @@ enum occReasonCode
 // Extended reason codes
 enum occExtReasonCode
 {
-    OCC_NO_EXTENDED_RC                          = 0x00000000,
-
-    ERC_GENERIC_TIMEOUT                         = 0x00000001,
-    ERC_INVALID_INPUT_DATA                      = 0x00000002,
-    ERC_MMU_MAP_FAILURE                         = 0x00000003,
-    ERC_MMU_UNMAP_FAILURE                       = 0x00000004,
-    ERC_BCE_REQUEST_CREATE_FAILURE              = 0x00000005,
-    ERC_BCE_REQUEST_SCHEDULE_FAILURE            = 0x00000006,
-
-    ERC_RUNNING_SEM_PENDING_FAILURE             = 0x00000007,
-    ERC_RUNNING_SEM_POSTING_FAILURE             = 0x00000008,
-    ERC_WAKEUP_SEM_PENDING_FAILURE              = 0x00000009,
-    ERC_WAKEUP_SEM_POSTING_FAILURE              = 0x0000000a,
-    ERC_FINISHED_SEM_PENDING_FAILURE            = 0x0000000b,
-    ERC_FINISHED_SEM_POSTING_FAILURE            = 0x0000000c,
-    ERC_CALLER_SEM_POSTING_FAILURE              = 0x0000000d,
-    ERC_CREATE_SEM_FAILURE                      = 0x0000000e,
-
-    ERC_LOW_CORE_GPE_REQUEST_CREATE_FAILURE     = 0x0000000f,
-    ERC_HIGH_CORE_GPE_REQUEST_CREATE_FAILURE    = 0x00000010,
-
-    ERC_SSX_IRQ_SETUP_FAILURE                   = 0x00000012,
-    ERC_SSX_IRQ_HANDLER_SET_FAILURE             = 0x00000013,
-    ERC_PPC405_WD_SETUP_FAILURE                 = 0x00000014,
-    ERC_OCB_WD_SETUP_FAILURE                    = 0x00000015,
-    ERC_ARG_POINTER_FAILURE                     = 0x00000016,
-
-    ERC_PSS_GPIO_INIT_FAIL                      = 0x00000017,
-    ERC_PSS_COMPOSITE_MODE_FAIL                 = 0x00000019,
-
-    ERC_PROC_CONTROL_TASK_FAILURE               = 0x0000001a,
-
-    ERC_CENTAUR_PORE_FLEX_CREATE_FAILURE        = 0x00000021,
-    ERC_CENTAUR_PORE_FLEX_SCHEDULE_FAILURE      = 0x00000022,
-    ERC_CENTAUR_INTERNAL_FAILURE                = 0x00000023,
-
-    ERC_APSS_GPIO_OUT_OF_RANGE_FAILURE          = 0x00000024,
-    ERC_APSS_GPIO_DUPLICATED_FAILURE            = 0x00000025,
-    ERC_APSS_ADC_OUT_OF_RANGE_FAILURE           = 0x00000026,
-    ERC_APSS_ADC_DUPLICATED_FAILURE             = 0x00000027,
-
-    ERC_STATE_FROM_OBS_TO_STB_FAILURE           = 0x00000028,
-    ERC_STATE_FROM_STB_TO_OBS_FAILURE           = 0x00000029,
-    ERC_STATE_HEARTBEAT_CFG_FAILURE             = 0x00000080,
-
-    ERC_AMEC_PCAPS_MISMATCH_FAILURE             = 0x0000002A,
-    ERC_AMEC_UNDER_PCAP_FAILURE                 = 0x0000002B,
-
-    ERC_AMEC_SLAVE_OVS_STATE                    = 0x0000002D,
-    ERC_AMEC_SLAVE_POWERCAP                     = 0x0000002E,
-
-    ERC_AMEC_PROC_ERROR_OVER_TEMPERATURE        = 0x0000002F,
-
-    ERC_APLT_INIT_FAILURE                       = 0x00000030,
-    ERC_APLT_START_VERSION_MISMATCH             = 0x00000031,
-    ERC_APLT_START_CHECKSUM_MISMATCH            = 0x00000032,
-
-    ERC_CMDH_MBOX_REQST_FAILURE                 = 0x00000040,
-    ERC_CMDH_INTERNAL_FAILURE                   = 0x00000041,
-    ERC_CMDH_THRM_DATA_MISSING                  = 0x00000042,
-    ERC_CMDH_IPS_DATA_MISSING                   = 0x00000043,
-    ERC_CMDH_INVALID_ATTN_DATA                  = 0x00000044,
-
-    ERC_CHIP_IDS_INVALID                        = 0x00000050,
-    ERC_GETSCOM_FAILURE                         = 0x00000051,
-    ERC_GETSCOM_TPC_GP0_FAILURE                 = 0x00000052,
-    ERC_PNOR_OWNERSHIP_NOT_AVAILABLE            = 0x00000053,
-
-    ERC_HOMER_MAIN_ACCESS_ERROR                 = 0x00000060,
-    ERC_HOMER_MAIN_SSX_ERROR                    = 0x00000061,
-
-    ERC_APSS_SCHEDULE_FAILURE                   = 0x00000062,
-    ERC_APSS_COMPLETE_FAILURE                   = 0x00000063,
-
-    ERC_PROC_CONTROL_INIT_FAILURE               = 0x00000064,
-    ERC_PROC_PSTATE_INSTALL_FAILURE             = 0x00000065,
-    ERC_PROC_CORE_DATA_EMPATH_ERROR             = 0x00000066,
-
-    ERC_BCE_REQ_CREATE_READ_FAILURE             = 0x00000070,
-    ERC_BCE_REQ_SCHED_READ_FAILURE              = 0x00000071,
-    ERC_BCE_REQ_CREATE_INPROG_FAILURE           = 0x00000072,
-    ERC_BCE_REQ_SCHED_INPROG_FAILURE            = 0x00000073,
-    ERC_BCE_REQ_CREATE_WRITE_FAILURE            = 0x00000074,
-    ERC_BCE_REQ_SCHED_WRITE_FAILURE             = 0x00000075,
-
-    ERC_DIMM_SCHEDULE_FAILURE                   = 0x00000080,
-    ERC_DIMM_COMPLETE_FAILURE                   = 0x00000081,
-
-    ERC_MEM_CONTROL_SCHEDULE_FAILURE            = 0x00000080,
-    ERC_MEM_CONTROL_COMPLETE_FAILURE            = 0x00000081,
+    OCC_NO_EXTENDED_RC                          = 0x0000,
+
+    ERC_GENERIC_TIMEOUT                         = 0x0001,
+    ERC_INVALID_INPUT_DATA                      = 0x0002,
+    ERC_MMU_MAP_FAILURE                         = 0x0003,
+    ERC_MMU_UNMAP_FAILURE                       = 0x0004,
+    ERC_BCE_REQUEST_CREATE_FAILURE              = 0x0005,
+    ERC_BCE_REQUEST_SCHEDULE_FAILURE            = 0x0006,
+
+    ERC_RUNNING_SEM_PENDING_FAILURE             = 0x0007,
+    ERC_RUNNING_SEM_POSTING_FAILURE             = 0x0008,
+    ERC_WAKEUP_SEM_PENDING_FAILURE              = 0x0009,
+    ERC_WAKEUP_SEM_POSTING_FAILURE              = 0x000a,
+    ERC_FINISHED_SEM_PENDING_FAILURE            = 0x000b,
+    ERC_FINISHED_SEM_POSTING_FAILURE            = 0x000c,
+    ERC_CALLER_SEM_POSTING_FAILURE              = 0x000d,
+    ERC_CREATE_SEM_FAILURE                      = 0x000e,
+
+    ERC_LOW_CORE_GPE_REQUEST_CREATE_FAILURE     = 0x000f,
+    ERC_HIGH_CORE_GPE_REQUEST_CREATE_FAILURE    = 0x0010,
+
+    ERC_SSX_IRQ_SETUP_FAILURE                   = 0x0012,
+    ERC_SSX_IRQ_HANDLER_SET_FAILURE             = 0x0013,
+    ERC_PPC405_WD_SETUP_FAILURE                 = 0x0014,
+    ERC_OCB_WD_SETUP_FAILURE                    = 0x0015,
+    ERC_ARG_POINTER_FAILURE                     = 0x0016,
+
+    ERC_PSS_GPIO_INIT_FAIL                      = 0x0017,
+    ERC_PSS_COMPOSITE_MODE_FAIL                 = 0x0019,
+
+    ERC_PROC_CONTROL_TASK_FAILURE               = 0x001a,
+
+    ERC_CENTAUR_PORE_FLEX_CREATE_FAILURE        = 0x0021,
+    ERC_CENTAUR_PORE_FLEX_SCHEDULE_FAILURE      = 0x0022,
+    ERC_CENTAUR_INTERNAL_FAILURE                = 0x0023,
+
+    ERC_APSS_GPIO_OUT_OF_RANGE_FAILURE          = 0x0024,
+    ERC_APSS_GPIO_DUPLICATED_FAILURE            = 0x0025,
+    ERC_APSS_ADC_OUT_OF_RANGE_FAILURE           = 0x0026,
+    ERC_APSS_ADC_DUPLICATED_FAILURE             = 0x0027,
+
+    ERC_STATE_FROM_OBS_TO_STB_FAILURE           = 0x0028,
+    ERC_STATE_FROM_STB_TO_OBS_FAILURE           = 0x0029,
+    ERC_STATE_HEARTBEAT_CFG_FAILURE             = 0x0080,
+
+    ERC_AMEC_PCAPS_MISMATCH_FAILURE             = 0x002A,
+    ERC_AMEC_UNDER_PCAP_FAILURE                 = 0x002B,
+
+    ERC_AMEC_SLAVE_OVS_STATE                    = 0x002D,
+    ERC_AMEC_SLAVE_POWERCAP                     = 0x002E,
+
+    ERC_AMEC_PROC_ERROR_OVER_TEMPERATURE        = 0x002F,
+
+    ERC_APLT_INIT_FAILURE                       = 0x0030,
+    ERC_APLT_START_VERSION_MISMATCH             = 0x0031,
+    ERC_APLT_START_CHECKSUM_MISMATCH            = 0x0032,
+
+    ERC_CMDH_MBOX_REQST_FAILURE                 = 0x0040,
+    ERC_CMDH_INTERNAL_FAILURE                   = 0x0041,
+    ERC_CMDH_THRM_DATA_MISSING                  = 0x0042,
+    ERC_CMDH_IPS_DATA_MISSING                   = 0x0043,
+    ERC_CMDH_INVALID_ATTN_DATA                  = 0x0044,
+
+    ERC_CHIP_IDS_INVALID                        = 0x0050,
+    ERC_GETSCOM_FAILURE                         = 0x0051,
+    ERC_GETSCOM_TPC_GP0_FAILURE                 = 0x0052,
+    ERC_PNOR_OWNERSHIP_NOT_AVAILABLE            = 0x0053,
+
+    ERC_HOMER_MAIN_ACCESS_ERROR                 = 0x0060,
+    ERC_HOMER_MAIN_SSX_ERROR                    = 0x0061,
+
+    ERC_APSS_SCHEDULE_FAILURE                   = 0x0062,
+    ERC_APSS_COMPLETE_FAILURE                   = 0x0063,
+
+    ERC_PROC_CONTROL_INIT_FAILURE               = 0x0064,
+    ERC_PROC_PSTATE_INSTALL_FAILURE             = 0x0065,
+    ERC_PROC_CORE_DATA_EMPATH_ERROR             = 0x0066,
+
+    ERC_BCE_REQ_CREATE_READ_FAILURE             = 0x0070,
+    ERC_BCE_REQ_SCHED_READ_FAILURE              = 0x0071,
+    ERC_BCE_REQ_CREATE_INPROG_FAILURE           = 0x0072,
+    ERC_BCE_REQ_SCHED_INPROG_FAILURE            = 0x0073,
+    ERC_BCE_REQ_CREATE_WRITE_FAILURE            = 0x0074,
+    ERC_BCE_REQ_SCHED_WRITE_FAILURE             = 0x0075,
+
+    ERC_DIMM_SCHEDULE_FAILURE                   = 0x0080,
+    ERC_DIMM_COMPLETE_FAILURE                   = 0x0081,
+
+    ERC_MEM_CONTROL_SCHEDULE_FAILURE            = 0x0080,
+    ERC_MEM_CONTROL_COMPLETE_FAILURE            = 0x0081,
 };
 
 // Error log Module Ids