diff options
Diffstat (limited to 'src/occ_405/sensor')
-rwxr-xr-x | src/occ_405/sensor/sensor_enum.h | 173 | ||||
-rwxr-xr-x | src/occ_405/sensor/sensor_info.c | 16 | ||||
-rwxr-xr-x | src/occ_405/sensor/sensor_table.c | 27 |
3 files changed, 3 insertions, 213 deletions
diff --git a/src/occ_405/sensor/sensor_enum.h b/src/occ_405/sensor/sensor_enum.h index d2a0aed..481e912 100755 --- a/src/occ_405/sensor/sensor_enum.h +++ b/src/occ_405/sensor/sensor_enum.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER OnChipController Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2018 */ +/* Contributors Listed Below - COPYRIGHT 2011,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -489,24 +489,6 @@ enum e_gsid MEMSPSTATM6, MEMSPSTATM7, - MIRCM0, - MIRCM1, - MIRCM2, - MIRCM3, - MIRCM4, - MIRCM5, - MIRCM6, - MIRCM7, - - MLP2M0, - MLP2M1, - MLP2M2, - MLP2M3, - MLP2M4, - MLP2M5, - MLP2M6, - MLP2M7, - // Individual DIMM temperatures (NIMBUS) TEMPDIMM00, TEMPDIMM01, @@ -549,159 +531,6 @@ enum e_gsid // ------------------------------------------------------ // Centaur Sensors - 8 MemC/Proc - 1 Cent/MemC - 2 PP/Cent // ------------------------------------------------------ - MACM0C0P0, - MACM0C0P1, - MACM1C0P0, - MACM1C0P1, - MACM2C0P0, - MACM2C0P1, - MACM3C0P0, - MACM3C0P1, - MACM4C0P0, - MACM4C0P1, - MACM5C0P0, - MACM5C0P1, - MACM6C0P0, - MACM6C0P1, - MACM7C0P0, - MACM7C0P1, - - MPUM0C0P0, - MPUM0C0P1, - MPUM1C0P0, - MPUM1C0P1, - MPUM2C0P0, - MPUM2C0P1, - MPUM3C0P0, - MPUM3C0P1, - MPUM4C0P0, - MPUM4C0P1, - MPUM5C0P0, - MPUM5C0P1, - MPUM6C0P0, - MPUM6C0P1, - MPUM7C0P0, - MPUM7C0P1, - - MIRBM0C0P0, - MIRBM0C0P1, - MIRBM1C0P0, - MIRBM1C0P1, - MIRBM2C0P0, - MIRBM2C0P1, - MIRBM3C0P0, - MIRBM3C0P1, - MIRBM4C0P0, - MIRBM4C0P1, - MIRBM5C0P0, - MIRBM5C0P1, - MIRBM6C0P0, - MIRBM6C0P1, - MIRBM7C0P0, - MIRBM7C0P1, - - MIRLM0C0P0, - MIRLM0C0P1, - MIRLM1C0P0, - MIRLM1C0P1, - MIRLM2C0P0, - MIRLM2C0P1, - MIRLM3C0P0, - MIRLM3C0P1, - MIRLM4C0P0, - MIRLM4C0P1, - MIRLM5C0P0, - MIRLM5C0P1, - MIRLM6C0P0, - MIRLM6C0P1, - MIRLM7C0P0, - MIRLM7C0P1, - - MIRMM0C0P0, - MIRMM0C0P1, - MIRMM1C0P0, - MIRMM1C0P1, - MIRMM2C0P0, - MIRMM2C0P1, - MIRMM3C0P0, - MIRMM3C0P1, - MIRMM4C0P0, - MIRMM4C0P1, - MIRMM5C0P0, - MIRMM5C0P1, - MIRMM6C0P0, - MIRMM6C0P1, - MIRMM7C0P0, - MIRMM7C0P1, - - MIRHM0C0P0, - MIRHM0C0P1, - MIRHM1C0P0, - MIRHM1C0P1, - MIRHM2C0P0, - MIRHM2C0P1, - MIRHM3C0P0, - MIRHM3C0P1, - MIRHM4C0P0, - MIRHM4C0P1, - MIRHM5C0P0, - MIRHM5C0P1, - MIRHM6C0P0, - MIRHM6C0P1, - MIRHM7C0P0, - MIRHM7C0P1, - - MTSM0C0P0, - MTSM0C0P1, - MTSM1C0P0, - MTSM1C0P1, - MTSM2C0P0, - MTSM2C0P1, - MTSM3C0P0, - MTSM3C0P1, - MTSM4C0P0, - MTSM4C0P1, - MTSM5C0P0, - MTSM5C0P1, - MTSM6C0P0, - MTSM6C0P1, - MTSM7C0P0, - MTSM7C0P1, - - M4RDM0C0P0, - M4RDM0C0P1, - M4RDM1C0P0, - M4RDM1C0P1, - M4RDM2C0P0, - M4RDM2C0P1, - M4RDM3C0P0, - M4RDM3C0P1, - M4RDM4C0P0, - M4RDM4C0P1, - M4RDM5C0P0, - M4RDM5C0P1, - M4RDM6C0P0, - M4RDM6C0P1, - M4RDM7C0P0, - M4RDM7C0P1, - - M4WRM0C0P0, - M4WRM0C0P1, - M4WRM1C0P0, - M4WRM1C0P1, - M4WRM2C0P0, - M4WRM2C0P1, - M4WRM3C0P0, - M4WRM3C0P1, - M4WRM4C0P0, - M4WRM4C0P1, - M4WRM5C0P0, - M4WRM5C0P1, - M4WRM6C0P0, - M4WRM6C0P1, - M4WRM7C0P0, - M4WRM7C0P1, - TEMPCENT, TEMPDIMMTHRM, diff --git a/src/occ_405/sensor/sensor_info.c b/src/occ_405/sensor/sensor_info.c index b622608..d0f4ea1 100755 --- a/src/occ_405/sensor/sensor_info.c +++ b/src/occ_405/sensor/sensor_info.c @@ -5,7 +5,7 @@ /* */ /* OpenPOWER OnChipController Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2018 */ +/* Contributors Listed Below - COPYRIGHT 2011,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -353,26 +353,12 @@ const sensor_info_t G_sensor_info[] = SENS_MEMC_ENTRY_SET( MWRM, "GBs\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP(128, -5) ), SENS_MEMC_ENTRY_SET( MEMSPM, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, -1) ), SENS_MEMC_ENTRY_SET( MEMSPSTATM, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, -1) ), - SENS_MEMC_ENTRY_SET( MIRCM, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, 0) ), - SENS_MEMC_ENTRY_SET( MLP2M, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, 0) ), SENS_DIMM_ENTRY_SET( TEMPDIMM, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_128TH_TICK_HZ, AMEFP( 1, 0) ), SENS_MEMC_ENTRY_SET( TEMPDIMMAXM, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, 0) ), SENS_MEMC_ENTRY_SET( LOCDIMMAXM, "loc\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, 0) ), SENSOR_INFO_T_ENTRY( MEMPWRTHROT, "#\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_TICK_HZ, AMEFP( 1, 0) ), SENSOR_INFO_T_ENTRY( MEMOTTHROT, "#\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_64TH_TICK_HZ, AMEFP( 1, 0) ), - /* ==CentaurSensors== NameString Units Type Location Number Freq ScaleFactor */ - SEN_CENTR_ENTRY_SET( MACM, "rps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( MPUM, "rps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( MIRBM, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( MIRLM, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( MIRMM, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( MIRHM, "eps\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( MTSM, "cnt\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, 0) ), - SEN_CENTR_ENTRY_SET( M4RDM, "GBs\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 128, -5) ), - SEN_CENTR_ENTRY_SET( M4WRM, "GBs\0", AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 128, -5) ), - - /* ==MemSummarySensors== NameString Units Type Location Number Freq ScaleFactor */ SENSOR_INFO_T_ENTRY( TEMPCENT, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, 0) ), SENSOR_INFO_T_ENTRY( TEMPDIMMTHRM, "C\0", AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_MEM, AMEC_SENSOR_NONUM, AMEEFP_EVERY_128TH_TICK_HZ, AMEFP( 1, 0) ), diff --git a/src/occ_405/sensor/sensor_table.c b/src/occ_405/sensor/sensor_table.c index 77f0005..64f40b0 100755 --- a/src/occ_405/sensor/sensor_table.c +++ b/src/occ_405/sensor/sensor_table.c @@ -5,7 +5,7 @@ /* */ /* OpenPOWER OnChipController Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2018 */ +/* Contributors Listed Below - COPYRIGHT 2011,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -401,25 +401,12 @@ const sensor_ptr_t G_amec_sensor_list[] = MEMCONTROL_SENSOR_PTRS(MWRM, &g_amec_sys.proc[0].memctl, mwr), MEMCONTROL_SENSOR_PTRS(MEMSPM, &g_amec_sys.proc[0].memctl, memsp), MEMCONTROL_SENSOR_PTRS(MEMSPSTATM, &g_amec_sys.proc[0].memctl, memspstat), - MEMCONTROL_SENSOR_PTRS(MIRCM, &g_amec_sys.proc[0].memctl, centaur.mirc2ms), - MEMCONTROL_SENSOR_PTRS(MLP2M, &g_amec_sys.proc[0].memctl, centaur.mlp2ms), DIMM_SENSOR_PTRS(TEMPDIMM, &g_amec_sys.proc[0], tempdimm), MEMCONTROL_SENSOR_PTRS(TEMPDIMMAXM, &g_amec_sys.proc[0].memctl, centaur.tempdimmax), MEMCONTROL_SENSOR_PTRS(LOCDIMMAXM, &g_amec_sys.proc[0].memctl, centaur.locdimmax), SENSOR_PTR(MEMPWRTHROT, &g_amec_sys.proc[0].mempwrthrot), SENSOR_PTR(MEMOTTHROT, &g_amec_sys.proc[0].memotthrot), - PORTPAIR_SENSOR_PTRS(MACM, &g_amec_sys.proc[0].memctl, centaur.portpair, mac2ms), - PORTPAIR_SENSOR_PTRS(MPUM, &g_amec_sys.proc[0].memctl, centaur.portpair, mpu2ms), - PORTPAIR_SENSOR_PTRS(MIRBM, &g_amec_sys.proc[0].memctl, centaur.portpair, mirb2ms), - PORTPAIR_SENSOR_PTRS(MIRLM, &g_amec_sys.proc[0].memctl, centaur.portpair, mirl2ms), - PORTPAIR_SENSOR_PTRS(MIRMM, &g_amec_sys.proc[0].memctl, centaur.portpair, mirm2ms), - PORTPAIR_SENSOR_PTRS(MIRHM, &g_amec_sys.proc[0].memctl, centaur.portpair, mirh2ms), - PORTPAIR_SENSOR_PTRS(MTSM, &g_amec_sys.proc[0].memctl, centaur.portpair, mts2ms), - PORTPAIR_SENSOR_PTRS(M4RDM, &g_amec_sys.proc[0].memctl, centaur.portpair, m4rd2ms), - PORTPAIR_SENSOR_PTRS(M4WRM, &g_amec_sys.proc[0].memctl, centaur.portpair, m4wr2ms), - - SENSOR_PTR(TEMPCENT, &g_amec_sys.proc[0].temp2mscent), SENSOR_PTR(TEMPDIMMTHRM, &g_amec_sys.proc[0].tempdimmthrm), @@ -580,8 +567,6 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION = MEMCONTROL_MINI_SENSOR_PTRS(MWRM, &G_dcom_slv_outbox_tx.mwr), MEMCONTROL_MINI_SENSOR_PTRS_NULL(MEMSPM), MEMCONTROL_MINI_SENSOR_PTRS_NULL(MEMSPSTATM), - MEMCONTROL_MINI_SENSOR_PTRS_NULL(MIRCM), - MEMCONTROL_MINI_SENSOR_PTRS_NULL(MLP2M), MINI_SENSOR_PTR( TEMPDIMM00, NULL), MINI_SENSOR_PTR( TEMPDIMM01, NULL), @@ -606,16 +591,6 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION = MINI_SENSOR_PTR( MEMPWRTHROT, NULL), MINI_SENSOR_PTR( MEMOTTHROT, NULL), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MACM), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MPUM), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MIRBM), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MIRLM), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MIRMM), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MIRHM), - PORTPAIR_MINI_SENSOR_PTRS_NULL(MTSM), - PORTPAIR_MINI_SENSOR_PTRS_NULL(M4RDM), - PORTPAIR_MINI_SENSOR_PTRS_NULL(M4WRM), - MINI_SENSOR_PTR( TEMPCENT, &G_dcom_slv_outbox_tx.temp2mscent), MINI_SENSOR_PTR( TEMPDIMMTHRM, &G_dcom_slv_outbox_tx.tempdimmthrm), |