From 3273e7387ba43cce84e8431acc414a943a687f36 Mon Sep 17 00:00:00 2001 From: Prachi Gupta Date: Fri, 13 Nov 2015 10:35:37 -0600 Subject: Remove all compile dependencies on old fapi Change-Id: Ia1633645fe2b294fecd15a8ede67983b86d3549c Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22283 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III --- src/usr/initservice/extinitsvc/extinitsvctasks.H | 96 ++++------------------ .../initservice/istepdispatcher/istepdispatcher.C | 24 ++++-- 2 files changed, 30 insertions(+), 90 deletions(-) (limited to 'src/usr/initservice') diff --git a/src/usr/initservice/extinitsvc/extinitsvctasks.H b/src/usr/initservice/extinitsvc/extinitsvctasks.H index 959f19b68..964649179 100644 --- a/src/usr/initservice/extinitsvc/extinitsvctasks.H +++ b/src/usr/initservice/extinitsvc/extinitsvctasks.H @@ -240,89 +240,8 @@ const TaskInfo g_exttaskinfolist[] = { EXT_IMAGE, // Extended Module } }, - /** - * @brief ecmddatabuffer task, - */ - { - "libecmddatabuffer.so" , // taskname - NULL, // no pointer to fn - { - INIT_TASK, // task type - EXT_IMAGE, // Extended Module - } - }, - - /** - * @brief fapi task, - */ - { - "libfapi.so" , // taskname - NULL, // no pointer to fn - { - INIT_TASK, // task type - EXT_IMAGE, // Extended Module - } - }, - - /** - * @brief hwp task, - */ - { - "libhwp.so" , // taskname - NULL, // no pointer to fn - { - INIT_TASK, // task type - EXT_IMAGE, // Extended Module - } - }, - - /** - * @brief plat task, - */ - { - "libplat.so" , // taskname - NULL, // no pointer to fn - { - START_TASK, // task type - EXT_IMAGE, // Extended Module - } - }, - // @todo RTC:137627 - remove for p9 bringup #if (0) - /** - * @brief Start slave threads - */ - { - "libthread_activate.so" , // taskname - NULL, // no pointer to fn - { - START_TASK, // task type - EXT_IMAGE, // Extended Module - } - }, - { - "libthread_activate.so" , // taskname - NULL, // no pointer to fn - { - UNINIT_TASK, // task type - EXT_IMAGE, // Extended Module - } - }, -#endif - - /** - * @brief bus_training library. - */ - { - "libbus_training.so", // library name - NULL, // no function to run - { - INIT_TASK, // init only - EXT_IMAGE, // extended image module - } - }, - // No mdia in VPO #ifndef CONFIG_VPO_COMPILE /** @@ -362,6 +281,7 @@ const TaskInfo g_exttaskinfolist[] = { } }, +#endif #ifdef CONFIG_GPIODD /** * @brief GPIO code library @@ -390,7 +310,19 @@ const TaskInfo g_exttaskinfolist[] = { }, #endif - + /** + * @brief Common istep functions + * + * + */ + { + "libisteps.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 79fadae42..0fd9d5f94 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.C +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C @@ -48,7 +48,8 @@ #include #include #include -#include +//@TODO RTC:128106 port to fapi2 plat attribute service +//#include #include // HB_ISTEP_MSGQ #include // register mailbox #include @@ -275,7 +276,8 @@ void IStepDispatcher::init(errlHndl_t &io_rtaskRetErrl) if (l_attrOverridesExist) { - fapi::theAttrOverrideSync().getAttrOverridesFromFsp(); + //@TODO RTC:128106 port to fapi2 plat attribute service + //fapi::theAttrOverrideSync().getAttrOverridesFromFsp(); } // Start a new thread to handle non-IStep messages from the FSP @@ -342,7 +344,8 @@ void IStepDispatcher::init(errlHndl_t &io_rtaskRetErrl) // Attributes to sync to the FSP if(iv_spBaseServicesEnabled) { - fapi::theAttrOverrideSync().sendAttrOverridesAndSyncsToFsp(); + //@TODO RTC:128106 port to fapi2 plat attribute service + //fapi::theAttrOverrideSync().sendAttrOverridesAndSyncsToFsp(); } } } while(0); @@ -1574,7 +1577,8 @@ void IStepDispatcher::handleIStepRequestMsg(msg_t * & io_pMsg) // Send the potentially modified set of Attribute overrides and any // Attributes to sync (to Cronus) to the FSP - fapi::theAttrOverrideSync().sendAttrOverridesAndSyncsToFsp(); + //@TODO RTC:128106 port to fapi2 plat attribute service + //fapi::theAttrOverrideSync().sendAttrOverridesAndSyncsToFsp(); // Transfer ownership of the message pointer back from iv_pIstepMsg mutex_lock(&iv_mutex); @@ -1676,8 +1680,10 @@ void IStepDispatcher::handleProcFabIovalidMsg(msg_t * & io_pMsg) // Create child thread so that if there are problems, the istep // dispatcher code continues - tid_t l_progTid = task_create( - ESTABLISH_SYSTEM_SMP::host_sys_fab_iovalid_processing,io_pMsg); + // @TODO RTC:133831 + //tid_t l_progTid = task_create( + // ESTABLISH_SYSTEM_SMP::host_sys_fab_iovalid_processing,io_pMsg); + tid_t l_progTid = 1; assert( l_progTid > 0 ); // wait here for the task to end. // status of the task ( OK or Crashed ) is returned in l_childsts @@ -1733,7 +1739,8 @@ void IStepDispatcher::handleProcFabIovalidMsg(msg_t * & io_pMsg) } // Re-enable p8_cpu_special_wakeup - err = ESTABLISH_SYSTEM_SMP::enableSpecialWakeup(); + // @TODO RTC:133831 + //err = ESTABLISH_SYSTEM_SMP::enableSpecialWakeup(); if (err) { TRACFCOMP( g_trac_initsvc, @@ -2011,7 +2018,8 @@ errlHndl_t IStepDispatcher::handleCoalesceHostMsg() } else { - err = ESTABLISH_SYSTEM_SMP::call_host_coalesce_host(); + //@TODO RTC:133831 + //err = ESTABLISH_SYSTEM_SMP::call_host_coalesce_host(); if (err) { TRACFCOMP(g_trac_initsvc, "handleCoalesceHostMsg: Error with " -- cgit v1.2.1