From 08961278f496e058964d217593a06303ea96b4f3 Mon Sep 17 00:00:00 2001 From: Andres Lugo-Reyes Date: Mon, 12 Dec 2016 14:48:59 -0600 Subject: dcom/ thread/ rtls/ TODO clean up Also moved files common to occ_405/, occ_gpe0/, occ_gpe1/, etc, to a new common directory to keep src/ clean Change-Id: Ib45d70d048a135832592953c955a325d20fa19ae RTC: 163363 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/33640 Tested-by: FSP CI Jenkins Reviewed-by: Martha Broyles Reviewed-by: William A. Bryan --- src/occ_405/rtls/rtls.c | 20 +++++--------------- src/occ_405/rtls/rtls.h | 4 ++-- src/occ_405/rtls/rtls_tables.c | 10 +++++----- src/occ_405/rtls/test/rtls_tables.c | 10 +++++----- 4 files changed, 17 insertions(+), 27 deletions(-) (limited to 'src/occ_405/rtls') diff --git a/src/occ_405/rtls/rtls.c b/src/occ_405/rtls/rtls.c index 63bb582..6e6c02b 100755 --- a/src/occ_405/rtls/rtls.c +++ b/src/occ_405/rtls/rtls.c @@ -67,10 +67,6 @@ extern uint8_t *G_tick_table[MAX_NUM_TICKS]; // See notes regarding this table in rtls_tables.c. extern task_t G_task_table[TASK_END]; -// ARL Test Code Function from arl_test.c -// Added for enablement of Research use of OCC Environment -//TODO: Remove when no longer needed. -extern void arl_test(void); // Function Specification // @@ -93,7 +89,6 @@ void rtl_start_task(const task_id_t i_task_id) else { // Invalid task ID for this operation - // TODO use correct trace /* * @errortype @@ -141,7 +136,6 @@ void rtl_stop_task(const task_id_t i_task_id) else { // Invalid task ID for this operation - // TODO use correct trace /* * @errortype @@ -191,7 +185,6 @@ bool rtl_task_is_runnable(const task_id_t i_task_id) else { // Invalid task ID for this operation - // TODO use correct trace /* * @errortype @@ -253,8 +246,8 @@ void rtl_ocb_init(void) SSX_NONCRITICAL); if( rc ) { - //TODO: Add trace - + TRAC_ERR("Error occured in rtl_ocb_init::ocb_timer_setup()" + " rc = 0x%x", rc ); /* * @errortype * @moduleid RTLS_OCB_INIT_MOD @@ -317,9 +310,6 @@ void rtl_do_tick( void *private, SsxIrqId irq, int priority ) RTLS_DBG("#### Tick %d ####\n",CURRENT_TICK); - // Execute ARL Test Code before we run any tasks. TODO: Remove when no longer needed. -// TEMP -- DON'T THINK THIS IS NEEDED IN PHASE1 -// arl_test(); // Index into the tick table to get a pointer to the tick sequence for the current tick. l_taskid_ptr = G_tick_table[ (MAX_NUM_TICKS - 1) & CURRENT_TICK ]; @@ -338,8 +328,8 @@ void rtl_do_tick( void *private, SsxIrqId irq, int priority ) if ( ! l_bad_id_reported ) { // First bad task ID we've seen this tick. Log an unrecoverable error. - - // TODO use correct trace + RTLS_DBG("rtl_do_tick() - Invalid task ID" + "taskId = 0x%x", *l_taskid_ptr ); /* * @errortype @@ -416,7 +406,7 @@ void rtl_set_task_data( const task_id_t i_task_id, void * i_data_ptr ) if ( i_task_id >= TASK_END ) { - //TODO: add trace + RTLS_DBG("Invalid task ID: 0x%x", i_task_id); // Task ID is invalid so log an error internally /* diff --git a/src/occ_405/rtls/rtls.h b/src/occ_405/rtls/rtls.h index 7a45afe..6da6825 100755 --- a/src/occ_405/rtls/rtls.h +++ b/src/occ_405/rtls/rtls.h @@ -55,8 +55,8 @@ typedef enum { TASK_ID_DCOM_PARSE_FW_MSG, TASK_ID_AMEC_SLAVE, // AMEC SMH tasks TASK_ID_AMEC_MASTER, // AMEC SMH tasks -// TASK_ID_CORE_DATA_CONTROL, -// TASK_ID_GPU_SM, // GPU State Machine +// TASK_ID_CORE_DATA_CONTROL, // TODO RTC: 163365 +// TASK_ID_GPU_SM, // GPU State Machine TODO RTC: 133824 TASK_ID_DIMM_SM, // DIMM State Machine TASK_ID_MEMORY_CONTROL, // Memory (centaur/dimm) control task TASK_ID_NEST_DTS, diff --git a/src/occ_405/rtls/rtls_tables.c b/src/occ_405/rtls/rtls_tables.c index a577069..b7b1a4c 100755 --- a/src/occ_405/rtls/rtls_tables.c +++ b/src/occ_405/rtls/rtls_tables.c @@ -74,14 +74,14 @@ #define FLAGS_POKE_WDT RTL_FLAG_RUN | RTL_FLAG_MSTR | RTL_FLAG_NOTMSTR | RTL_FLAG_STANDBY | \ RTL_FLAG_OBS | RTL_FLAG_ACTIVE | RTL_FLAG_MSTR_READY | RTL_FLAG_NO_APSS | RTL_FLAG_APSS_NOT_INITD -// TEMP/TODO: These are not yet implemented +// TEMP/TODO RTC: 133824 - New GPU interface via main memory and SMBUS #define FLAGS_GPU_SM -#define FLAGS_MEM_DEADMAN + // Global tick sequences // The number and size of these will vary as the real tick sequences are developed over time. -//NOTE: Currently this is the only way the complete apss works in simics TODO need to revisit in +//NOTE: Currently this is the only way the complete apss works in simics // the future. /* The Global Task Table @@ -113,9 +113,9 @@ task_t G_task_table[TASK_END] = { { FLAGS_DCOM_PARSE_OCC_FW_MSG, task_dcom_parse_occfwmsg, NULL }, // TASK_ID_DCOM_PARSE_FW_MSG { FLAGS_AMEC_SLAVE, task_amec_slave, NULL }, // TASK_ID_AMEC_SLAVE { FLAGS_AMEC_MASTER, task_amec_master, NULL }, // TASK_ID_AMEC_MASTER -// TEMP -- NOT SUPPORTED YET IN PHASE1 +// TODO RTC: 163365 - /proc/ and /pss/ "TODO" cleanup // { FLAGS_CORE_DATA_CONTROL, task_core_data_control, NULL }, // TASK_ID_CORE_DATA_CONTROL -// TEMP -- NOT YET IMPLEMENTED +// TODO RTC: 133824 - New GPU interface via main memory and SMBUS // { FLAGS_GPU_SM, task_gpu_sm, NULL }, // TASK_ID_GPU_SM { FLAGS_MEMORY_DATA, task_dimm_sm, NULL }, // TASK_ID_DIMM_SM { FLAGS_MEMORY_CONTROL, task_memory_control, (void *) &G_memory_control_task }, // TASK_ID_MEMORY_CONTROL diff --git a/src/occ_405/rtls/test/rtls_tables.c b/src/occ_405/rtls/test/rtls_tables.c index 316dd8e..24db77b 100755 --- a/src/occ_405/rtls/test/rtls_tables.c +++ b/src/occ_405/rtls/test/rtls_tables.c @@ -5,7 +5,7 @@ /* */ /* OpenPOWER OnChipController Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2015 */ +/* Contributors Listed Below - COPYRIGHT 2011,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -85,7 +85,7 @@ void task_3_func(struct task *); // // Name: task_0_func // -// Description: TODO Add description +// Description: Example task 0 // // End Function Specification void task_0_func(struct task *i_self) { @@ -104,7 +104,7 @@ void task_0_func(struct task *i_self) { // // Name: task_1_func // -// Description: TODO Add description +// Description: Example task 1 // // End Function Specification void task_1_func(struct task *i_self) { @@ -123,7 +123,7 @@ void task_1_func(struct task *i_self) { // // Name: task_2_func // -// Description: TODO Add description +// Description: Example task 2 // // End Function Specification void task_2_func(struct task *i_self) { @@ -142,7 +142,7 @@ void task_2_func(struct task *i_self) { // // Name: task_3_func // -// Description: TODO Add description +// Description: Example task 3 // // End Function Specification void task_3_func(struct task *i_self) { -- cgit v1.2.1