summaryrefslogtreecommitdiffstats
path: root/src/usr/mbox
diff options
context:
space:
mode:
authorSWATHI M. BHATTIPROLU <bhmadhur@in.ibm.com>2018-04-09 01:12:37 -0400
committerDaniel M. Crowell <dcrowell@us.ibm.com>2018-04-09 09:41:07 -0400
commit52d15635dfc7a71cfc27dede57466c08a68b2e95 (patch)
treee95b5b69202be9182061c135f55aab8aebb9878d /src/usr/mbox
parentdb62cb5a72b80231b605ff13850bde4fb26e3786 (diff)
downloadblackbird-hostboot-52d15635dfc7a71cfc27dede57466c08a68b2e95.tar.gz
blackbird-hostboot-52d15635dfc7a71cfc27dede57466c08a68b2e95.zip
Revert "Verify frequency attributes across nodes"
This reverts commit 571e1d84dfe50aaa674aa7e33abb75868b432d78. Change-Id: I8720246ef94be07ce0a37151b7209c8080320d59 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56933 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/mbox')
-rw-r--r--src/usr/mbox/ipcSp.C81
1 files changed, 5 insertions, 76 deletions
diff --git a/src/usr/mbox/ipcSp.C b/src/usr/mbox/ipcSp.C
index 45d85a442..86d5e4532 100644
--- a/src/usr/mbox/ipcSp.C
+++ b/src/usr/mbox/ipcSp.C
@@ -40,17 +40,13 @@ namespace ISTEP_21
{
extern errlHndl_t callShutdown ( uint64_t i_hbInstance,
bool i_masterInstance );
-
- extern errlHndl_t callCheckFreqAttrData(void *freq_data_obj_ptr);
};
-
trace_desc_t* g_trac_ipc = NULL;
TRAC_INIT(&g_trac_ipc, IPC_TRACE_NAME, KILOBYTE);
using namespace IPC;
using namespace ERRORLOG;
-using namespace TARGETING;
IpcSp::IpcSp()
:
@@ -295,79 +291,9 @@ void IpcSp::msgHandler()
INITSERVICE::doShutdown(l_errPlid, true);
}
break;
- }
- case IPC_FREQ_ATTR_DATA:
- {
- TRACFCOMP( g_trac_ipc,
- "IPC received the IPC_FREQ_ATTR_DATA msg - %d:%d",
- msg->data[0], msg->data[1]);
-
- const int NUM_MOD = 2;
- const char * mods[NUM_MOD] =
- { "libistep21.so","libruntime.so"};
- bool loaded_mods[NUM_MOD] = {false, false};
- for (auto cnt = 0; cnt < NUM_MOD; ++cnt)
- {
- if ( !VFS::module_is_loaded( mods[cnt] ) )
- {
- err = VFS::module_load( mods[cnt] );
-
- if ( err )
- {
- TRACFCOMP( g_trac_ipc,
- "Could not load %s module", mods[cnt] );
- break;
- }
- else
- {
- loaded_mods[cnt] = true;
- }
- }
- }
-
- if(!err)
- {
-
- // Function will not return unless error
- err = ISTEP_21::callCheckFreqAttrData((void *)msg->extra_data);
- }
-
- if (err)
- {
- uint32_t l_errPlid = err->plid();
- errlCommit(err,IPC_COMP_ID);
- INITSERVICE::doShutdown(l_errPlid, true);
- }
-
- //Send response back to the master HB to indicate set freq attr successful
- err = MBOX::send(MBOX::HB_FREQ_ATTR_DATA_MSGQ, msg, msg->data[1] );
-
- if (err)
- {
- uint32_t l_errPlid = err->plid();
- errlCommit(err,IPC_COMP_ID);
- INITSERVICE::doShutdown(l_errPlid, true);
- }
-
- for (auto cnt = 0; cnt < NUM_MOD; ++cnt)
- {
- if ( loaded_mods[cnt] )
- {
- err = VFS::module_unload( mods[cnt] );
-
- if (err)
- {
- errlCommit(err, IPC_COMP_ID);
- }
- loaded_mods[cnt] = false;
- }
-
- }
-
- break;
+ }
- }
- case IPC_START_PAYLOAD:
+ case IPC_START_PAYLOAD:
{
const int NUM_MOD = 3;
const char * mods[NUM_MOD] =
@@ -392,8 +318,11 @@ void IpcSp::msgHandler()
}
}
+ if (err) break;
+
if(!err)
{
+ // Function will not return unless error
err = ISTEP_21::callShutdown(msg->data[0],false);
}
OpenPOWER on IntegriCloud