svn commit: r299406 - head/sys/dev/sfxge/common
Andrew Rybchenko
arybchik at FreeBSD.org
Wed May 11 06:19:54 UTC 2016
Author: arybchik
Date: Wed May 11 06:19:53 2016
New Revision: 299406
URL: https://svnweb.freebsd.org/changeset/base/299406
Log:
sfxge(4): add new Emerald board sensors to common code
Submitted by: Andy Moreton <amoreton at solarflare.com>
Sponsored by: Solarflare Communications, Inc.
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D6292
Modified:
head/sys/dev/sfxge/common/efx.h
head/sys/dev/sfxge/common/efx_mon.c
head/sys/dev/sfxge/common/mcdi_mon.c
Modified: head/sys/dev/sfxge/common/efx.h
==============================================================================
--- head/sys/dev/sfxge/common/efx.h Wed May 11 06:19:05 2016 (r299405)
+++ head/sys/dev/sfxge/common/efx.h Wed May 11 06:19:53 2016 (r299406)
@@ -566,7 +566,7 @@ efx_mon_init(
#define EFX_MON_STATS_PAGE_SIZE 0x100
#define EFX_MON_MASK_ELEMENT_SIZE 32
-/* START MKCONFIG GENERATED MonitorHeaderStatsBlock c09b13f732431f23 */
+/* START MKCONFIG GENERATED MonitorHeaderStatsBlock 5d4ee5185e419abe */
typedef enum efx_mon_stat_e {
EFX_MON_STAT_2_5V,
EFX_MON_STAT_VCCP1,
@@ -643,6 +643,8 @@ typedef enum efx_mon_stat_e {
EFX_MON_STAT_PHY0_VCC,
EFX_MON_STAT_PHY1_VCC,
EFX_MON_STAT_CONTROLLER_TDIODE_TEMP,
+ EFX_MON_STAT_BOARD_FRONT_TEMP,
+ EFX_MON_STAT_BOARD_BACK_TEMP,
EFX_MON_NSTATS
} efx_mon_stat_t;
Modified: head/sys/dev/sfxge/common/efx_mon.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_mon.c Wed May 11 06:19:05 2016 (r299405)
+++ head/sys/dev/sfxge/common/efx_mon.c Wed May 11 06:19:53 2016 (r299406)
@@ -149,7 +149,7 @@ fail1:
#if EFSYS_OPT_NAMES
-/* START MKCONFIG GENERATED MonitorStatNamesBlock 01ee3ea01f23a0c4 */
+/* START MKCONFIG GENERATED MonitorStatNamesBlock 31f437eafb0b0437 */
static const char *__mon_stat_name[] = {
"value_2_5v",
"value_vccp1",
@@ -226,6 +226,8 @@ static const char *__mon_stat_name[] =
"phy0_vcc",
"phy1_vcc",
"controller_tdiode_temp",
+ "board_front_temp",
+ "board_back_temp",
};
/* END MKCONFIG GENERATED MonitorStatNamesBlock */
Modified: head/sys/dev/sfxge/common/mcdi_mon.c
==============================================================================
--- head/sys/dev/sfxge/common/mcdi_mon.c Wed May 11 06:19:05 2016 (r299405)
+++ head/sys/dev/sfxge/common/mcdi_mon.c Wed May 11 06:19:53 2016 (r299406)
@@ -155,6 +155,8 @@ static const struct mcdi_sensor_map_s {
STAT(Px, PHY0_VCC), /* 0x4c PHY0_VCC */
STAT(Px, PHY1_VCC), /* 0x4d PHY1_VCC */
STAT(Px, CONTROLLER_TDIODE_TEMP), /* 0x4e CONTROLLER_TDIODE_TEMP */
+ STAT(Px, BOARD_FRONT_TEMP), /* 0x4f BOARD_FRONT_TEMP */
+ STAT(Px, BOARD_BACK_TEMP), /* 0x50 BOARD_BACK_TEMP */
};
#define MCDI_STATIC_SENSOR_ASSERT(_field) \
More information about the svn-src-head
mailing list