Skip to content

Commit

Permalink
memory TODO clean up
Browse files Browse the repository at this point in the history
Change-Id: Ib559cd2d0a0c1d8fe751606399fe2457c02156c1
RTC: 163357
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42330
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
  • Loading branch information
aalugore authored and wilbryan committed Jun 23, 2017
1 parent 471f91d commit 98cb615
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 20 deletions.
6 changes: 3 additions & 3 deletions src/occ_405/cent/centaur_control.c
Expand Up @@ -78,7 +78,7 @@ typedef enum
//Pore flex request for the GPE job that is used for centaur init.
GpeRequest G_centaur_control_request;

//@TODO TEMP: not ready yet for centaur control data structures
//TODO: RTC 163359 - not ready yet for centaur control data structures
//GPE_BUFFER(GpeScomParms G_centaur_control_reg_parms);
//GPE_BUFFER(scomList_t G_centaurThrottle[NUM_CENT_THROTTLE_SCOMS]);

Expand Down Expand Up @@ -133,7 +133,7 @@ uint16_t centaurThrottle_convert2Numerator(uint16_t i_throttle, uint8_t i_cent,
return (uint16_t)l_nvalue;
}

#if 0 // @TODO TEMP: Not Ready yet for centaur control
#if 0 // TODO: 163359 - Not Ready yet for centaur control

//////////////////////////
// Function Specification
Expand Down Expand Up @@ -515,5 +515,5 @@ bool check_centaur_checkstop(uint8_t cent)
}


#endif // @TODO TEMP: Not Ready yet for centaur control
#endif // TODO: RTC 163359 - Not Ready yet for centaur control

16 changes: 8 additions & 8 deletions src/occ_405/cent/centaur_data.c
Expand Up @@ -90,7 +90,7 @@ typedef enum
// Globals
//*************************************************************************/

/* TEMP/TODO: PORE/MemData issues */
/* TODO 163359: PORE/MemData issues */
#if 0
//Global array of centaur data buffers
GPE_BUFFER(MemData G_centaur_data[NUM_CENTAUR_DATA_BUFF +
Expand Down Expand Up @@ -176,7 +176,7 @@ uint8_t G_centaur_nest_lfir6 = 0;
//number of SC polls to wait between i2c recovery attempts
#define CENT_SC_MAX_INTERVAL 256

/* TEMP/TODO: Reenable when needed */
/* TODO: RTC 163359 - Reenable when needed */
#if 0
//determine scom address of MCIFIR register for given Centaur n
#define MCS0_MCIFIR_N(n) \
Expand All @@ -186,7 +186,7 @@ uint8_t G_centaur_nest_lfir6 = 0;
//mask for channel checkstop
#define MCIFIR_CHAN_CKSTOP_MASK 0x0000000100000000

/* TEMP/TODO: Reenable when needed */
/* TODO: RTC 163359 - Reenable when needed */
#if 0
bool cent_chan_checkstop(const uint8_t i_cent)
{
Expand Down Expand Up @@ -235,7 +235,7 @@ bool cent_chan_checkstop(const uint8_t i_cent)
}
#endif // #if 0

/* TEMP/TODO: Reenable when needed */
/* TODO: RTC 163359 - Reenable when needed */
#if 0
void cent_recovery(uint32_t i_cent)
{
Expand Down Expand Up @@ -611,7 +611,7 @@ void cent_recovery(uint32_t i_cent)
// collection
//
// End Function Specification
/* TEMP/TODO: Reenable when needed */
/* TODO: RTC 163359 - Reenable when needed */
#if 0
void task_centaur_data( task_t * i_task )
{
Expand Down Expand Up @@ -929,7 +929,7 @@ void task_centaur_data( task_t * i_task )
// Description: Reads
//
// End Function Specification
/* TEMP/TODO: Reenable when needed */
/* TODO: RTC 163359 - Reenable when needed */
#if 0
int cent_get_enabled_sensors()
{
Expand Down Expand Up @@ -997,7 +997,7 @@ int cent_get_enabled_sensors()
// This will also initialize the centaur watchdog.
//
// End Function Specification
/* TEMP/TODO: Reenable when needed */
/* TODO: RTC 163359 - Reenable when needed */
#if 0
void centaur_init( void )
{
Expand Down Expand Up @@ -1271,7 +1271,7 @@ void centaur_init( void )
// Returns NULL for centaur ID outside the range of 0 to 7.
//
// End Function Specification
/* TEMP/TODO: Reenable when needed */
/* TODO: RTC 163359 - Reenable when needed */
#if 0
MemData * cent_get_centaur_data_ptr( const uint8_t i_occ_centaur_id )
{
Expand Down
3 changes: 1 addition & 2 deletions src/occ_405/dimm/dimm.c
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER OnChipController Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2011,2015 */
/* Contributors Listed Below - COPYRIGHT 2011,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -753,7 +753,6 @@ void task_dimm_sm(struct task *i_self)
occ_i2c_lock_release(G_dimm_sm_args.i2cEngine);
L_occ_owns_lock = false;
G_mem_monitoring_allowed = false;
// TODO: What else do we need to do? go to Safe State?
}
else
{
Expand Down
14 changes: 7 additions & 7 deletions src/occ_405/mem/memory.c
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER OnChipController Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2014,2016 */
/* Contributors Listed Below - COPYRIGHT 2014,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -39,7 +39,7 @@ extern dimm_control_args_t G_dimm_control_args;
extern task_t G_task_table[TASK_END];


// @TODO: TEMP - uncomment when Centaur code is enabled
// TODO: RTC 163359 - uncomment when Centaur code is enabled
//extern GpeScomParms G_centaur_control_reg_parms;

// This array identifies dimm throttle limits for both Centaurs (Cumulus) and
Expand Down Expand Up @@ -112,7 +112,7 @@ void task_memory_control( task_t * i_task )
}
else if (MEM_TYPE_CUMULUS == G_sysConfigData.mem_type)
{
// @TODO: TEMP - uncomment when Centaur code is enabled
// TODO: RTC 163359 - uncomment when Centaur code is enabled
// gpe_rc = G_centaur_control_reg_parms.rc;
}

Expand Down Expand Up @@ -156,7 +156,7 @@ void task_memory_control( task_t * i_task )
{
if(!(L_gpe_fail_logged & (CENTAUR0_PRESENT_MASK >> memIndex)))
{
// @TODO: TEMP - uncomment when Centaur code is enabled
// TODO: RTC 163359 - uncomment when Centaur code is enabled
/* if (!check_centaur_checkstop(memIndex))
{
L_gpe_fail_logged |= CENTAUR0_PRESENT_MASK >> memIndex;
Expand Down Expand Up @@ -224,7 +224,7 @@ void task_memory_control( task_t * i_task )
{
break;
}
// @TODO TEMP: centaur code not ready yet
// TODO RTC: 163359 - centaur code not ready yet
// rc = centaur_control(memIndex); // Control one centaur
}

Expand All @@ -240,7 +240,7 @@ void task_memory_control( task_t * i_task )
}
else if (MEM_TYPE_CUMULUS == G_sysConfigData.mem_type)
{
// @TODO: TEMP - uncomment when Centaur code is enabled
// TODO RTC: 163359 - uncomment when Centaur code is enabled
// gpe_rc = G_centaur_control_reg_parms.rc;
}

Expand Down Expand Up @@ -367,7 +367,7 @@ void memory_init()
}
else
{
// TODO CUMULUS NOT SUPPORTED YET IN PHASE1
// TODO RTC: 163359 - CUMULUS NOT SUPPORTED YET IN PHASE1
#if 0
TRAC_INFO("memory_init: calling centaur_init()");
centaur_init(); //no rc, handles errors internally
Expand Down

0 comments on commit 98cb615

Please sign in to comment.