diff options
| author | William Bryan <wilbryan@us.ibm.com> | 2016-09-14 17:06:18 -0500 |
|---|---|---|
| committer | William A. Bryan <wilbryan@us.ibm.com> | 2016-09-29 18:34:10 -0400 |
| commit | 97426a94d4d583a7ae6dca406462d52b2aff7660 (patch) | |
| tree | 2b178882f5b202f9202bf9e347c82f8f1f94dc1a /src/occ_405/rtls | |
| parent | a57f623c26bdf3889703ed63334745c966c6096d (diff) | |
| download | talos-occ-97426a94d4d583a7ae6dca406462d52b2aff7660.tar.gz talos-occ-97426a94d4d583a7ae6dca406462d52b2aff7660.zip | |
Collect Nest DTS Average
RTC:133842
Change-Id: I565a6f2e848652b7eddd3b319f9c3a411913074a
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29804
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Diffstat (limited to 'src/occ_405/rtls')
| -rwxr-xr-x | src/occ_405/rtls/rtls.h | 15 | ||||
| -rwxr-xr-x | src/occ_405/rtls/rtls_tables.c | 8 |
2 files changed, 14 insertions, 9 deletions
diff --git a/src/occ_405/rtls/rtls.h b/src/occ_405/rtls/rtls.h index 56849fb..a408b19 100755 --- a/src/occ_405/rtls/rtls.h +++ b/src/occ_405/rtls/rtls.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER OnChipController Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2015 */ +/* Contributors Listed Below - COPYRIGHT 2011,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -53,13 +53,14 @@ typedef enum { TASK_ID_DCOM_TX_OUTBX, TASK_ID_MISC_405_CHECKS, // Miscellaneous checks to be done by 405 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_DIMM_SM, // DIMM State Machine -// TASK_ID_MEM_DEADMAN, // Memory deadman timer + 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_DIMM_SM, // DIMM State Machine +// TASK_ID_MEM_DEADMAN, // Memory deadman timer TASK_ID_MEMORY_CONTROL, // Memory (centaur/dimm) control task + TASK_ID_NEST_DTS, TASK_END // This must always be the last enum in this list, // so that TASK_END always equals the last task ID + 1. } task_id_t; diff --git a/src/occ_405/rtls/rtls_tables.c b/src/occ_405/rtls/rtls_tables.c index 00ccf3d..ef42d90 100755 --- a/src/occ_405/rtls/rtls_tables.c +++ b/src/occ_405/rtls/rtls_tables.c @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/occ/rtls/rtls_tables.c $ */ +/* $Source: src/occ_405/rtls/rtls_tables.c $ */ /* */ /* OpenPOWER OnChipController Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2015 */ +/* Contributors Listed Below - COPYRIGHT 2011,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -50,6 +50,8 @@ #define FLAGS_LOW_CORES_DATA RTL_FLAG_MSTR | RTL_FLAG_NOTMSTR | RTL_FLAG_OBS | RTL_FLAG_ACTIVE | RTL_FLAG_MSTR_READY | RTL_FLAG_NO_APSS | RTL_FLAG_RUN | RTL_FLAG_APSS_NOT_INITD #define FLAGS_HIGH_CORES_DATA RTL_FLAG_MSTR | RTL_FLAG_NOTMSTR | RTL_FLAG_OBS | RTL_FLAG_ACTIVE | RTL_FLAG_MSTR_READY | RTL_FLAG_NO_APSS | RTL_FLAG_RUN | RTL_FLAG_APSS_NOT_INITD +#define FLAGS_NEST_DTS RTL_FLAG_MSTR | RTL_FLAG_NOTMSTR | RTL_FLAG_OBS | RTL_FLAG_ACTIVE | RTL_FLAG_MSTR_READY | RTL_FLAG_NO_APSS | RTL_FLAG_RUN | RTL_FLAG_APSS_NOT_INITD + // Start out with memory tasks not running, then start during transition to observation in memory_init() #define FLAGS_MEMORY_DATA RTL_FLAG_NONE #define FLAGS_MEMORY_CONTROL RTL_FLAG_NONE @@ -119,6 +121,7 @@ task_t G_task_table[TASK_END] = { // TEMP -- NOT YET IMPLEMENTED // { FLAGS_MEM_DEADMAN, task_mem_deadman, NULL }, // TASK_ID_MEM_DEADMAN { FLAGS_MEMORY_CONTROL, task_memory_control, (void *) &G_memory_control_task }, // TASK_ID_MEMORY_CONTROL + { FLAGS_NEST_DTS, task_nest_dts, NULL }, }; const uint8_t G_tick0_seq[] = { @@ -184,6 +187,7 @@ const uint8_t G_tick2_seq[] = { const uint8_t G_tick3_seq[] = { TASK_ID_APSS_START, + TASK_ID_NEST_DTS, //TASK_ID_GPU_SM, TASK_ID_APSS_CONT, TASK_ID_CORE_DATA_HIGH, |
