net/sfc/base: add 1.3V voltage and current sensors

Signed-off-by: Andy Moreton <amoreton@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>

diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 33e7875..3f86213 100644 (file)
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -627,7 +627,7 @@ efx_mon_init(
 #define        EFX_MON_STATS_PAGE_SIZE 0x100
 #define        EFX_MON_MASK_ELEMENT_SIZE 32
 
-/* START MKCONFIG GENERATED MonitorHeaderStatsBlock fcc1b6748432e1ac */
+/* START MKCONFIG GENERATED MonitorHeaderStatsBlock 400fdb0517af1fca */
 typedef enum efx_mon_stat_e {
        EFX_MON_STAT_2_5V,
        EFX_MON_STAT_VCCP1,
@@ -710,6 +710,8 @@ typedef enum efx_mon_stat_e {
        EFX_MON_STAT_I2V5,
        EFX_MON_STAT_I3V3,
        EFX_MON_STAT_I12V0,
+       EFX_MON_STAT_1_3V,
+       EFX_MON_STAT_I1V3,
        EFX_MON_NSTATS
 } efx_mon_stat_t;
 

diff --git a/drivers/net/sfc/base/efx_mon.c b/drivers/net/sfc/base/efx_mon.c
index ac8d7e9..9fc268e 100644 (file)
--- a/drivers/net/sfc/base/efx_mon.c
+++ b/drivers/net/sfc/base/efx_mon.c
@@ -99,7 +99,7 @@ fail1:
 
 #if EFSYS_OPT_NAMES
 
-/* START MKCONFIG GENERATED MonitorStatNamesBlock a808884b01444549 */
+/* START MKCONFIG GENERATED MonitorStatNamesBlock 8150a068198c0f96 */
 static const char * const __mon_stat_name[] = {
        "value_2_5v",
        "value_vccp1",
@@ -182,6 +182,8 @@ static const char * const __mon_stat_name[] = {
        "i2v5",
        "i3v3",
        "i12v0",
+       "1v3",
+       "i1v3",
 };
 
 /* END MKCONFIG GENERATED MonitorStatNamesBlock */

diff --git a/drivers/net/sfc/base/mcdi_mon.c b/drivers/net/sfc/base/mcdi_mon.c
index 0e44577..940bd02 100644 (file)
--- a/drivers/net/sfc/base/mcdi_mon.c
+++ b/drivers/net/sfc/base/mcdi_mon.c
@@ -135,6 +135,10 @@ static const struct mcdi_sensor_map_s {
        STAT(Px, BOARD_BACK_TEMP),      /* 0x50 BOARD_BACK_TEMP */
        STAT(Px, I1V8),                 /* 0x51 IN_I1V8 */
        STAT(Px, I2V5),                 /* 0x52 IN_I2V5 */
+       STAT(Px, I3V3),                 /* 0x53 IN_I3V3 */
+       STAT(Px, I12V0),                /* 0x54 IN_I12V0 */
+       STAT(Px, 1_3V),                 /* 0x55 IN_1V3 */
+       STAT(Px, I1V3),                 /* 0x56 IN_I1V3 */
 };
 
 #define        MCDI_STATIC_SENSOR_ASSERT(_field)                               \