diff options
Diffstat (limited to 'src/usr/initservice')
7 files changed, 37 insertions, 14 deletions
diff --git a/src/usr/initservice/baseinitsvc/initservice.C b/src/usr/initservice/baseinitsvc/initservice.C index d06b36f6a..acd70bb42 100644 --- a/src/usr/initservice/baseinitsvc/initservice.C +++ b/src/usr/initservice/baseinitsvc/initservice.C @@ -1060,8 +1060,7 @@ bool InitService::unregisterShutdownEvent(msg_q_t i_msgQ) { for(EventRegistry_t::iterator r = iv_regMsgQ.begin(); - r != iv_regMsgQ.end(); - ++r) + r != iv_regMsgQ.end();) { // erase all instances if(r->msgQ == i_msgQ) @@ -1072,7 +1071,11 @@ bool InitService::unregisterShutdownEvent(msg_q_t i_msgQ) r->compID, r->msgQ, r->msgType, r->msgPriority); result = true; - iv_regMsgQ.erase(r); + r = iv_regMsgQ.erase(r); + } + else + { + ++r; } } } diff --git a/src/usr/initservice/bootconfig/bootconfig.C b/src/usr/initservice/bootconfig/bootconfig.C index 8e2bf266b..f4839eee7 100644 --- a/src/usr/initservice/bootconfig/bootconfig.C +++ b/src/usr/initservice/bootconfig/bootconfig.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015 */ +/* Contributors Listed Below - COPYRIGHT 2015,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -27,7 +27,6 @@ /******************************************************************************/ #include <lpc/lpcif.H> #include <devicefw/userif.H> -#include <config.h> #include <errl/errlentry.H> #include "bootconfig.H" diff --git a/src/usr/initservice/bootconfig/bootconfig_ast2400.C b/src/usr/initservice/bootconfig/bootconfig_ast2400.C index 87caa32a5..cd4916203 100644 --- a/src/usr/initservice/bootconfig/bootconfig_ast2400.C +++ b/src/usr/initservice/bootconfig/bootconfig_ast2400.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2018 */ +/* Contributors Listed Below - COPYRIGHT 2015,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -33,7 +33,6 @@ #include <trace/interface.H> #include <hwas/common/deconfigGard.H> #include <console/consoleif.H> -#include <config.h> #include <sio/sio.H> #include <devicefw/driverif.H> diff --git a/src/usr/initservice/bootconfig/bootconfigif.C b/src/usr/initservice/bootconfig/bootconfigif.C index 488a8f537..1d931d705 100644 --- a/src/usr/initservice/bootconfig/bootconfigif.C +++ b/src/usr/initservice/bootconfig/bootconfigif.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -27,12 +27,10 @@ /******************************************************************************/ #include <lpc/lpcif.H> #include <devicefw/userif.H> -#include <config.h> #include <errl/errlentry.H> #include <initservice/bootconfigif.H> #include "bootconfig.H" #include "bootconfig_ast2400.H" -#include <config.h> namespace INITSERVICE { diff --git a/src/usr/initservice/extinitsvc/extinitsvctasks.H b/src/usr/initservice/extinitsvc/extinitsvctasks.H index ef8fb76f0..70b88a0d4 100644 --- a/src/usr/initservice/extinitsvc/extinitsvctasks.H +++ b/src/usr/initservice/extinitsvc/extinitsvctasks.H @@ -276,7 +276,17 @@ const TaskInfo g_exttaskinfolist[] = { EXT_IMAGE, // Extended Module } }, - + /** + * @brief fapiwrap task, handles fapi wrapper for platform libraries + */ + { + "libfapiwrap.so" , // taskname + NULL, // no pointer to fn + { + INIT_TASK, // task type + EXT_IMAGE, // Extended Module + } + }, // @todo RTC:145354 Restore testprdf and testattn in p9 branch /** @@ -430,6 +440,18 @@ const TaskInfo g_exttaskinfolist[] = { }, #endif + /** + * @brief SMF module + */ + { + "libsmf.so", // taskname + NULL, // no pointer to fn + { + INIT_TASK, // task type + EXT_IMAGE, // Extended Module + } + }, + // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // NOTE: libistepdisp.so needs to always be last in this list!! // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C index 8f2d57298..4680bb82c 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.C +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C @@ -78,7 +78,6 @@ #include <ipmi/ipmiif.H> #endif -#include <config.h> #include <initservice/bootconfigif.H> #include <trace/trace.H> #include <util/utilmbox_scratch.H> @@ -94,6 +93,7 @@ #include <p9_perv_scom_addresses.H> // --------------------------- #include <initservice/extinitserviceif.H> +#include <kernel/terminate.H> namespace ISTEPS_TRACE @@ -2508,6 +2508,9 @@ errlHndl_t IStepDispatcher::sendProgressCode(bool i_needsLock) Util::writeScratchReg( SPLESS::MBOX_SCRATCH_REG5, l_scratch5.data32 ); + //--- Push the scratch reg into kernel to be added into TI area + termSetIstep(l_scratch5.data32); + #ifdef CONFIG_ISTEP_LPC_PORT80_DEBUG // Starting port 80h value for hostboot isteps. Each step started will // increase the value by one. diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.H b/src/usr/initservice/istepdispatcher/istepdispatcher.H index 558fc95d1..ea383c4c9 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.H +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2018 */ +/* Contributors Listed Below - COPYRIGHT 2011,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -44,7 +44,6 @@ #include <initservice/taskargs.H> #include <initservice/initsvcreasoncodes.H> #include <initservice/initsvcstructs.H> -#include <config.h> #include "../baseinitsvc/initservice.H" #include "splesscommon.H" #include "istep_mbox_msgs.H" |
