summaryrefslogtreecommitdiffstats
path: root/src/occ_405/sensor
diff options
context:
space:
mode:
Diffstat (limited to 'src/occ_405/sensor')
-rwxr-xr-xsrc/occ_405/sensor/sensor.h1
-rwxr-xr-xsrc/occ_405/sensor/sensor_enum.h18
-rwxr-xr-xsrc/occ_405/sensor/sensor_info.c16
-rwxr-xr-xsrc/occ_405/sensor/sensor_table.c39
4 files changed, 29 insertions, 45 deletions
diff --git a/src/occ_405/sensor/sensor.h b/src/occ_405/sensor/sensor.h
index 9cda3c1..406021f 100755
--- a/src/occ_405/sensor/sensor.h
+++ b/src/occ_405/sensor/sensor.h
@@ -73,6 +73,7 @@ typedef enum
AMEC_SENSOR_TYPE_FREQ = 0x0040,
AMEC_SENSOR_TYPE_POWER = 0x0080,
AMEC_SENSOR_TYPE_PERF = 0x0200,
+ AMEC_SENSOR_TYPE_WOF = 0x0400,
AMEC_SENSOR_TYPE_ALL = 0xffff,
}AMEC_SENSOR_TYPE;
// Changes to sensor type bits would require changes to select sensor groups command
diff --git a/src/occ_405/sensor/sensor_enum.h b/src/occ_405/sensor/sensor_enum.h
index 4abda7b..80b8ea7 100755
--- a/src/occ_405/sensor/sensor_enum.h
+++ b/src/occ_405/sensor/sensor_enum.h
@@ -719,17 +719,13 @@ enum e_gsid
// Partition Sensors
// ------------------------------------------------------
UTILSLCG000,
- UTILSLCG001,
- UTILSLCG002,
- UTILSLCG003,
- UTILSLCG004,
- UTILSLCG005,
- UTILSLCG006,
- UTILSLCG007,
- UTILSLCG008,
- UTILSLCG009,
- UTILSLCG010,
- UTILSLCG011,
+
+ // ------------------------------------------------------
+ // WOF Sensors
+ // ------------------------------------------------------
+ CEFFVDDRATIO,
+ CEFFVDNRATIO,
+ VRATIO,
// ------------------------------------------------------
// END of Sensor List (this must be last entry)
diff --git a/src/occ_405/sensor/sensor_info.c b/src/occ_405/sensor/sensor_info.c
index 812c13d..8013e39 100755
--- a/src/occ_405/sensor/sensor_info.c
+++ b/src/occ_405/sensor/sensor_info.c
@@ -387,17 +387,11 @@ const sensor_info_t G_sensor_info[] =
/* ==PartSummarySensors== NameString Units Type Location Number Freq ScaleFactor */
SENSOR_INFO_T_ENTRY( UTILSLCG000, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP_SCALE_0_16384),
- SENSOR_INFO_T_ENTRY( UTILSLCG001, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP_SCALE_0_16384),
- SENSOR_INFO_T_ENTRY( UTILSLCG002, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP_SCALE_0_16384),
- SENSOR_INFO_T_ENTRY( UTILSLCG003, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP_SCALE_0_16384),
- SENSOR_INFO_T_ENTRY( UTILSLCG004, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP_SCALE_0_16384),
- SENSOR_INFO_T_ENTRY( UTILSLCG005, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP_SCALE_0_16384),
- SENSOR_INFO_T_ENTRY( UTILSLCG006, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP_SCALE_0_16384),
- SENSOR_INFO_T_ENTRY( UTILSLCG007, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP_SCALE_0_16384),
- SENSOR_INFO_T_ENTRY( UTILSLCG008, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP_SCALE_0_16384),
- SENSOR_INFO_T_ENTRY( UTILSLCG009, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP_SCALE_0_16384),
- SENSOR_INFO_T_ENTRY( UTILSLCG010, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP_SCALE_0_16384),
- SENSOR_INFO_T_ENTRY( UTILSLCG011, "%\0", AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_LPAR, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP_SCALE_0_16384),
+
+ /* ==WOF Sensors== NameString Units Type Location Number Freq ScaleFactor */
+ SENSOR_INFO_T_ENTRY( CEFFVDDRATIO, "%\0", AMEC_SENSOR_TYPE_WOF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1,-2) ),
+ SENSOR_INFO_T_ENTRY( CEFFVDNRATIO, "%\0", AMEC_SENSOR_TYPE_WOF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1,-2) ),
+ SENSOR_INFO_T_ENTRY( VRATIO, " \0", AMEC_SENSOR_TYPE_WOF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_EVERY_8TH_TICK_HZ, AMEFP( 1, 0) ),
};
// Cause a compile error if we don't have all the sensors in the enum in the initialization list.
diff --git a/src/occ_405/sensor/sensor_table.c b/src/occ_405/sensor/sensor_table.c
index 295ef36..d7ca9b5 100755
--- a/src/occ_405/sensor/sensor_table.c
+++ b/src/occ_405/sensor/sensor_table.c
@@ -434,20 +434,17 @@ const sensor_ptr_t G_amec_sensor_list[] =
SENSOR_PTR(TEMPGPU2MEM, &g_amec_sys.gpu[2].tempgpumem),
// ------------------------------------------------------
- // Partition Sensors
+ // Partition Sensors -- no PLPM support only 1 core group sensor
+ // additional sensors must be added if AMEC_PART_MAX_PART is ever changed to be more than 1
// ------------------------------------------------------
SENSOR_PTR( UTILSLCG000, &g_amec_sys.part_config.part_list[0].util2msslack),
- SENSOR_PTR( UTILSLCG001, &g_amec_sys.part_config.part_list[1].util2msslack),
- SENSOR_PTR( UTILSLCG002, &g_amec_sys.part_config.part_list[2].util2msslack),
- SENSOR_PTR( UTILSLCG003, &g_amec_sys.part_config.part_list[3].util2msslack),
- SENSOR_PTR( UTILSLCG004, &g_amec_sys.part_config.part_list[4].util2msslack),
- SENSOR_PTR( UTILSLCG005, &g_amec_sys.part_config.part_list[5].util2msslack),
- SENSOR_PTR( UTILSLCG006, &g_amec_sys.part_config.part_list[6].util2msslack),
- SENSOR_PTR( UTILSLCG007, &g_amec_sys.part_config.part_list[7].util2msslack),
- SENSOR_PTR( UTILSLCG008, &g_amec_sys.part_config.part_list[8].util2msslack),
- SENSOR_PTR( UTILSLCG009, &g_amec_sys.part_config.part_list[9].util2msslack),
- SENSOR_PTR( UTILSLCG010, &g_amec_sys.part_config.part_list[10].util2msslack),
- SENSOR_PTR( UTILSLCG011, &g_amec_sys.part_config.part_list[11].util2msslack),
+
+ // ------------------------------------------------------
+ // WOF Sensors
+ // ------------------------------------------------------
+ SENSOR_PTR( CEFFVDDRATIO, &g_amec_sys.wof_sensors.ceff_ratio_vdd_sensor),
+ SENSOR_PTR( CEFFVDNRATIO, &g_amec_sys.wof_sensors.ceff_ratio_vdn_sensor),
+ SENSOR_PTR( VRATIO, &g_amec_sys.wof_sensors.v_ratio_sensor),
};
STATIC_ASSERT( (NUMBER_OF_SENSORS_IN_LIST != (sizeof(G_amec_sensor_list)/sizeof(sensor_ptr_t))) );
@@ -636,17 +633,13 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
// Partition Sensors
// ------------------------------------------------------
MINI_SENSOR_PTR( UTILSLCG000, NULL),
- MINI_SENSOR_PTR( UTILSLCG001, NULL),
- MINI_SENSOR_PTR( UTILSLCG002, NULL),
- MINI_SENSOR_PTR( UTILSLCG003, NULL),
- MINI_SENSOR_PTR( UTILSLCG004, NULL),
- MINI_SENSOR_PTR( UTILSLCG005, NULL),
- MINI_SENSOR_PTR( UTILSLCG006, NULL),
- MINI_SENSOR_PTR( UTILSLCG007, NULL),
- MINI_SENSOR_PTR( UTILSLCG008, NULL),
- MINI_SENSOR_PTR( UTILSLCG009, NULL),
- MINI_SENSOR_PTR( UTILSLCG010, NULL),
- MINI_SENSOR_PTR( UTILSLCG011, NULL),
+
+ // ------------------------------------------------------
+ // WOF Sensors
+ // ------------------------------------------------------
+ SENSOR_PTR( CEFFVDDRATIO, NULL),
+ SENSOR_PTR( CEFFVDNRATIO, NULL),
+ SENSOR_PTR( VRATIO, NULL),
};
STATIC_ASSERT( (NUMBER_OF_SENSORS_IN_LIST != (sizeof(G_amec_mini_sensor_list)/sizeof(uint16_t *))) );
STATIC_ASSERT( (MAX_AMEC_SENSORS < (sizeof(G_amec_mini_sensor_list)/sizeof(uint16_t *))) );
OpenPOWER on IntegriCloud