Increment reboot count when gard records are written

Change-Id: Iaf9a4d4be19877e564ca1871564467441b472253
CQ:SW347568
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23186
Reviewed-by: A. P. Williams III <iawillia@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Jenkins OP Build CI
Tested-by: Jenkins OP HW
Tested-by: FSP CI Jenkins
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24340

2 files changed, 35 insertions, 1 deletions

diff --git a/src/include/usr/errl/errlmanager.H b/src/include/usr/errl/errlmanager.H
index 7112a85eb..1fbc7aa9d 100644
--- a/src/include/usr/errl/errlmanager.H
+++ b/src/include/usr/errl/errlmanager.H
@@ -176,6 +176,18 @@ public:
      static void errlAckErrorlog(uint32_t i_eid);
 
      /**
+      * @brief Calls flush error logs
+      *
+      * This is called by doIstep after every istep to ensure that the error
+      * logs have been cleared out before checking if a reconfigure loop
+      * is needed
+      *
+      * It is a static function because a module cannot call an interface on a
+      * singleton in another module
+      */
+      static void callFlushErrorLogs();
+
+     /**
       * @brief  Returns the HWAS ProcessCallout function pointer
       *
       * This is called by ErrlEntry::commit to get the HWAS ProcessCallout
@@ -242,6 +254,7 @@ private:
         ERRLOG_ACCESS_TARG_TYPE            = 0x00000036 | MBOX::FIRST_SECURE_MSG,
         ERRLOG_ACCESS_ERRLDISP_TYPE        = 0x00000037 | MBOX::FIRST_SECURE_MSG,
         ERRLOG_ACCESS_IPMI_TYPE            = 0x00000038 | MBOX::FIRST_SECURE_MSG,
+        ERRLOG_FLUSH_TYPE                  = 0x00000039 | MBOX::FIRST_SECURE_MSG,
     };
 
     /**
@@ -281,6 +294,15 @@ private:
      void sendResourcesMsg(errlManagerNeeds i_needs);
 
      /**
+      * @brief Flushes out the error log queue before calling to process
+      * deferred deconfigs
+      *
+      * called by static callFlushErrorLogs function.
+      */
+
+     void flushErrorLogs();
+
+     /**
       * @brief Sends msg to errlmanager telling which errlog to ack
       *
       * called by static errlAckErrorlog function.
diff --git a/src/include/usr/initservice/istepdispatcherif.H b/src/include/usr/initservice/istepdispatcherif.H
index bbec9480b..69cebf0a8 100644
--- a/src/include/usr/initservice/istepdispatcherif.H
+++ b/src/include/usr/initservice/istepdispatcherif.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -79,6 +79,18 @@ bool isShutdownRequested ( void );
  */
 void setAcceptIstepMessages ( bool i_accept );
 
+/**
+ * @brief This function will set a member class variable to state new gard
+ * records have been committed on this boot attempt.
+ *
+ * Gard records being created are an indication of forward progress.  Therefore
+ * if a gard record has been created we can issue a reboot that does not count
+ * towards the reboot count limit.
+ *
+ * @return None.
+ */
+void setNewGardRecord ( void );
+
 }
 
 #endif