diff options
| author | Matt Ploetz <maploetz@us.ibm.com> | 2016-03-09 16:23:20 -0600 |
|---|---|---|
| committer | Stephen Cprek <smcprek@us.ibm.com> | 2016-03-17 17:07:14 -0500 |
| commit | e5c9bc91a7fa14246324cdc7a201077d1f43a72b (patch) | |
| tree | 3548e28b764dcf66b4c6b3941d1c4c4c28956a69 /src/include/usr/ipmi | |
| parent | de3efadea3db1139d6120058b4bc928f8365e23d (diff) | |
| download | blackbird-hostboot-e5c9bc91a7fa14246324cdc7a201077d1f43a72b.tar.gz blackbird-hostboot-e5c9bc91a7fa14246324cdc7a201077d1f43a72b.zip | |
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>
Diffstat (limited to 'src/include/usr/ipmi')
| -rw-r--r-- | src/include/usr/ipmi/ipmiif.H | 4 | ||||
| -rw-r--r-- | src/include/usr/ipmi/ipmisel.H | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/include/usr/ipmi/ipmiif.H b/src/include/usr/ipmi/ipmiif.H index fa13c3227..a62f722d3 100644 --- a/src/include/usr/ipmi/ipmiif.H +++ b/src/include/usr/ipmi/ipmiif.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -50,6 +50,8 @@ namespace IPMI MSG_STATE_SHUTDOWN, + MSG_STATE_SHUTDOWN_SEL, + MSG_STATE_GRACEFUL_SHUTDOWN, // Used to check range. Leave as last. diff --git a/src/include/usr/ipmi/ipmisel.H b/src/include/usr/ipmi/ipmisel.H index 3ffa34e4a..4509130f4 100644 --- a/src/include/usr/ipmi/ipmisel.H +++ b/src/include/usr/ipmi/ipmisel.H @@ -34,7 +34,6 @@ #include <stdint.h> #include <builtins.h> #include <ipmi/ipmiif.H> -#include <sys/sync.h> /** @@ -47,7 +46,8 @@ namespace IPMISEL { MSG_SEND_ESEL, MSG_STATE_SHUTDOWN, - MSG_LAST_TYPE = MSG_STATE_SHUTDOWN, + MSG_STATE_SHUTDOWN_SEL, + MSG_LAST_TYPE = MSG_STATE_SHUTDOWN_SEL, }; typedef struct sel_info @@ -321,9 +321,9 @@ class IpmiSEL /** * Thread start routine for the resource provider - * @param[in] void* instance - 'this' instance to start. + * @param[in] void*, unused */ - static void* start(void* instance); + static void* start(void* unused); /** * Default constructor @@ -350,7 +350,6 @@ class IpmiSEL void execute(void); msg_q_t iv_msgQ; //!< ipmi message queue - barrier_t iv_sync_start; //Disallow copying of this class. IpmiSEL& operator=(const IpmiSEL&); |
