svn commit: r280551 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Wed Mar 25 10:54:23 2015
New Revision: 280551
URL: https://svnweb.freebsd.org/changeset/base/280551

Log:
  MFC: 279076
  
  sfxge: regenerate sensor map
  
  Add Florence R7 and Modena sensors.
  
  Sponsored by:   Solarflare Communications, Inc.
  Approved by:    gnn (mentor)

Modified:
  stable/10/sys/dev/sfxge/common/efx.h
  stable/10/sys/dev/sfxge/common/efx_mon.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efx.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx.h	Wed Mar 25 10:53:27 2015	(r280550)
+++ stable/10/sys/dev/sfxge/common/efx.h	Wed Mar 25 10:54:23 2015	(r280551)
@@ -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;
 

Modified: stable/10/sys/dev/sfxge/common/efx_mon.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_mon.c	Wed Mar 25 10:53:27 2015	(r280550)
+++ stable/10/sys/dev/sfxge/common/efx_mon.c	Wed Mar 25 10:54:23 2015	(r280551)
@@ -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_sta
 	"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 */