diff options
author | Doug Gilbert <dgilbert@us.ibm.com> | 2018-04-02 08:18:38 -0500 |
---|---|---|
committer | Martha Broyles <mbroyles@us.ibm.com> | 2018-04-04 15:47:18 -0400 |
commit | 1bf5605f1d80899f0f649fef365fb77f2f5607ba (patch) | |
tree | ade9f097d2fa2869e7bb8778deaf279a84c2e135 /src/occ_405/cent | |
parent | d16e7d09c78dc3210071194d982a9c0c55103be3 (diff) | |
download | talos-occ-1bf5605f1d80899f0f649fef365fb77f2f5607ba.tar.gz talos-occ-1bf5605f1d80899f0f649fef365fb77f2f5607ba.zip |
OCC Centaur disable deadman timer and clean up code
Change-Id: I7d79dd2112de2e28f9b748add6626b231ff236bb
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56660
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Andres A. Lugo-Reyes <aalugore@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Diffstat (limited to 'src/occ_405/cent')
-rwxr-xr-x | src/occ_405/cent/centaur_control.c | 23 | ||||
-rwxr-xr-x | src/occ_405/cent/centaur_data.c | 7 |
2 files changed, 9 insertions, 21 deletions
diff --git a/src/occ_405/cent/centaur_control.c b/src/occ_405/cent/centaur_control.c index 534aa9e..e5f37ef 100755 --- a/src/occ_405/cent/centaur_control.c +++ b/src/occ_405/cent/centaur_control.c @@ -62,8 +62,7 @@ typedef enum { NM_THROTTLE_MBA01 = 0, NM_THROTTLE_MBA23 = 1, - MBS_THROTTLE_SYNC = 2, - NUM_CENT_THROTTLE_SCOMS = 3, + NUM_CENT_THROTTLE_SCOMS = 2, } eCentaurThrottleRegs; @@ -287,7 +286,6 @@ bool centaur_control( memory_control_task_t * i_memControlTask ) /// Set up Centuar Scom Registers - array of Scoms /// [0]: N/M Throttle MBA01 /// [1]: N/M Throttle MBA23 - /// [2]: MB SYNC //only write to MBA01 if configured if(MBA_CONFIGURED(l_cent, 0)) @@ -321,20 +319,9 @@ bool centaur_control( memory_control_task_t * i_memControlTask ) G_centaurThrottle[NM_THROTTLE_MBA23].commandType = CENTAUR_SCOM_NOP; } - - /// [2]: Set up the SYNC - /// - /// 0:7 select mask of MCS units - /// 8:15 select the sync type (12 = N/M throttle) - /// 57:63 must be zeros to address DW0 in cacheline - //G_centaurThrottle[MBS_THROTTLE_SYNC].commandType = CENTAUR_SCOM_NOP; - G_centaurThrottle[MBS_THROTTLE_SYNC].commandType = CENTAUR_SCOM_CENTAUR_SYNC_ALL; - G_centaurThrottle[MBS_THROTTLE_SYNC].data = CENTAUR_RESET_N_M_THROTTLE_COUNTER_SYNC | - CENTAUR_MYSTERY_SYNC; //This is the "PC" sync bit - /// Set up GPE parameters l_parms->scomList = G_centaurThrottle; - l_parms->entries = 2; + l_parms->entries = NUM_CENT_THROTTLE_SCOMS; l_parms->error.ffdc = 0; // Update the last sent throttle value, this will get @@ -415,7 +402,7 @@ void centaur_control_init( void ) if( l_rc_gpe ) { - //If fail to create pore flex object then there is a problem. + //If fail to create gpe request then there is a problem. TRAC_ERR("centaur_control_init: Failed to initialize centaur control task [l_rc_gpe=0x%x]", l_rc_gpe); /* @ @@ -424,13 +411,13 @@ void centaur_control_init( void ) * @reasoncode SSX_GENERIC_FAILURE * @userdata1 l_rc_gpe - Return code of failing function * @userdata2 0 - * @userdata4 ERC_CENTAUR_PORE_FLEX_CREATE_FAILURE + * @userdata4 ERC_CENTAUR_GPE_REQUEST_CREATE_FAILURE * @devdesc Failed to initialize GPE routine */ l_err = createErrl( CENTAUR_INIT_MOD, //modId SSX_GENERIC_FAILURE, //reasoncode - ERC_CENTAUR_PORE_FLEX_CREATE_FAILURE, //Extended reason code + ERC_CENTAUR_GPE_REQUEST_CREATE_FAILURE, //Extended reason code ERRL_SEV_PREDICTIVE, //Severity NULL, //Trace Buf DEFAULT_TRACE_SIZE, //Trace Size diff --git a/src/occ_405/cent/centaur_data.c b/src/occ_405/cent/centaur_data.c index 4228c03..9ee60b0 100755 --- a/src/occ_405/cent/centaur_data.c +++ b/src/occ_405/cent/centaur_data.c @@ -838,13 +838,13 @@ void centaur_data( void ) * @reasoncode SSX_GENERIC_FAILURE * @userdata1 rc - Return code of failing function * @userdata2 0 - * @userdata4 ERC_CENTAUR_PORE_FLEX_SCHEDULE_FAILURE + * @userdata4 ERC_CENTAUR_GPE_REQUEST_SCHEDULE_FAILURE * @devdesc Failed to get centaur data */ l_err = createErrl( CENT_TASK_DATA_MOD, //modId SSX_GENERIC_FAILURE, //reasoncode - ERC_CENTAUR_PORE_FLEX_SCHEDULE_FAILURE, //Extended reason code + ERC_CENTAUR_GPE_REQUEST_SCHEDULE_FAILURE, //Extended reason code ERRL_SEV_PREDICTIVE, //Severity NULL, //Trace Buf DEFAULT_TRACE_SIZE, //Trace Size @@ -1065,7 +1065,8 @@ void centaur_init( void ) L_scomList[0].mask = l_mbscfg.value; //set up the data bits - l_mbscfg.fields.occ_deadman_timer_sel = CENT_DEADMAN_TIMER_2SEC; + // TODO RTC 190643 disable until phyp has centaur support + l_mbscfg.fields.occ_deadman_timer_sel = 0; // CENT_DEADMAN_TIMER_2SEC; L_scomList[0].data = l_mbscfg.value; /// Set up Centaur Scom Registers - array of Scoms |