summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarybchik <arybchik@FreeBSD.org>2015-03-25 10:54:23 +0000
committerarybchik <arybchik@FreeBSD.org>2015-03-25 10:54:23 +0000
commitb302acbcb96bb5d637092bb2d8ae477da410aa94 (patch)
tree3ef9a8bca1ac4d5f3872882a7a56de60983b6039
parentbb6987378b2d455e2e2e062919a743858b6d4081 (diff)
downloadFreeBSD-src-b302acbcb96bb5d637092bb2d8ae477da410aa94.zip
FreeBSD-src-b302acbcb96bb5d637092bb2d8ae477da410aa94.tar.gz
MFC: 279076
sfxge: regenerate sensor map Add Florence R7 and Modena sensors. Sponsored by: Solarflare Communications, Inc. Approved by: gnn (mentor)
-rw-r--r--sys/dev/sfxge/common/efx.h16
-rw-r--r--sys/dev/sfxge/common/efx_mon.c16
2 files changed, 30 insertions, 2 deletions
diff --git a/sys/dev/sfxge/common/efx.h b/sys/dev/sfxge/common/efx.h
index 03fd9b1..b3110b5 100644
--- a/sys/dev/sfxge/common/efx.h
+++ b/sys/dev/sfxge/common/efx.h
@@ -459,7 +459,7 @@ efx_mon_init(
#define EFX_MON_STATS_SIZE 0x100
-/* START MKCONFIG GENERATED MonitorHeaderStatsBlock 16a14e61aa4f8d80 */
+/* START MKCONFIG GENERATED MonitorHeaderStatsBlock 58706a378332aeee */
typedef enum efx_mon_stat_e {
EFX_MON_STAT_2_5V,
EFX_MON_STAT_VCCP1,
@@ -477,6 +477,20 @@ typedef enum efx_mon_stat_e {
EFX_MON_STAT_1_2V,
EFX_MON_STAT_1_8V,
EFX_MON_STAT_3_3V,
+ EFX_MON_STAT_1_2VA,
+ EFX_MON_STAT_VREF,
+ EFX_MON_STAT_VAOE,
+ EFX_MON_STAT_AOE_TEMP,
+ EFX_MON_STAT_PSU_AOE_TEMP,
+ EFX_MON_STAT_PSU_TEMP,
+ EFX_MON_STAT_FAN0,
+ EFX_MON_STAT_FAN1,
+ EFX_MON_STAT_FAN2,
+ EFX_MON_STAT_FAN3,
+ EFX_MON_STAT_FAN4,
+ EFX_MON_STAT_VAOE_IN,
+ EFX_MON_STAT_IAOE,
+ EFX_MON_STAT_IAOE_IN,
EFX_MON_NSTATS
} efx_mon_stat_t;
diff --git a/sys/dev/sfxge/common/efx_mon.c b/sys/dev/sfxge/common/efx_mon.c
index 5d397c3..dc2e256 100644
--- a/sys/dev/sfxge/common/efx_mon.c
+++ b/sys/dev/sfxge/common/efx_mon.c
@@ -195,7 +195,7 @@ fail1:
#if EFSYS_OPT_NAMES
-/* START MKCONFIG GENERATED MonitorStatNamesBlock 08518fd1fb4e2612 */
+/* START MKCONFIG GENERATED MonitorStatNamesBlock 89ff37f1d74ad8b3 */
static const char __cs * __cs __mon_stat_name[] = {
"value_2_5v",
"value_vccp1",
@@ -213,6 +213,20 @@ static const char __cs * __cs __mon_stat_name[] = {
"1_2v",
"1_8v",
"3_3v",
+ "1_2va",
+ "vref",
+ "vaoe",
+ "aoe_temperature",
+ "psu_aoe_temperature",
+ "psu_temperature",
+ "fan0",
+ "fan1",
+ "fan2",
+ "fan3",
+ "fan4",
+ "vaoe_in",
+ "iaoe",
+ "iaoe_in",
};
/* END MKCONFIG GENERATED MonitorStatNamesBlock */
OpenPOWER on IntegriCloud