Ensure ipmiSel thread finishes before shutting down ipmidd

Change-Id: I07a5ea99e5e5c5672bf889689b25551b9c95b0ff
CQ:SW328077
ForwardPort:yes
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21876
Tested-by: Jenkins Server
Tested-by: Jenkins OP Build CI
Tested-by: Jenkins OP HW
Reviewed-by: A. P. Williams III <iawillia@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22151
Tested-by: FSP CI Jenkins
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>

2 files changed, 39 insertions, 20 deletions

diff --git a/src/usr/ipmi/ipmirp.C b/src/usr/ipmi/ipmirp.C
index fb542bc03..3c650d12e 100644
--- a/src/usr/ipmi/ipmirp.C
+++ b/src/usr/ipmi/ipmirp.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -32,6 +32,7 @@
 #include "ipmidd.H"
 #include <ipmi/ipmi_reasoncodes.H>
 #include <ipmi/ipmiif.H>
+#include <ipmi/ipmisel.H>
 #include <devicefw/driverif.H>
 #include <devicefw/userif.H>
 
@@ -630,10 +631,33 @@ void IpmiRP::execute(void)
             // we wait for the reply from the BMC.
         case IPMI::MSG_STATE_SHUTDOWN:
             {
-                IPMI_TRAC(INFO_MRK "MSG_STATE_SHUTDOWN: ipmi begin shutdown");
-                l_shutdown_pending = true;    // Stop incoming new messages
+                // Poke the IPMI sel task to flush out any messages.
+                // This must be done before we shut down the device driver.
+                IPMI_TRAC(INFO_MRK "Sending shutdown to sel task");
+                Singleton<IpmiSEL>::instance();
+                msg_t *rmsg = msg_allocate();
+                rmsg->type = IPMISEL::MSG_STATE_SHUTDOWN_SEL;
+                msg_q_t mq = Singleton<IpmiSEL>::instance().msgQueue();
+
+                //Send the msg to the sel thread
+                int rc = msg_sendrecv_noblk(mq,rmsg,iv_msgQ);
+                if(rc)
+                {
+                    IPMI_TRAC(ERR_MRK "Failed (rc=%d) to send ipmiSEL flush "
+                        "message. We may have lost a sel.",rc);
+                }
+
                 iv_shutdown_msg = msg;        // Reply to this message
+                break;
+            }
 
+        case IPMI::MSG_STATE_SHUTDOWN_SEL:
+            {
+                // The sel thread has responsed to us, so it must be flushed.
+                // We can now shutdown
+                IPMI_TRAC(INFO_MRK "MSG_SHUTDOWN_FROM_SEL: "
+                    "ipmi begin shutdown");
+                l_shutdown_pending = true;    // Stop incoming new messages
                 break;
             }
 
diff --git a/src/usr/ipmi/ipmisel.C b/src/usr/ipmi/ipmisel.C
index 02eb00fe3..5d2d6afce 100644
--- a/src/usr/ipmi/ipmisel.C
+++ b/src/usr/ipmi/ipmisel.C
@@ -33,6 +33,7 @@
 #include "ipmiconfig.H"
 #include <ipmi/ipmi_reasoncodes.H>
 #include <ipmi/ipmisensor.H>
+#include <ipmi/ipmiif.H>
 
 #include <sys/task.h>
 #include <initservice/taskargs.H>
@@ -477,9 +478,7 @@ IpmiSEL::IpmiSEL(void)
     :iv_msgQ(msg_q_create())
 {
     IPMI_TRAC(ENTER_MRK "IpmiSEL ctor");
-    barrier_init(&iv_sync_start, 2);
-    task_create(&IpmiSEL::start, this);
-    barrier_wait(&iv_sync_start);
+    task_create(&IpmiSEL::start,NULL);
 }
 
 /**
@@ -490,9 +489,9 @@ IpmiSEL::~IpmiSEL(void)
     msg_q_destroy(iv_msgQ);
 }
 
-void* IpmiSEL::start(void* instance)
+void* IpmiSEL::start(void* unused)
 {
-    static_cast<IpmiSEL*>(instance)->execute();
+    Singleton<IpmiSEL>::instance().execute();
     return NULL;
 }
 
@@ -505,18 +504,6 @@ void IpmiSEL::execute(void)
     //Mark as an independent daemon so if it crashes we terminate.
     task_detach();
 
-    // Register shutdown events with init service.
-    //      Done at the "end" of shutdown processesing.
-    //      This will flush out any IPMI messages which were sent as
-    //      part of the shutdown processing. We chose MBOX priority
-    //      as we don't want to accidentally get this message after
-    //      interrupt processing has stopped in case we need intr to
-    //      finish flushing the pipe.
-    INITSERVICE::registerShutdownEvent(iv_msgQ, IPMISEL::MSG_STATE_SHUTDOWN,
-                                       INITSERVICE::MBOX_PRIORITY);
-
-    barrier_wait(&iv_sync_start);
-
     while(true)
     {
         msg_t* msg = msg_wait(iv_msgQ);
@@ -544,6 +531,14 @@ void IpmiSEL::execute(void)
                 //Respond that we are done shutting down.
                 msg_respond(iv_msgQ, msg);
                 break;
+
+            case IPMISEL::MSG_STATE_SHUTDOWN_SEL:
+                IPMI_TRAC(INFO_MRK "ipmisel "
+                   "shutdown message from ipmirp");
+                 msg->type = IPMI::MSG_STATE_SHUTDOWN_SEL;
+                //Respond that we are done shutting down.
+                msg_respond(iv_msgQ, msg);
+                break;
         }
     } // while(1)
     IPMI_TRAC(EXIT_MRK "message loop");