diff options
| -rwxr-xr-x | src/build/tools/genIStep.pl | 4 | ||||
| -rw-r--r-- | src/include/usr/initservice/initsvcreasoncodes.H | 60 | ||||
| -rw-r--r-- | src/include/usr/initservice/initsvcstructs.H | 5 | ||||
| -rw-r--r-- | src/include/usr/isteps/istep04list.H | 8 | ||||
| -rw-r--r-- | src/include/usr/isteps/istep10list.H | 39 | ||||
| -rw-r--r-- | src/include/usr/isteps/istep11list.H | 8 | ||||
| -rw-r--r-- | src/include/usr/isteps/istep12list.H | 4 | ||||
| -rw-r--r-- | src/include/usr/isteps/istep13list.H | 11 | ||||
| -rw-r--r-- | src/usr/initservice/baseinitsvc/initservice.C | 8 | ||||
| -rw-r--r-- | src/usr/initservice/baseinitsvc/initsvctasks.H | 6 | ||||
| -rw-r--r-- | src/usr/initservice/extinitsvc/extinitsvctasks.H | 18 | ||||
| -rw-r--r-- | src/usr/initservice/test/initservicetest.H | 3 |
12 files changed, 28 insertions, 146 deletions
diff --git a/src/build/tools/genIStep.pl b/src/build/tools/genIStep.pl index 0e7c97d7a..a849e0142 100755 --- a/src/build/tools/genIStep.pl +++ b/src/build/tools/genIStep.pl @@ -474,7 +474,6 @@ my $templateListFileSS = { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, "; @@ -729,8 +728,7 @@ sub extractTagBlock( $ ) # Capture everything from opening '/* @tag isteplist' to end of tags '*/' # # Example: - # /*@ - # * @tag isteplist + # /* @tag isteplist # * ... # */ # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff --git a/src/include/usr/initservice/initsvcreasoncodes.H b/src/include/usr/initservice/initsvcreasoncodes.H index 6529e276b..f42f697d4 100644 --- a/src/include/usr/initservice/initsvcreasoncodes.H +++ b/src/include/usr/initservice/initsvcreasoncodes.H @@ -43,58 +43,13 @@ namespace INITSERVICE enum InitServiceModuleID { UNDEFINED_MODULE_ERRL_ID = 0x00, - - // base image modules - BASE_INITSVC_ERRL_ID = 0x01, - START_TRACE_ERRL_ID = 0x02, - START_ERRL_ERRL_ID = 0x03, - START_PNORDD_ERRL_ID = 0x04, - START_VFS_ERRL_ID = 0x05, - START_EXTINITSVC_ERRL_ID = 0x06, - - // extended image modules - START_ECMDDATABUFFER_ERRL_ID = 0x10, - START_HWPF_ERRL_ID = 0x11, - START_FAPI_ERRL_ID = 0x12, - START_HWP_ERRL_ID = 0x13, - START_PLAT_ERRL_ID = 0x14, - EXECUTE_ISTEPS_ERRL_ID = 0x15, - START_FSIDD_ERRL_ID = 0x16, - START_FSISCOM_ERRL_ID = 0x17, - START_TARGETING_ERRL_ID = 0x18, - START_I2C_ERRL_ID = 0x19, - START_INTR_ERRL_ID = 0x1A, - START_SPD_ERRL_ID = 0x1B, - START_FAPIPOREVE_ERRL_ID = 0x1C, - START_POREVE_ERRL_ID = 0x1D, - START_UTIL_ERRL_ID = 0x1E, - START_MDIA_ERRL_ID = 0x1F, - - // Internal InitService codes - INITSVC_START_TASK_MOD_ID = 0x20, - INITSVC_START_FN_MOD_ID = 0x21, - INITSVC_TASK_RETURNED_ERROR_ID = 0x22, - EXTINITSVC_TASK_RETURNED_ERROR_ID = 0x23, - CXXTEST_TASK_RETURNED_ERROR_ID = 0x24, - ISTEP_RETURNED_ERROR_ID = 0x25, - INITSVC_DO_SHUTDOWN_MOD_ID = 0x26, - - // - // ISTEP module id's. - // ISTEP_ERRL_ID is a generic Error ID for all the HWP's launched - // by an istep. - // - HWAS_ERRL_ID = 0x30, - ISTEP_ERRL_ID = 0x31, - - // reserve some tasks for my unit tests... - START_CXXTEST_ERRL_ID = 0xf0, - INIT_SVC_TEST1_ERRL_ID = 0xf1, - INIT_SVC_TEST2_ERRL_ID = 0xf2, - INIT_SVC_TEST3_ERRL_ID = 0xf3, - INIT_SVC_TEST4_ERRL_ID = 0xf4, - INIT_SVC_TEST5_ERRL_ID = 0xf5, - + INITSVC_START_TASK_MOD_ID = 0x01, + INITSVC_START_FN_MOD_ID = 0x02, + INITSVC_TASK_RETURNED_ERROR_ID = 0x03, + EXTINITSVC_TASK_RETURNED_ERROR_ID = 0x04, + CXXTEST_TASK_RETURNED_ERROR_ID = 0x05, + ISTEP_RETURNED_ERROR_ID = 0x06, + INITSVC_DO_SHUTDOWN_MOD_ID = 0x07, }; @@ -109,7 +64,6 @@ enum InitServiceReasonCode EXTINITSVC_FAILED_NO_ERRLOG = INITSVC_COMP_ID | 0x07, CXXTEST_FAILED_NO_ERRLOG = INITSVC_COMP_ID | 0x08, SHUTDOWN_FLUSH_FAILED = INITSVC_COMP_ID | 0x09, - }; enum InitServiceUserDetailDataSubSection diff --git a/src/include/usr/initservice/initsvcstructs.H b/src/include/usr/initservice/initsvcstructs.H index 3b47ce476..7daaec28b 100644 --- a/src/include/usr/initservice/initsvcstructs.H +++ b/src/include/usr/initservice/initsvcstructs.H @@ -115,15 +115,10 @@ enum ModuleType * - module_id for errorlog if task fails * */ -/** - * @todo module_id is fairly useless, we should use the taskname string - * to id the module. Schedule for termination.... - */ struct TaskFlags { TaskType task_type; // task execution flags ModuleType module_type; // BASE_IMAGE or EXT_IMAGE - InitServiceModuleID module_id; // module id for errorlog }; diff --git a/src/include/usr/isteps/istep04list.H b/src/include/usr/isteps/istep04list.H index b106a71db..24c043f92 100644 --- a/src/include/usr/isteps/istep04list.H +++ b/src/include/usr/isteps/istep04list.H @@ -67,7 +67,6 @@ const TaskInfo g_istep04[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // error id for istep } }, { @@ -76,7 +75,6 @@ const TaskInfo g_istep04[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // error id for istep } }, { @@ -85,7 +83,6 @@ const TaskInfo g_istep04[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // error id for istep } }, { @@ -94,7 +91,6 @@ const TaskInfo g_istep04[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // error id for istep } }, { @@ -103,7 +99,6 @@ const TaskInfo g_istep04[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // error id for istep } }, { @@ -112,7 +107,6 @@ const TaskInfo g_istep04[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // error id for istep } }, { @@ -121,7 +115,6 @@ const TaskInfo g_istep04[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // error id for istep } }, #if 0 @@ -132,7 +125,6 @@ const TaskInfo g_istep04[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // error id for istep } } #endif diff --git a/src/include/usr/isteps/istep10list.H b/src/include/usr/isteps/istep10list.H index d7c148a49..fb3e9cb19 100644 --- a/src/include/usr/isteps/istep10list.H +++ b/src/include/usr/isteps/istep10list.H @@ -55,7 +55,6 @@ const TaskInfo g_istep10[] = { { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, { @@ -64,7 +63,6 @@ const TaskInfo g_istep10[] = { { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, { @@ -73,79 +71,78 @@ const TaskInfo g_istep10[] = { { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } - }, { + }, + { ISTEPNAME(10,03,"cen_sbe_tp_chiplet_init3"), SBE_CENTAUR_INIT::call_cen_sbe_tp_chiplet_init3, { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } - }, { + }, + { ISTEPNAME(10,04,"cen_sbe_chiplet_init"), SBE_CENTAUR_INIT::call_cen_sbe_chiplet_init, { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } - }, { + }, + { ISTEPNAME(10,05,"cen_sbe_arrayinit"), SBE_CENTAUR_INIT::call_cen_sbe_arrayinit, { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } - }, { + }, + { ISTEPNAME(10,06,"cen_sbe_pll_initf"), SBE_CENTAUR_INIT::call_cen_sbe_pll_initf, { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } - }, { + }, + { ISTEPNAME(10,07,"cen_sbe_dts_init"), SBE_CENTAUR_INIT::call_cen_sbe_dts_init, { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } - }, { + }, + { ISTEPNAME(10,08,"cen_sbe_initf"), SBE_CENTAUR_INIT::call_cen_sbe_initf, { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } - }, { + }, + { ISTEPNAME(10,09,"cen_sbe_do_manual_inits"), SBE_CENTAUR_INIT::call_cen_sbe_do_manual_inits, { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } - }, { + }, + { ISTEPNAME(10,10,"cen_sbe_startclocks"), SBE_CENTAUR_INIT::call_cen_sbe_startclocks, { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } - }, { + }, + { ISTEPNAME(10,11,"cen_sbe_scominits"), SBE_CENTAUR_INIT::call_cen_sbe_scominits, { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, diff --git a/src/include/usr/isteps/istep11list.H b/src/include/usr/isteps/istep11list.H index efb07202a..9b57c3681 100644 --- a/src/include/usr/isteps/istep11list.H +++ b/src/include/usr/isteps/istep11list.H @@ -72,7 +72,6 @@ const TaskInfo g_istep11[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // module id } }, { @@ -81,7 +80,6 @@ const TaskInfo g_istep11[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // module id } }, { @@ -90,7 +88,6 @@ const TaskInfo g_istep11[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // module id } }, { @@ -99,7 +96,6 @@ const TaskInfo g_istep11[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // module id } }, { @@ -108,7 +104,6 @@ const TaskInfo g_istep11[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // module id } }, { @@ -117,7 +112,6 @@ const TaskInfo g_istep11[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // module id } }, @@ -128,7 +122,6 @@ const TaskInfo g_istep11[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // module id } }, { @@ -137,7 +130,6 @@ const TaskInfo g_istep11[] = { { START_FN, // task type EXT_IMAGE, // Extended Module - ISTEP_ERRL_ID, // module id } }, diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H index a792256f5..357722be4 100644 --- a/src/include/usr/isteps/istep12list.H +++ b/src/include/usr/isteps/istep12list.H @@ -65,7 +65,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, @@ -76,7 +75,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, @@ -87,7 +85,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, @@ -98,7 +95,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H index b501c6dde..8014c1904 100644 --- a/src/include/usr/isteps/istep13list.H +++ b/src/include/usr/isteps/istep13list.H @@ -79,7 +79,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, @@ -90,7 +89,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, @@ -101,7 +99,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, @@ -112,7 +109,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, @@ -123,7 +119,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, @@ -134,7 +129,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, @@ -145,7 +139,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, @@ -156,7 +149,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, @@ -167,7 +159,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, @@ -178,7 +169,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, @@ -189,7 +179,6 @@ namespace INITSERVICE { START_FN, EXT_IMAGE, - ISTEP_ERRL_ID, } }, diff --git a/src/usr/initservice/baseinitsvc/initservice.C b/src/usr/initservice/baseinitsvc/initservice.C index ed4191e87..532d899d6 100644 --- a/src/usr/initservice/baseinitsvc/initservice.C +++ b/src/usr/initservice/baseinitsvc/initservice.C @@ -100,8 +100,7 @@ errlHndl_t InitService::startTask( const TaskInfo *i_ptask, * @errortype ERRL_SEV_CRITICAL_SYS_TERM * @moduleid INITSVC_START_TASK_MOD_ID * @reasoncode START_TASK_FAILED - * @userdata1 task module id - * @userdata2 task id or task return code + * @userdata1 task return code * * @devdesc Initialization Service failed to start a task. * @@ -110,7 +109,6 @@ errlHndl_t InitService::startTask( const TaskInfo *i_ptask, ERRORLOG::ERRL_SEV_CRITICAL_SYS_TERM, INITSERVICE::INITSVC_START_TASK_MOD_ID, INITSERVICE::START_TASK_FAILED, - i_ptask->taskflags.module_id, l_tidrc ); // Add the task name as user detail data @@ -157,8 +155,7 @@ errlHndl_t InitService::executeFn( const TaskInfo *i_ptask, * @errortype ERRL_SEV_CRITICAL_SYS_TERM * @moduleid INITSVC_START_FN_MOD_ID * @reasoncode START_FN_FAILED - * @userdata1 task module id - * @userdata2 task id or task return code + * @userdata1 task return code * * @devdesc Initialization Service attempted to start a * function within a module but the function @@ -168,7 +165,6 @@ errlHndl_t InitService::executeFn( const TaskInfo *i_ptask, ERRORLOG::ERRL_SEV_CRITICAL_SYS_TERM, INITSERVICE::INITSVC_START_FN_MOD_ID, INITSERVICE::START_FN_FAILED, - i_ptask->taskflags.module_id, l_tidrc ); // Add the task name as user detail data diff --git a/src/usr/initservice/baseinitsvc/initsvctasks.H b/src/usr/initservice/baseinitsvc/initsvctasks.H index 26e78d6f5..69b146c92 100644 --- a/src/usr/initservice/baseinitsvc/initsvctasks.H +++ b/src/usr/initservice/baseinitsvc/initsvctasks.H @@ -49,8 +49,6 @@ const TaskInfo g_taskinfolist[] = { { NONE, // don't start BASE_IMAGE, // Base Module - START_ERRL_ERRL_ID, // module id for errorlog - } }, @@ -64,7 +62,6 @@ const TaskInfo g_taskinfolist[] = { { START_TASK, // start BASE_IMAGE, // Base Module - START_PNORDD_ERRL_ID, // module id for errorlog } }, @@ -77,7 +74,6 @@ const TaskInfo g_taskinfolist[] = { { START_TASK, // start task BASE_IMAGE, // Base Module - START_VFS_ERRL_ID, // module id for error log } }, @@ -92,7 +88,6 @@ const TaskInfo g_taskinfolist[] = { { START_TASK, // call start() EXT_IMAGE, // EXT_IMAGE - START_EXTINITSVC_ERRL_ID, // module id for errorlog } }, @@ -110,7 +105,6 @@ const TaskInfo g_taskinfolist[] = { { END_TASK_LIST, // end of list UNDEFINED_MT, // dummy module type - UNDEFINED_MODULE_ERRL_ID, // dummy errorlog } }, diff --git a/src/usr/initservice/extinitsvc/extinitsvctasks.H b/src/usr/initservice/extinitsvc/extinitsvctasks.H index 1360c9d5d..3f8960d1f 100644 --- a/src/usr/initservice/extinitsvc/extinitsvctasks.H +++ b/src/usr/initservice/extinitsvc/extinitsvctasks.H @@ -51,7 +51,6 @@ const TaskInfo g_exttaskinfolist[] = { { INIT_TASK, // init only EXT_IMAGE, // extended image module - START_UTIL_ERRL_ID, // error module id } }, @@ -64,7 +63,6 @@ const TaskInfo g_exttaskinfolist[] = { { START_TASK, // task type EXT_IMAGE, // Extended Module - START_TARGETING_ERRL_ID, // module id } }, @@ -77,7 +75,6 @@ const TaskInfo g_exttaskinfolist[] = { { START_TASK, // task type EXT_IMAGE, // Extended Module - START_INTR_ERRL_ID, // module id } }, @@ -91,7 +88,6 @@ const TaskInfo g_exttaskinfolist[] = { { INIT_TASK, // task type EXT_IMAGE, // Extended Module - START_FSIDD_ERRL_ID, // module id } }, @@ -104,7 +100,6 @@ const TaskInfo g_exttaskinfolist[] = { { INIT_TASK, // task type EXT_IMAGE, // Extended Module - START_FSISCOM_ERRL_ID, // module id } }, @@ -117,7 +112,6 @@ const TaskInfo g_exttaskinfolist[] = { { INIT_TASK, // task type EXT_IMAGE, // Extended Module - START_I2C_ERRL_ID, // module id } }, @@ -130,7 +124,6 @@ const TaskInfo g_exttaskinfolist[] = { { INIT_TASK, // task type EXT_IMAGE, // Extended module - START_SPD_ERRL_ID // module id } }, @@ -149,7 +142,6 @@ const TaskInfo g_exttaskinfolist[] = { { INIT_TASK, // task type EXT_IMAGE, // Extended Module - EXECUTE_ISTEPS_ERRL_ID, // module id } }, // end TODO @@ -163,7 +155,6 @@ const TaskInfo g_exttaskinfolist[] = { { INIT_TASK, // task type EXT_IMAGE, // Extended Module - START_ECMDDATABUFFER_ERRL_ID, // module id } }, @@ -176,7 +167,6 @@ const TaskInfo g_exttaskinfolist[] = { { INIT_TASK, // task type EXT_IMAGE, // Extended Module - START_FAPI_ERRL_ID, // module id } }, @@ -189,7 +179,6 @@ const TaskInfo g_exttaskinfolist[] = { { INIT_TASK, // task type EXT_IMAGE, // Extended Module - START_HWP_ERRL_ID, // module id } }, @@ -202,7 +191,6 @@ const TaskInfo g_exttaskinfolist[] = { { INIT_TASK, // task type EXT_IMAGE, // Extended Module - START_PLAT_ERRL_ID, // module id } }, @@ -216,7 +204,6 @@ const TaskInfo g_exttaskinfolist[] = { { INIT_TASK, // task type EXT_IMAGE, // Extended Module - START_FAPIPOREVE_ERRL_ID // module id } }, @@ -229,7 +216,6 @@ const TaskInfo g_exttaskinfolist[] = { { INIT_TASK, // task type EXT_IMAGE, // Extended Module - START_POREVE_ERRL_ID // module id } }, @@ -242,7 +228,6 @@ const TaskInfo g_exttaskinfolist[] = { { INIT_TASK, // task type EXT_IMAGE, // Extended Module - START_MDIA_ERRL_ID // module id } }, @@ -262,7 +247,6 @@ const TaskInfo g_exttaskinfolist[] = { { START_TASK, // task type EXT_IMAGE, // Extended Module - EXECUTE_ISTEPS_ERRL_ID, // module id } }, // NOTE: libistepdisp.so needs to always be last in this list!! @@ -280,7 +264,6 @@ const TaskInfo g_exttaskinfolist[] = { { END_TASK_LIST, // end of list UNDEFINED_MT, // dummy module type - UNDEFINED_MODULE_ERRL_ID, // dummy errorlog } }, @@ -295,7 +278,6 @@ const TaskInfo CXXTEST_TASK = { { START_TASK, // task type EXT_IMAGE, // Extended Module - START_CXXTEST_ERRL_ID, // module id } }; diff --git a/src/usr/initservice/test/initservicetest.H b/src/usr/initservice/test/initservicetest.H index f1494d5ec..bfb751954 100644 --- a/src/usr/initservice/test/initservicetest.H +++ b/src/usr/initservice/test/initservicetest.H @@ -48,7 +48,6 @@ const INITSERVICE::TaskInfo TASK_TEST1 = { { INITSERVICE::START_TASK, // startflag=true, try to start INITSERVICE::BASE_IMAGE, // Base Module - INITSERVICE::INIT_SVC_TEST1_ERRL_ID, // module id for errorlog }, }; @@ -64,7 +63,6 @@ const INITSERVICE::TaskInfo TASK_TEST2 = { { INITSERVICE::START_TASK, // startflag=true, try to start INITSERVICE::EXT_IMAGE, // Ext Inmage Module - INITSERVICE::INIT_SVC_TEST2_ERRL_ID, // module id for errorlog }, }; @@ -81,7 +79,6 @@ const INITSERVICE::TaskInfo TASK_TEST3 = { { INITSERVICE::START_TASK, // startflag=true, try to start INITSERVICE::BASE_IMAGE, // Base Module - INITSERVICE::INIT_SVC_TEST3_ERRL_ID, // module id for errorlog }, }; |
