Replace Firmware Level with FClip History in error log

-Throttle noisy traces
-Add slave clip history to Call Home log

Change-Id: If498c4c5b7e445d7b1b43fb16a2790f11166e430
CMVC-Prereq: 1045167
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53578
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>

3 files changed, 11 insertions, 11 deletions

diff --git a/src/occ_405/errl/errl.c b/src/occ_405/errl/errl.c
index 0ceab4e..d93f71c 100755
--- a/src/occ_405/errl/errl.c
+++ b/src/occ_405/errl/errl.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -33,6 +33,7 @@
 #include <common.h>
 #include <ocb_firmware_registers.h>
 #include <ocb_register_addresses.h>
+#include <amec_sys.h>
 
 uint32_t    G_occErrSlotBits = 0x000000000;
 uint8_t     G_occErrIdCounter= 0x00;
@@ -67,7 +68,6 @@ uint8_t G_error_history[ERR_HISTORY_SIZE] = {0};
 extern uint8_t G_occ_interrupt_type;
 extern bool G_fir_collection_required;
 
-
 // Function Specification
 //
 // Name:  getErrSlotNumAndErrId
@@ -305,12 +305,12 @@ errlHndl_t createErrl(
         // save off default size
         l_rc->iv_userDetails.iv_entrySize = sizeof( ErrlEntry_t );
 
-        // add trace
-        addTraceToErrl( i_trace, i_traceSz,  l_rc );
-
         // add error history
         addErrHistory( l_rc );
 
+        // add trace
+        addTraceToErrl( i_trace, i_traceSz,  l_rc );
+
         // save off entry Id
         l_rc->iv_entryId = l_id;
 
@@ -338,7 +338,7 @@ errlHndl_t createErrl(
         l_rc->iv_numCallouts = 0;
 
         // save off occ fields
-        l_rc->iv_userDetails.iv_fwLevel = 0;
+        l_rc->iv_userDetails.iv_fclipHistory = g_amec->proc[0].chip_f_reason_history;
         l_rc->iv_userDetails.iv_occId = G_pbax_id.chip_id;
         l_rc->iv_userDetails.iv_occRole = G_occ_role;
         l_rc->iv_userDetails.iv_operatingState = CURRENT_STATE();
diff --git a/src/occ_405/errl/errl.h b/src/occ_405/errl/errl.h
index 042841e..18bc791 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,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -200,7 +200,7 @@ struct ErrlUserDetails
     uint8_t     iv_version;             // User Details Version
     uint8_t     iv_reserved;            // Reserved
     uint16_t    iv_modId;               // Module Id
-    uint32_t    iv_fwLevel;             // Firmware Level
+    uint32_t    iv_fclipHistory;        // Frequency Clip History
     uint64_t    iv_timeStamp;           // Time Stamp
     uint8_t     iv_occId;               // OCC ID
     uint8_t     iv_occRole;             // OCC Role
diff --git a/src/occ_405/errl/test/parser.c b/src/occ_405/errl/test/parser.c
index d5aac62..1b00468 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,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -168,7 +168,7 @@ struct ErrlUserDetails
     uint8_t     iv_version;             // User Details Version
     uint8_t     iv_reserved;            // Reserved
     uint16_t    iv_modId;               // Module Id
-    uint32_t    iv_fwLevel;             // Firmware Level
+    uint32_t    iv_fclipHistory;        // Frequency Clip History
     uint64_t    iv_timeStamp;           // Time Stamp
     uint8_t     iv_occId;               // OCC ID
     uint8_t     iv_occRole;             // OCC Role
@@ -251,7 +251,7 @@ main()
     printf(" UserDetails    : \n" );
     printf(" Version        : 0x%02X \n", l_log.iv_userDetails.iv_version );
     printf(" Module Id      : 0x%04X \n", ntohs(l_log.iv_userDetails.iv_modId) );
-    printf(" Firmware Level : 0x%08X \n", l_log.iv_userDetails.iv_fwLevel );
+    printf(" FClip History  : 0x%08X \n", l_log.iv_userDetails.iv_fclipHistory );
     printf(" Time           : 0x%08X \n", l_log.iv_userDetails.iv_timeStamp );
     printf(" OCC ID         : 0x%02X \n", l_log.iv_userDetails.iv_occId );
     printf(" OCC Role       : 0x%02X \n", l_log.iv_userDetails.iv_occRole );