d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/sfc/base: refactor monitors support

Browse Source 
Remove obsolete monitor types since Falcon SFN4000 series adapters
no longer supported by libefx.
Rename MCDI monitors to be consistent with YML.
The code may be simplified and generalized since only MCDI monitors
remain.

Signed-off-by: Martin Harvey <mharvey@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
This commit is contained in:
Martin Harvey 2018-09-10 10:33:12 +01:00 committed by Ferruh Yigit
parent f933b46a0a
commit aa0bac03e9
3 changed files with 696 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
drivers/net/sfc/base/efx.h
View File

@ -662,77 +662,74 @@ efx_mon_init(
#define EFX_MON_STATS_PAGE_SIZE 0x100
#define EFX_MON_MASK_ELEMENT_SIZE 32
/* START MKCONFIG GENERATED MonitorHeaderStatsBlock 400fdb0517af1fca */
/* START MKCONFIG GENERATED MonitorHeaderStatsBlock 78b65c8d5af9747b */
typedef enum efx_mon_stat_e {
EFX_MON_STAT_2_5V,
EFX_MON_STAT_VCCP1,
EFX_MON_STAT_VCC,
EFX_MON_STAT_5V,
EFX_MON_STAT_12V,
EFX_MON_STAT_VCCP2,
EFX_MON_STAT_EXT_TEMP,
EFX_MON_STAT_INT_TEMP,
EFX_MON_STAT_AIN1,
EFX_MON_STAT_AIN2,
EFX_MON_STAT_INT_COOLING,
EFX_MON_STAT_EXT_COOLING,
EFX_MON_STAT_1V,
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_CONTROLLER_TEMP,
EFX_MON_STAT_PHY_COMMON_TEMP,
EFX_MON_STAT_CONTROLLER_COOLING,
EFX_MON_STAT_PHY0_TEMP,
EFX_MON_STAT_PHY0_COOLING,
EFX_MON_STAT_PHY1_TEMP,
EFX_MON_STAT_PHY1_COOLING,
EFX_MON_STAT_IN_1V0,
EFX_MON_STAT_IN_1V2,
EFX_MON_STAT_IN_1V8,
EFX_MON_STAT_IN_2V5,
EFX_MON_STAT_IN_3V3,
EFX_MON_STAT_IN_12V0,
EFX_MON_STAT_IN_1V2A,
EFX_MON_STAT_IN_VREF,
EFX_MON_STAT_OUT_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_STAT_FAN_0,
EFX_MON_STAT_FAN_1,
EFX_MON_STAT_FAN_2,
EFX_MON_STAT_FAN_3,
EFX_MON_STAT_FAN_4,
EFX_MON_STAT_IN_VAOE,
EFX_MON_STAT_OUT_IAOE,
EFX_MON_STAT_IN_IAOE,
EFX_MON_STAT_NIC_POWER,
EFX_MON_STAT_0_9V,
EFX_MON_STAT_I0_9V,
EFX_MON_STAT_I1_2V,
EFX_MON_STAT_0_9V_ADC,
EFX_MON_STAT_INT_TEMP2,
EFX_MON_STAT_VREG_TEMP,
EFX_MON_STAT_VREG_0_9V_TEMP,
EFX_MON_STAT_VREG_1_2V_TEMP,
EFX_MON_STAT_INT_VPTAT,
EFX_MON_STAT_INT_ADC_TEMP,
EFX_MON_STAT_EXT_VPTAT,
EFX_MON_STAT_EXT_ADC_TEMP,
EFX_MON_STAT_IN_0V9,
EFX_MON_STAT_IN_I0V9,
EFX_MON_STAT_IN_I1V2,
EFX_MON_STAT_IN_0V9_ADC,
EFX_MON_STAT_CONTROLLER_2_TEMP,
EFX_MON_STAT_VREG_INTERNAL_TEMP,
EFX_MON_STAT_VREG_0V9_TEMP,
EFX_MON_STAT_VREG_1V2_TEMP,
EFX_MON_STAT_CONTROLLER_VPTAT,
EFX_MON_STAT_CONTROLLER_INTERNAL_TEMP,
EFX_MON_STAT_CONTROLLER_VPTAT_EXTADC,
EFX_MON_STAT_CONTROLLER_INTERNAL_TEMP_EXTADC,
EFX_MON_STAT_AMBIENT_TEMP,
EFX_MON_STAT_AIRFLOW,
EFX_MON_STAT_VDD08D_VSS08D_CSR,
EFX_MON_STAT_VDD08D_VSS08D_CSR_EXTADC,
EFX_MON_STAT_HOTPOINT_TEMP,
EFX_MON_STAT_PHY_POWER_SWITCH_PORT0,
EFX_MON_STAT_PHY_POWER_SWITCH_PORT1,
EFX_MON_STAT_PHY_POWER_PORT0,
EFX_MON_STAT_PHY_POWER_PORT1,
EFX_MON_STAT_MUM_VCC,
EFX_MON_STAT_0V9_A,
EFX_MON_STAT_I0V9_A,
EFX_MON_STAT_0V9_A_TEMP,
EFX_MON_STAT_0V9_B,
EFX_MON_STAT_I0V9_B,
EFX_MON_STAT_0V9_B_TEMP,
EFX_MON_STAT_IN_0V9_A,
EFX_MON_STAT_IN_I0V9_A,
EFX_MON_STAT_VREG_0V9_A_TEMP,
EFX_MON_STAT_IN_0V9_B,
EFX_MON_STAT_IN_I0V9_B,
EFX_MON_STAT_VREG_0V9_B_TEMP,
EFX_MON_STAT_CCOM_AVREG_1V2_SUPPLY,
EFX_MON_STAT_CCOM_AVREG_1V2_SUPPLY_EXT_ADC,
EFX_MON_STAT_CCOM_AVREG_1V2_SUPPLY_EXTADC,
EFX_MON_STAT_CCOM_AVREG_1V8_SUPPLY,
EFX_MON_STAT_CCOM_AVREG_1V8_SUPPLY_EXT_ADC,
EFX_MON_STAT_CCOM_AVREG_1V8_SUPPLY_EXTADC,
EFX_MON_STAT_CONTROLLER_MASTER_VPTAT,
EFX_MON_STAT_CONTROLLER_MASTER_INTERNAL_TEMP,
EFX_MON_STAT_CONTROLLER_MASTER_VPTAT_EXT_ADC,
EFX_MON_STAT_CONTROLLER_MASTER_INTERNAL_TEMP_EXT_ADC,
EFX_MON_STAT_CONTROLLER_MASTER_VPTAT_EXTADC,
EFX_MON_STAT_CONTROLLER_MASTER_INTERNAL_TEMP_EXTADC,
EFX_MON_STAT_CONTROLLER_SLAVE_VPTAT,
EFX_MON_STAT_CONTROLLER_SLAVE_INTERNAL_TEMP,
EFX_MON_STAT_CONTROLLER_SLAVE_VPTAT_EXT_ADC,
EFX_MON_STAT_CONTROLLER_SLAVE_INTERNAL_TEMP_EXT_ADC,
EFX_MON_STAT_CONTROLLER_SLAVE_VPTAT_EXTADC,
EFX_MON_STAT_CONTROLLER_SLAVE_INTERNAL_TEMP_EXTADC,
EFX_MON_STAT_SODIMM_VOUT,
EFX_MON_STAT_SODIMM_0_TEMP,
EFX_MON_STAT_SODIMM_1_TEMP,
@ -741,12 +738,12 @@ typedef enum efx_mon_stat_e {
EFX_MON_STAT_CONTROLLER_TDIODE_TEMP,
EFX_MON_STAT_BOARD_FRONT_TEMP,
EFX_MON_STAT_BOARD_BACK_TEMP,
EFX_MON_STAT_I1V8,
EFX_MON_STAT_I2V5,
EFX_MON_STAT_I3V3,
EFX_MON_STAT_I12V0,
EFX_MON_STAT_1_3V,
EFX_MON_STAT_I1V3,
EFX_MON_STAT_IN_I1V8,
EFX_MON_STAT_IN_I2V5,
EFX_MON_STAT_IN_I3V3,
EFX_MON_STAT_IN_I12V0,
EFX_MON_STAT_IN_1V3,
EFX_MON_STAT_IN_I1V3,
EFX_MON_NSTATS
} efx_mon_stat_t;
@ -760,11 +757,33 @@ typedef enum efx_mon_stat_state_e {
EFX_MON_STAT_STATE_NO_READING = 4,
} efx_mon_stat_state_t;
typedef enum efx_mon_stat_unit_e {
EFX_MON_STAT_UNIT_UNKNOWN = 0,
EFX_MON_STAT_UNIT_BOOL,
EFX_MON_STAT_UNIT_TEMP_C,
EFX_MON_STAT_UNIT_VOLTAGE_MV,
EFX_MON_STAT_UNIT_CURRENT_MA,
EFX_MON_STAT_UNIT_POWER_W,
EFX_MON_STAT_UNIT_RPM,
EFX_MON_NUNITS
} efx_mon_stat_unit_t;
typedef struct efx_mon_stat_value_s {
uint16_t emsv_value;
uint16_t emsv_state;
uint16_t emsv_value;
efx_mon_stat_state_t emsv_state;
efx_mon_stat_unit_t emsv_unit;
} efx_mon_stat_value_t;
typedef enum efx_mon_stat_portmask_e {
EFX_MON_STAT_PORTMAP_NONE = 0,
EFX_MON_STAT_PORTMAP_PORT0 = 1,
EFX_MON_STAT_PORTMAP_PORT1 = 2,
EFX_MON_STAT_PORTMAP_PORT2 = 3,
EFX_MON_STAT_PORTMAP_PORT3 = 4,
EFX_MON_STAT_PORTMAP_ALL = (-1),
EFX_MON_STAT_PORTMAP_UNKNOWN = (-2)
} efx_mon_stat_portmask_t;
#if EFSYS_OPT_NAMES
extern const char *
@ -774,6 +793,21 @@ efx_mon_stat_name(
#endif /* EFSYS_OPT_NAMES */
extern __checkReturn boolean_t
efx_mon_mcdi_to_efx_stat(
__in int mcdi_index,
__out efx_mon_stat_t *statp);
extern __checkReturn boolean_t
efx_mon_get_stat_unit(
__in efx_mon_stat_t stat,
__out efx_mon_stat_unit_t *unitp);
extern __checkReturn boolean_t
efx_mon_get_stat_portmap(
__in efx_mon_stat_t stat,
__out efx_mon_stat_portmask_t *maskp);
extern __checkReturn efx_rc_t
efx_mon_stats_update(
__in efx_nic_t *enp,

623
drivers/net/sfc/base/efx_mon.c
View File

@ -99,77 +99,74 @@ efx_mon_init(
#if EFSYS_OPT_NAMES
/* START MKCONFIG GENERATED MonitorStatNamesBlock 8150a068198c0f96 */
/* START MKCONFIG GENERATED MonitorStatNamesBlock 277c17eda1a6d1a4 */
static const char * const __mon_stat_name[] = {
"value_2_5v",
"value_vccp1",
"value_vcc",
"value_5v",
"value_12v",
"value_vccp2",
"value_ext_temp",
"value_int_temp",
"value_ain1",
"value_ain2",
"controller_temp",
"phy_common_temp",
"controller_cooling",
"ext_cooling",
"1v",
"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",
"phy0_temp",
"phy0_cooling",
"phy1_temp",
"phy1_cooling",
"in_1v0",
"in_1v2",
"in_1v8",
"in_2v5",
"in_3v3",
"in_12v0",
"in_1v2a",
"in_vref",
"out_vaoe",
"aoe_temp",
"psu_aoe_temp",
"psu_temp",
"fan_0",
"fan_1",
"fan_2",
"fan_3",
"fan_4",
"in_vaoe",
"out_iaoe",
"in_iaoe",
"nic_power",
"0_9v",
"i0_9v",
"i1_2v",
"0_9v_adc",
"controller_temperature2",
"vreg_temperature",
"vreg_0_9v_temperature",
"vreg_1_2v_temperature",
"int_vptat",
"controller_internal_adc_temperature",
"ext_vptat",
"controller_external_adc_temperature",
"ambient_temperature",
"in_0v9",
"in_i0v9",
"in_i1v2",
"in_0v9_adc",
"controller_2_temp",
"vreg_internal_temp",
"vreg_0v9_temp",
"vreg_1v2_temp",
"controller_vptat",
"controller_internal_temp",
"controller_vptat_extadc",
"controller_internal_temp_extadc",
"ambient_temp",
"airflow",
"vdd08d_vss08d_csr",
"vdd08d_vss08d_csr_extadc",
"hotpoint_temperature",
"phy_power_switch_port0",
"phy_power_switch_port1",
"hotpoint_temp",
"phy_power_port0",
"phy_power_port1",
"mum_vcc",
"0v9_a",
"i0v9_a",
"0v9_a_temp",
"0v9_b",
"i0v9_b",
"0v9_b_temp",
"in_0v9_a",
"in_i0v9_a",
"vreg_0v9_a_temp",
"in_0v9_b",
"in_i0v9_b",
"vreg_0v9_b_temp",
"ccom_avreg_1v2_supply",
"ccom_avreg_1v2_supply_ext_adc",
"ccom_avreg_1v2_supply_extadc",
"ccom_avreg_1v8_supply",
"ccom_avreg_1v8_supply_ext_adc",
"ccom_avreg_1v8_supply_extadc",
"controller_master_vptat",
"controller_master_internal_temp",
"controller_master_vptat_ext_adc",
"controller_master_internal_temp_ext_adc",
"controller_master_vptat_extadc",
"controller_master_internal_temp_extadc",
"controller_slave_vptat",
"controller_slave_internal_temp",
"controller_slave_vptat_ext_adc",
"controller_slave_internal_temp_ext_adc",
"controller_slave_vptat_extadc",
"controller_slave_internal_temp_extadc",
"sodimm_vout",
"sodimm_0_temp",
"sodimm_1_temp",
@ -178,16 +175,514 @@ static const char * const __mon_stat_name[] = {
"controller_tdiode_temp",
"board_front_temp",
"board_back_temp",
"i1v8",
"i2v5",
"i3v3",
"i12v0",
"1v3",
"i1v3",
"in_i1v8",
"in_i2v5",
"in_i3v3",
"in_i12v0",
"in_1v3",
"in_i1v3",
};
/* END MKCONFIG GENERATED MonitorStatNamesBlock */
/* START MKCONFIG GENERATED MonitorMcdiMappingBlock 362875db87a4e7da */
__checkReturn boolean_t
efx_mon_mcdi_to_efx_stat(
__in int mcdi_index,
__out efx_mon_stat_t *statp)
{
if ((mcdi_index % (MC_CMD_SENSOR_PAGE0_NEXT + 1)) ==
MC_CMD_SENSOR_PAGE0_NEXT) {
*statp = EFX_MON_NSTATS;
return (B_FALSE);
}
switch (mcdi_index) {
case MC_CMD_SENSOR_IN_I0V9:
*statp = EFX_MON_STAT_IN_I0V9;
break;
case MC_CMD_SENSOR_CONTROLLER_SLAVE_VPTAT_EXTADC:
*statp = EFX_MON_STAT_CONTROLLER_SLAVE_VPTAT_EXTADC;
break;
case MC_CMD_SENSOR_CONTROLLER_SLAVE_VPTAT:
*statp = EFX_MON_STAT_CONTROLLER_SLAVE_VPTAT;
break;
case MC_CMD_SENSOR_PSU_TEMP:
*statp = EFX_MON_STAT_PSU_TEMP;
break;
case MC_CMD_SENSOR_FAN_2:
*statp = EFX_MON_STAT_FAN_2;
break;
case MC_CMD_SENSOR_CONTROLLER_INTERNAL_TEMP_EXTADC:
*statp = EFX_MON_STAT_CONTROLLER_INTERNAL_TEMP_EXTADC;
break;
case MC_CMD_SENSOR_BOARD_BACK_TEMP:
*statp = EFX_MON_STAT_BOARD_BACK_TEMP;
break;
case MC_CMD_SENSOR_IN_1V3:
*statp = EFX_MON_STAT_IN_1V3;
break;
case MC_CMD_SENSOR_CONTROLLER_TDIODE_TEMP:
*statp = EFX_MON_STAT_CONTROLLER_TDIODE_TEMP;
break;
case MC_CMD_SENSOR_IN_2V5:
*statp = EFX_MON_STAT_IN_2V5;
break;
case MC_CMD_SENSOR_PHY_COMMON_TEMP:
*statp = EFX_MON_STAT_PHY_COMMON_TEMP;
break;
case MC_CMD_SENSOR_PHY1_TEMP:
*statp = EFX_MON_STAT_PHY1_TEMP;
break;
case MC_CMD_SENSOR_VREG_INTERNAL_TEMP:
*statp = EFX_MON_STAT_VREG_INTERNAL_TEMP;
break;
case MC_CMD_SENSOR_IN_1V0:
*statp = EFX_MON_STAT_IN_1V0;
break;
case MC_CMD_SENSOR_FAN_1:
*statp = EFX_MON_STAT_FAN_1;
break;
case MC_CMD_SENSOR_IN_1V2:
*statp = EFX_MON_STAT_IN_1V2;
break;
case MC_CMD_SENSOR_FAN_3:
*statp = EFX_MON_STAT_FAN_3;
break;
case MC_CMD_SENSOR_IN_1V2A:
*statp = EFX_MON_STAT_IN_1V2A;
break;
case MC_CMD_SENSOR_SODIMM_0_TEMP:
*statp = EFX_MON_STAT_SODIMM_0_TEMP;
break;
case MC_CMD_SENSOR_IN_1V8:
*statp = EFX_MON_STAT_IN_1V8;
break;
case MC_CMD_SENSOR_IN_VREF:
*statp = EFX_MON_STAT_IN_VREF;
break;
case MC_CMD_SENSOR_SODIMM_VOUT:
*statp = EFX_MON_STAT_SODIMM_VOUT;
break;
case MC_CMD_SENSOR_CCOM_AVREG_1V2_SUPPLY:
*statp = EFX_MON_STAT_CCOM_AVREG_1V2_SUPPLY;
break;
case MC_CMD_SENSOR_IN_I1V2:
*statp = EFX_MON_STAT_IN_I1V2;
break;
case MC_CMD_SENSOR_IN_I1V3:
*statp = EFX_MON_STAT_IN_I1V3;
break;
case MC_CMD_SENSOR_AIRFLOW:
*statp = EFX_MON_STAT_AIRFLOW;
break;
case MC_CMD_SENSOR_HOTPOINT_TEMP:
*statp = EFX_MON_STAT_HOTPOINT_TEMP;
break;
case MC_CMD_SENSOR_VDD08D_VSS08D_CSR:
*statp = EFX_MON_STAT_VDD08D_VSS08D_CSR;
break;
case MC_CMD_SENSOR_AOE_TEMP:
*statp = EFX_MON_STAT_AOE_TEMP;
break;
case MC_CMD_SENSOR_IN_I1V8:
*statp = EFX_MON_STAT_IN_I1V8;
break;
case MC_CMD_SENSOR_IN_I2V5:
*statp = EFX_MON_STAT_IN_I2V5;
break;
case MC_CMD_SENSOR_PHY1_COOLING:
*statp = EFX_MON_STAT_PHY1_COOLING;
break;
case MC_CMD_SENSOR_CCOM_AVREG_1V8_SUPPLY_EXTADC:
*statp = EFX_MON_STAT_CCOM_AVREG_1V8_SUPPLY_EXTADC;
break;
case MC_CMD_SENSOR_IN_0V9_ADC:
*statp = EFX_MON_STAT_IN_0V9_ADC;
break;
case MC_CMD_SENSOR_VREG_0V9_A_TEMP:
*statp = EFX_MON_STAT_VREG_0V9_A_TEMP;
break;
case MC_CMD_SENSOR_CONTROLLER_MASTER_VPTAT:
*statp = EFX_MON_STAT_CONTROLLER_MASTER_VPTAT;
break;
case MC_CMD_SENSOR_PHY0_VCC:
*statp = EFX_MON_STAT_PHY0_VCC;
break;
case MC_CMD_SENSOR_PHY0_COOLING:
*statp = EFX_MON_STAT_PHY0_COOLING;
break;
case MC_CMD_SENSOR_PSU_AOE_TEMP:
*statp = EFX_MON_STAT_PSU_AOE_TEMP;
break;
case MC_CMD_SENSOR_VREG_0V9_TEMP:
*statp = EFX_MON_STAT_VREG_0V9_TEMP;
break;
case MC_CMD_SENSOR_IN_I0V9_A:
*statp = EFX_MON_STAT_IN_I0V9_A;
break;
case MC_CMD_SENSOR_IN_I3V3:
*statp = EFX_MON_STAT_IN_I3V3;
break;
case MC_CMD_SENSOR_BOARD_FRONT_TEMP:
*statp = EFX_MON_STAT_BOARD_FRONT_TEMP;
break;
case MC_CMD_SENSOR_OUT_VAOE:
*statp = EFX_MON_STAT_OUT_VAOE;
break;
case MC_CMD_SENSOR_VDD08D_VSS08D_CSR_EXTADC:
*statp = EFX_MON_STAT_VDD08D_VSS08D_CSR_EXTADC;
break;
case MC_CMD_SENSOR_IN_I12V0:
*statp = EFX_MON_STAT_IN_I12V0;
break;
case MC_CMD_SENSOR_PHY_POWER_PORT1:
*statp = EFX_MON_STAT_PHY_POWER_PORT1;
break;
case MC_CMD_SENSOR_PHY_POWER_PORT0:
*statp = EFX_MON_STAT_PHY_POWER_PORT0;
break;
case MC_CMD_SENSOR_CONTROLLER_SLAVE_INTERNAL_TEMP_EXTADC:
*statp = EFX_MON_STAT_CONTROLLER_SLAVE_INTERNAL_TEMP_EXTADC;
break;
case MC_CMD_SENSOR_CONTROLLER_MASTER_INTERNAL_TEMP:
*statp = EFX_MON_STAT_CONTROLLER_MASTER_INTERNAL_TEMP;
break;
case MC_CMD_SENSOR_CONTROLLER_TEMP:
*statp = EFX_MON_STAT_CONTROLLER_TEMP;
break;
case MC_CMD_SENSOR_IN_IAOE:
*statp = EFX_MON_STAT_IN_IAOE;
break;
case MC_CMD_SENSOR_IN_VAOE:
*statp = EFX_MON_STAT_IN_VAOE;
break;
case MC_CMD_SENSOR_CONTROLLER_MASTER_VPTAT_EXTADC:
*statp = EFX_MON_STAT_CONTROLLER_MASTER_VPTAT_EXTADC;
break;
case MC_CMD_SENSOR_CCOM_AVREG_1V8_SUPPLY:
*statp = EFX_MON_STAT_CCOM_AVREG_1V8_SUPPLY;
break;
case MC_CMD_SENSOR_PHY1_VCC:
*statp = EFX_MON_STAT_PHY1_VCC;
break;
case MC_CMD_SENSOR_CONTROLLER_COOLING:
*statp = EFX_MON_STAT_CONTROLLER_COOLING;
break;
case MC_CMD_SENSOR_AMBIENT_TEMP:
*statp = EFX_MON_STAT_AMBIENT_TEMP;
break;
case MC_CMD_SENSOR_IN_3V3:
*statp = EFX_MON_STAT_IN_3V3;
break;
case MC_CMD_SENSOR_PHY0_TEMP:
*statp = EFX_MON_STAT_PHY0_TEMP;
break;
case MC_CMD_SENSOR_SODIMM_1_TEMP:
*statp = EFX_MON_STAT_SODIMM_1_TEMP;
break;
case MC_CMD_SENSOR_MUM_VCC:
*statp = EFX_MON_STAT_MUM_VCC;
break;
case MC_CMD_SENSOR_VREG_0V9_B_TEMP:
*statp = EFX_MON_STAT_VREG_0V9_B_TEMP;
break;
case MC_CMD_SENSOR_CONTROLLER_SLAVE_INTERNAL_TEMP:
*statp = EFX_MON_STAT_CONTROLLER_SLAVE_INTERNAL_TEMP;
break;
case MC_CMD_SENSOR_FAN_4:
*statp = EFX_MON_STAT_FAN_4;
break;
case MC_CMD_SENSOR_CONTROLLER_2_TEMP:
*statp = EFX_MON_STAT_CONTROLLER_2_TEMP;
break;
case MC_CMD_SENSOR_CCOM_AVREG_1V2_SUPPLY_EXTADC:
*statp = EFX_MON_STAT_CCOM_AVREG_1V2_SUPPLY_EXTADC;
break;
case MC_CMD_SENSOR_IN_0V9_A:
*statp = EFX_MON_STAT_IN_0V9_A;
break;
case MC_CMD_SENSOR_CONTROLLER_VPTAT_EXTADC:
*statp = EFX_MON_STAT_CONTROLLER_VPTAT_EXTADC;
break;
case MC_CMD_SENSOR_IN_0V9:
*statp = EFX_MON_STAT_IN_0V9;
break;
case MC_CMD_SENSOR_IN_I0V9_B:
*statp = EFX_MON_STAT_IN_I0V9_B;
break;
case MC_CMD_SENSOR_NIC_POWER:
*statp = EFX_MON_STAT_NIC_POWER;
break;
case MC_CMD_SENSOR_IN_12V0:
*statp = EFX_MON_STAT_IN_12V0;
break;
case MC_CMD_SENSOR_OUT_IAOE:
*statp = EFX_MON_STAT_OUT_IAOE;
break;
case MC_CMD_SENSOR_CONTROLLER_VPTAT:
*statp = EFX_MON_STAT_CONTROLLER_VPTAT;
break;
case MC_CMD_SENSOR_CONTROLLER_MASTER_INTERNAL_TEMP_EXTADC:
*statp = EFX_MON_STAT_CONTROLLER_MASTER_INTERNAL_TEMP_EXTADC;
break;
case MC_CMD_SENSOR_CONTROLLER_INTERNAL_TEMP:
*statp = EFX_MON_STAT_CONTROLLER_INTERNAL_TEMP;
break;
case MC_CMD_SENSOR_FAN_0:
*statp = EFX_MON_STAT_FAN_0;
break;
case MC_CMD_SENSOR_VREG_1V2_TEMP:
*statp = EFX_MON_STAT_VREG_1V2_TEMP;
break;
case MC_CMD_SENSOR_IN_0V9_B:
*statp = EFX_MON_STAT_IN_0V9_B;
break;
default:
*statp = EFX_MON_NSTATS;
break;
};
if (*statp == EFX_MON_NSTATS)
goto fail1;
return (B_TRUE);
fail1:
EFSYS_PROBE1(fail1, boolean_t, B_TRUE);
return (B_FALSE);
};
/* END MKCONFIG GENERATED MonitorMcdiMappingBlock */
/* START MKCONFIG GENERATED MonitorStatisticUnitsBlock 2d447c656cc2d01d */
__checkReturn boolean_t
efx_mon_get_stat_unit(
__in efx_mon_stat_t stat,
__out efx_mon_stat_unit_t *unitp)
{
switch (stat) {
case EFX_MON_STAT_IN_1V0:
case EFX_MON_STAT_IN_1V2:
case EFX_MON_STAT_IN_1V8:
case EFX_MON_STAT_IN_2V5:
case EFX_MON_STAT_IN_3V3:
case EFX_MON_STAT_IN_12V0:
case EFX_MON_STAT_IN_1V2A:
case EFX_MON_STAT_IN_VREF:
case EFX_MON_STAT_OUT_VAOE:
case EFX_MON_STAT_IN_VAOE:
case EFX_MON_STAT_IN_0V9:
case EFX_MON_STAT_IN_0V9_ADC:
case EFX_MON_STAT_CONTROLLER_VPTAT_EXTADC:
case EFX_MON_STAT_VDD08D_VSS08D_CSR:
case EFX_MON_STAT_VDD08D_VSS08D_CSR_EXTADC:
case EFX_MON_STAT_MUM_VCC:
case EFX_MON_STAT_IN_0V9_A:
case EFX_MON_STAT_IN_0V9_B:
case EFX_MON_STAT_CCOM_AVREG_1V2_SUPPLY:
case EFX_MON_STAT_CCOM_AVREG_1V2_SUPPLY_EXTADC:
case EFX_MON_STAT_CCOM_AVREG_1V8_SUPPLY:
case EFX_MON_STAT_CCOM_AVREG_1V8_SUPPLY_EXTADC:
case EFX_MON_STAT_CONTROLLER_MASTER_VPTAT:
case EFX_MON_STAT_CONTROLLER_MASTER_VPTAT_EXTADC:
case EFX_MON_STAT_CONTROLLER_SLAVE_VPTAT:
case EFX_MON_STAT_CONTROLLER_SLAVE_VPTAT_EXTADC:
case EFX_MON_STAT_SODIMM_VOUT:
case EFX_MON_STAT_PHY0_VCC:
case EFX_MON_STAT_PHY1_VCC:
case EFX_MON_STAT_IN_1V3:
*unitp = EFX_MON_STAT_UNIT_VOLTAGE_MV;
break;
case EFX_MON_STAT_CONTROLLER_TEMP:
case EFX_MON_STAT_PHY_COMMON_TEMP:
case EFX_MON_STAT_PHY0_TEMP:
case EFX_MON_STAT_PHY1_TEMP:
case EFX_MON_STAT_AOE_TEMP:
case EFX_MON_STAT_PSU_AOE_TEMP:
case EFX_MON_STAT_PSU_TEMP:
case EFX_MON_STAT_CONTROLLER_2_TEMP:
case EFX_MON_STAT_VREG_INTERNAL_TEMP:
case EFX_MON_STAT_VREG_0V9_TEMP:
case EFX_MON_STAT_VREG_1V2_TEMP:
case EFX_MON_STAT_CONTROLLER_VPTAT:
case EFX_MON_STAT_CONTROLLER_INTERNAL_TEMP:
case EFX_MON_STAT_CONTROLLER_INTERNAL_TEMP_EXTADC:
case EFX_MON_STAT_AMBIENT_TEMP:
case EFX_MON_STAT_HOTPOINT_TEMP:
case EFX_MON_STAT_VREG_0V9_A_TEMP:
case EFX_MON_STAT_VREG_0V9_B_TEMP:
case EFX_MON_STAT_CONTROLLER_MASTER_INTERNAL_TEMP:
case EFX_MON_STAT_CONTROLLER_MASTER_INTERNAL_TEMP_EXTADC:
case EFX_MON_STAT_CONTROLLER_SLAVE_INTERNAL_TEMP:
case EFX_MON_STAT_CONTROLLER_SLAVE_INTERNAL_TEMP_EXTADC:
case EFX_MON_STAT_SODIMM_0_TEMP:
case EFX_MON_STAT_SODIMM_1_TEMP:
case EFX_MON_STAT_CONTROLLER_TDIODE_TEMP:
case EFX_MON_STAT_BOARD_FRONT_TEMP:
case EFX_MON_STAT_BOARD_BACK_TEMP:
*unitp = EFX_MON_STAT_UNIT_TEMP_C;
break;
case EFX_MON_STAT_CONTROLLER_COOLING:
case EFX_MON_STAT_PHY0_COOLING:
case EFX_MON_STAT_PHY1_COOLING:
case EFX_MON_STAT_AIRFLOW:
case EFX_MON_STAT_PHY_POWER_PORT0:
case EFX_MON_STAT_PHY_POWER_PORT1:
*unitp = EFX_MON_STAT_UNIT_BOOL;
break;
case EFX_MON_STAT_NIC_POWER:
*unitp = EFX_MON_STAT_UNIT_POWER_W;
break;
case EFX_MON_STAT_OUT_IAOE:
case EFX_MON_STAT_IN_IAOE:
case EFX_MON_STAT_IN_I0V9:
case EFX_MON_STAT_IN_I1V2:
case EFX_MON_STAT_IN_I0V9_A:
case EFX_MON_STAT_IN_I0V9_B:
case EFX_MON_STAT_IN_I1V8:
case EFX_MON_STAT_IN_I2V5:
case EFX_MON_STAT_IN_I3V3:
case EFX_MON_STAT_IN_I12V0:
case EFX_MON_STAT_IN_I1V3:
*unitp = EFX_MON_STAT_UNIT_CURRENT_MA;
break;
case EFX_MON_STAT_FAN_0:
case EFX_MON_STAT_FAN_1:
case EFX_MON_STAT_FAN_2:
case EFX_MON_STAT_FAN_3:
case EFX_MON_STAT_FAN_4:
*unitp = EFX_MON_STAT_UNIT_RPM;
break;
default:
*unitp = EFX_MON_STAT_UNIT_UNKNOWN;
break;
};
if (*unitp == EFX_MON_STAT_UNIT_UNKNOWN)
goto fail1;
return (B_TRUE);
fail1:
EFSYS_PROBE1(fail1, boolean_t, B_TRUE);
return (B_FALSE);
};
/* END MKCONFIG GENERATED MonitorStatisticUnitsBlock */
/* START MKCONFIG GENERATED MonitorStatisticPortsBlock 1719b751d842534f */
__checkReturn boolean_t
efx_mon_get_stat_portmap(
__in efx_mon_stat_t stat,
__out efx_mon_stat_portmask_t *maskp)
{
switch (stat) {
case EFX_MON_STAT_PHY1_TEMP:
case EFX_MON_STAT_PHY1_COOLING:
case EFX_MON_STAT_PHY_POWER_PORT1:
*maskp = EFX_MON_STAT_PORTMAP_PORT1;
break;
case EFX_MON_STAT_CONTROLLER_TEMP:
case EFX_MON_STAT_PHY_COMMON_TEMP:
case EFX_MON_STAT_CONTROLLER_COOLING:
case EFX_MON_STAT_IN_1V0:
case EFX_MON_STAT_IN_1V2:
case EFX_MON_STAT_IN_1V8:
case EFX_MON_STAT_IN_2V5:
case EFX_MON_STAT_IN_3V3:
case EFX_MON_STAT_IN_12V0:
case EFX_MON_STAT_IN_1V2A:
case EFX_MON_STAT_IN_VREF:
case EFX_MON_STAT_OUT_VAOE:
case EFX_MON_STAT_AOE_TEMP:
case EFX_MON_STAT_PSU_AOE_TEMP:
case EFX_MON_STAT_PSU_TEMP:
case EFX_MON_STAT_FAN_0:
case EFX_MON_STAT_FAN_1:
case EFX_MON_STAT_FAN_2:
case EFX_MON_STAT_FAN_3:
case EFX_MON_STAT_FAN_4:
case EFX_MON_STAT_IN_VAOE:
case EFX_MON_STAT_OUT_IAOE:
case EFX_MON_STAT_IN_IAOE:
case EFX_MON_STAT_NIC_POWER:
case EFX_MON_STAT_IN_0V9:
case EFX_MON_STAT_IN_I0V9:
case EFX_MON_STAT_IN_I1V2:
case EFX_MON_STAT_IN_0V9_ADC:
case EFX_MON_STAT_CONTROLLER_2_TEMP:
case EFX_MON_STAT_VREG_INTERNAL_TEMP:
case EFX_MON_STAT_VREG_0V9_TEMP:
case EFX_MON_STAT_VREG_1V2_TEMP:
case EFX_MON_STAT_CONTROLLER_VPTAT:
case EFX_MON_STAT_CONTROLLER_INTERNAL_TEMP:
case EFX_MON_STAT_CONTROLLER_VPTAT_EXTADC:
case EFX_MON_STAT_CONTROLLER_INTERNAL_TEMP_EXTADC:
case EFX_MON_STAT_AMBIENT_TEMP:
case EFX_MON_STAT_AIRFLOW:
case EFX_MON_STAT_VDD08D_VSS08D_CSR:
case EFX_MON_STAT_VDD08D_VSS08D_CSR_EXTADC:
case EFX_MON_STAT_HOTPOINT_TEMP:
case EFX_MON_STAT_MUM_VCC:
case EFX_MON_STAT_IN_0V9_A:
case EFX_MON_STAT_IN_I0V9_A:
case EFX_MON_STAT_VREG_0V9_A_TEMP:
case EFX_MON_STAT_IN_0V9_B:
case EFX_MON_STAT_IN_I0V9_B:
case EFX_MON_STAT_VREG_0V9_B_TEMP:
case EFX_MON_STAT_CCOM_AVREG_1V2_SUPPLY:
case EFX_MON_STAT_CCOM_AVREG_1V2_SUPPLY_EXTADC:
case EFX_MON_STAT_CCOM_AVREG_1V8_SUPPLY:
case EFX_MON_STAT_CCOM_AVREG_1V8_SUPPLY_EXTADC:
case EFX_MON_STAT_CONTROLLER_MASTER_VPTAT:
case EFX_MON_STAT_CONTROLLER_MASTER_INTERNAL_TEMP:
case EFX_MON_STAT_CONTROLLER_MASTER_VPTAT_EXTADC:
case EFX_MON_STAT_CONTROLLER_MASTER_INTERNAL_TEMP_EXTADC:
case EFX_MON_STAT_CONTROLLER_SLAVE_VPTAT:
case EFX_MON_STAT_CONTROLLER_SLAVE_INTERNAL_TEMP:
case EFX_MON_STAT_CONTROLLER_SLAVE_VPTAT_EXTADC:
case EFX_MON_STAT_CONTROLLER_SLAVE_INTERNAL_TEMP_EXTADC:
case EFX_MON_STAT_SODIMM_VOUT:
case EFX_MON_STAT_SODIMM_0_TEMP:
case EFX_MON_STAT_SODIMM_1_TEMP:
case EFX_MON_STAT_PHY0_VCC:
case EFX_MON_STAT_PHY1_VCC:
case EFX_MON_STAT_CONTROLLER_TDIODE_TEMP:
case EFX_MON_STAT_BOARD_FRONT_TEMP:
case EFX_MON_STAT_BOARD_BACK_TEMP:
case EFX_MON_STAT_IN_I1V8:
case EFX_MON_STAT_IN_I2V5:
case EFX_MON_STAT_IN_I3V3:
case EFX_MON_STAT_IN_I12V0:
case EFX_MON_STAT_IN_1V3:
case EFX_MON_STAT_IN_I1V3:
*maskp = EFX_MON_STAT_PORTMAP_ALL;
break;
case EFX_MON_STAT_PHY0_TEMP:
case EFX_MON_STAT_PHY0_COOLING:
case EFX_MON_STAT_PHY_POWER_PORT0:
*maskp = EFX_MON_STAT_PORTMAP_PORT0;
break;
default:
*maskp = EFX_MON_STAT_PORTMAP_UNKNOWN;
break;
};
if (*maskp == EFX_MON_STAT_PORTMAP_UNKNOWN)
goto fail1;
return (B_TRUE);
fail1:
EFSYS_PROBE1(fail1, boolean_t, B_TRUE);
return (B_FALSE);
};
/* END MKCONFIG GENERATED MonitorStatisticPortsBlock */
extern const char *
efx_mon_stat_name(
__in efx_nic_t *enp,

189
drivers/net/sfc/base/mcdi_mon.c
View File

@ -12,136 +12,9 @@
#if EFSYS_OPT_MON_STATS
#define MCDI_MON_NEXT_PAGE ((uint16_t)0xfffe)
#define MCDI_MON_INVALID_SENSOR ((uint16_t)0xfffd)
#define MCDI_MON_PAGE_SIZE 0x20
/* Bitmasks of valid port(s) for each sensor */
#define MCDI_MON_PORT_NONE (0x00)
#define MCDI_MON_PORT_P1 (0x01)
#define MCDI_MON_PORT_P2 (0x02)
#define MCDI_MON_PORT_P3 (0x04)
#define MCDI_MON_PORT_P4 (0x08)
#define MCDI_MON_PORT_Px (0xFFFF)
/* Get port mask from one-based MCDI port number */
#define MCDI_MON_PORT_MASK(_emip) (1U << ((_emip)->emi_port - 1))
/* Entry for MCDI sensor in sensor map */
#define STAT(portmask, stat) \
{ (MCDI_MON_PORT_##portmask), (EFX_MON_STAT_##stat) }
/* Entry for sensor next page flag in sensor map */
#define STAT_NEXT_PAGE() \
{ MCDI_MON_PORT_NONE, MCDI_MON_NEXT_PAGE }
/* Placeholder for gaps in the array */
#define STAT_NO_SENSOR() \
{ MCDI_MON_PORT_NONE, MCDI_MON_INVALID_SENSOR }
/* Map from MC sensors to monitor statistics */
static const struct mcdi_sensor_map_s {
uint16_t msm_port_mask;
uint16_t msm_stat;
} mcdi_sensor_map[] = {
/* Sensor page 0 MC_CMD_SENSOR_xxx */
STAT(Px, INT_TEMP), /* 0x00 CONTROLLER_TEMP */
STAT(Px, EXT_TEMP), /* 0x01 PHY_COMMON_TEMP */
STAT(Px, INT_COOLING), /* 0x02 CONTROLLER_COOLING */
STAT(P1, EXT_TEMP), /* 0x03 PHY0_TEMP */
STAT(P1, EXT_COOLING), /* 0x04 PHY0_COOLING */
STAT(P2, EXT_TEMP), /* 0x05 PHY1_TEMP */
STAT(P2, EXT_COOLING), /* 0x06 PHY1_COOLING */
STAT(Px, 1V), /* 0x07 IN_1V0 */
STAT(Px, 1_2V), /* 0x08 IN_1V2 */
STAT(Px, 1_8V), /* 0x09 IN_1V8 */
STAT(Px, 2_5V), /* 0x0a IN_2V5 */
STAT(Px, 3_3V), /* 0x0b IN_3V3 */
STAT(Px, 12V), /* 0x0c IN_12V0 */
STAT(Px, 1_2VA), /* 0x0d IN_1V2A */
STAT(Px, VREF), /* 0x0e IN_VREF */
STAT(Px, VAOE), /* 0x0f OUT_VAOE */
STAT(Px, AOE_TEMP), /* 0x10 AOE_TEMP */
STAT(Px, PSU_AOE_TEMP), /* 0x11 PSU_AOE_TEMP */
STAT(Px, PSU_TEMP), /* 0x12 PSU_TEMP */
STAT(Px, FAN0), /* 0x13 FAN_0 */
STAT(Px, FAN1), /* 0x14 FAN_1 */
STAT(Px, FAN2), /* 0x15 FAN_2 */
STAT(Px, FAN3), /* 0x16 FAN_3 */
STAT(Px, FAN4), /* 0x17 FAN_4 */
STAT(Px, VAOE_IN), /* 0x18 IN_VAOE */
STAT(Px, IAOE), /* 0x19 OUT_IAOE */
STAT(Px, IAOE_IN), /* 0x1a IN_IAOE */
STAT(Px, NIC_POWER), /* 0x1b NIC_POWER */
STAT(Px, 0_9V), /* 0x1c IN_0V9 */
STAT(Px, I0_9V), /* 0x1d IN_I0V9 */
STAT(Px, I1_2V), /* 0x1e IN_I1V2 */
STAT_NEXT_PAGE(), /* 0x1f Next page flag (not a sensor) */
/* Sensor page 1 MC_CMD_SENSOR_xxx */
STAT(Px, 0_9V_ADC), /* 0x20 IN_0V9_ADC */
STAT(Px, INT_TEMP2), /* 0x21 CONTROLLER_2_TEMP */
STAT(Px, VREG_TEMP), /* 0x22 VREG_INTERNAL_TEMP */
STAT(Px, VREG_0_9V_TEMP), /* 0x23 VREG_0V9_TEMP */
STAT(Px, VREG_1_2V_TEMP), /* 0x24 VREG_1V2_TEMP */
STAT(Px, INT_VPTAT), /* 0x25 CTRLR. VPTAT */
STAT(Px, INT_ADC_TEMP), /* 0x26 CTRLR. INTERNAL_TEMP */
STAT(Px, EXT_VPTAT), /* 0x27 CTRLR. VPTAT_EXTADC */
STAT(Px, EXT_ADC_TEMP), /* 0x28 CTRLR. INTERNAL_TEMP_EXTADC */
STAT(Px, AMBIENT_TEMP), /* 0x29 AMBIENT_TEMP */
STAT(Px, AIRFLOW), /* 0x2a AIRFLOW */
STAT(Px, VDD08D_VSS08D_CSR), /* 0x2b VDD08D_VSS08D_CSR */
STAT(Px, VDD08D_VSS08D_CSR_EXTADC), /* 0x2c VDD08D_VSS08D_CSR_EXTADC */
STAT(Px, HOTPOINT_TEMP), /* 0x2d HOTPOINT_TEMP */
STAT(P1, PHY_POWER_SWITCH_PORT0), /* 0x2e PHY_POWER_SWITCH_PORT0 */
STAT(P2, PHY_POWER_SWITCH_PORT1), /* 0x2f PHY_POWER_SWITCH_PORT1 */
STAT(Px, MUM_VCC), /* 0x30 MUM_VCC */
STAT(Px, 0V9_A), /* 0x31 0V9_A */
STAT(Px, I0V9_A), /* 0x32 I0V9_A */
STAT(Px, 0V9_A_TEMP), /* 0x33 0V9_A_TEMP */
STAT(Px, 0V9_B), /* 0x34 0V9_B */
STAT(Px, I0V9_B), /* 0x35 I0V9_B */
STAT(Px, 0V9_B_TEMP), /* 0x36 0V9_B_TEMP */
STAT(Px, CCOM_AVREG_1V2_SUPPLY), /* 0x37 CCOM_AVREG_1V2_SUPPLY */
STAT(Px, CCOM_AVREG_1V2_SUPPLY_EXT_ADC),
/* 0x38 CCOM_AVREG_1V2_SUPPLY_EXT_ADC */
STAT(Px, CCOM_AVREG_1V8_SUPPLY), /* 0x39 CCOM_AVREG_1V8_SUPPLY */
STAT(Px, CCOM_AVREG_1V8_SUPPLY_EXT_ADC),
/* 0x3a CCOM_AVREG_1V8_SUPPLY_EXT_ADC */
STAT_NO_SENSOR(), /* 0x3b (no sensor) */
STAT_NO_SENSOR(), /* 0x3c (no sensor) */
STAT_NO_SENSOR(), /* 0x3d (no sensor) */
STAT_NO_SENSOR(), /* 0x3e (no sensor) */
STAT_NEXT_PAGE(), /* 0x3f Next page flag (not a sensor) */
/* Sensor page 2 MC_CMD_SENSOR_xxx */
STAT(Px, CONTROLLER_MASTER_VPTAT), /* 0x40 MASTER_VPTAT */
STAT(Px, CONTROLLER_MASTER_INTERNAL_TEMP), /* 0x41 MASTER_INT_TEMP */
STAT(Px, CONTROLLER_MASTER_VPTAT_EXT_ADC), /* 0x42 MAST_VPTAT_EXT_ADC */
STAT(Px, CONTROLLER_MASTER_INTERNAL_TEMP_EXT_ADC),
/* 0x43 MASTER_INTERNAL_TEMP_EXT_ADC */
STAT(Px, CONTROLLER_SLAVE_VPTAT), /* 0x44 SLAVE_VPTAT */
STAT(Px, CONTROLLER_SLAVE_INTERNAL_TEMP), /* 0x45 SLAVE_INTERNAL_TEMP */
STAT(Px, CONTROLLER_SLAVE_VPTAT_EXT_ADC), /* 0x46 SLAVE_VPTAT_EXT_ADC */
STAT(Px, CONTROLLER_SLAVE_INTERNAL_TEMP_EXT_ADC),
/* 0x47 SLAVE_INTERNAL_TEMP_EXT_ADC */
STAT_NO_SENSOR(), /* 0x48 (no sensor) */
STAT(Px, SODIMM_VOUT), /* 0x49 SODIMM_VOUT */
STAT(Px, SODIMM_0_TEMP), /* 0x4a SODIMM_0_TEMP */
STAT(Px, SODIMM_1_TEMP), /* 0x4b SODIMM_1_TEMP */
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 */
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) \
EFX_STATIC_ASSERT(MC_CMD_SENSOR_STATE_ ## _field \
== EFX_MON_STAT_STATE_ ## _field)
@ -156,10 +29,10 @@ mcdi_mon_decode_stats(
__inout_ecount_opt(EFX_MON_NSTATS) efx_mon_stat_value_t *stat)
{
efx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);
uint16_t port_mask;
efx_mon_stat_portmask_t port_mask;
uint16_t sensor;
size_t sensor_max;
uint32_t stat_mask[(EFX_ARRAY_SIZE(mcdi_sensor_map) + 31) / 32];
uint32_t stat_mask[(EFX_MON_NSTATS + 31) / 32];
uint32_t idx = 0;
uint32_t page = 0;
@ -170,13 +43,10 @@ mcdi_mon_decode_stats(
MCDI_STATIC_SENSOR_ASSERT(BROKEN);
MCDI_STATIC_SENSOR_ASSERT(NO_READING);
EFX_STATIC_ASSERT(sizeof (stat_mask[0]) * 8 ==
EFX_MON_MASK_ELEMENT_SIZE);
sensor_max =
MIN((8 * sensor_mask_size), EFX_ARRAY_SIZE(mcdi_sensor_map));
sensor_max = 8 * sensor_mask_size;
EFSYS_ASSERT(emip->emi_port > 0); /* MCDI port number is one-based */
port_mask = MCDI_MON_PORT_MASK(emip);
port_mask = (efx_mon_stat_portmask_t)MCDI_MON_PORT_MASK(emip);
memset(stat_mask, 0, sizeof (stat_mask));
@ -191,19 +61,36 @@ mcdi_mon_decode_stats(
* does not understand.
*/
for (sensor = 0; sensor < sensor_max; ++sensor) {
efx_mon_stat_t id = mcdi_sensor_map[sensor].msm_stat;
efx_mon_stat_t id;
efx_mon_stat_portmask_t stat_portmask = 0;
boolean_t decode_ok;
efx_mon_stat_unit_t stat_unit;
if ((sensor % MCDI_MON_PAGE_SIZE) == MC_CMD_SENSOR_PAGE0_NEXT) {
EFSYS_ASSERT3U(id, ==, MCDI_MON_NEXT_PAGE);
if ((sensor % (MC_CMD_SENSOR_PAGE0_NEXT + 1)) ==
MC_CMD_SENSOR_PAGE0_NEXT) {
page++;
continue;
/* This sensor is one of the page boundary bits. */
}
if (~(sensor_mask[page]) & (1U << sensor))
continue;
idx++;
/* This sensor not in DMA buffer */
if ((port_mask & mcdi_sensor_map[sensor].msm_port_mask) == 0)
idx++;
/*
* Valid stat in DMA buffer that we need to increment over, even
* if we couldn't look up the id
*/
decode_ok = efx_mon_mcdi_to_efx_stat(sensor, &id);
decode_ok =
decode_ok && efx_mon_get_stat_portmap(id, &stat_portmask);
if (!(decode_ok && (stat_portmask & port_mask)))
continue;
/* Either bad decode, or don't know what port stat is on */
EFSYS_ASSERT(id < EFX_MON_NSTATS);
/*
@ -229,6 +116,10 @@ mcdi_mon_decode_stats(
stat[id].emsv_state = (uint16_t)EFX_DWORD_FIELD(dword,
MC_CMD_SENSOR_VALUE_ENTRY_TYPEDEF_STATE);
stat[id].emsv_unit =
efx_mon_get_stat_unit(id, &stat_unit) ?
stat_unit : EFX_MON_STAT_UNIT_UNKNOWN;
}
}
@ -245,7 +136,7 @@ mcdi_mon_ev(
__out efx_mon_stat_value_t *valuep)
{
efx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);
uint16_t port_mask;
efx_mon_stat_portmask_t port_mask, sensor_port_mask;
uint16_t sensor;
uint16_t state;
uint16_t value;
@ -262,20 +153,22 @@ mcdi_mon_ev(
/* Hardware must support this MCDI sensor */
EFSYS_ASSERT3U(sensor, <,
(8 * enp->en_nic_cfg.enc_mcdi_sensor_mask_size));
EFSYS_ASSERT((sensor % MCDI_MON_PAGE_SIZE) != MC_CMD_SENSOR_PAGE0_NEXT);
EFSYS_ASSERT((sensor % (MC_CMD_SENSOR_PAGE0_NEXT + 1)) !=
MC_CMD_SENSOR_PAGE0_NEXT);
EFSYS_ASSERT(enp->en_nic_cfg.enc_mcdi_sensor_maskp != NULL);
EFSYS_ASSERT(
(enp->en_nic_cfg.enc_mcdi_sensor_maskp[sensor/MCDI_MON_PAGE_SIZE] &
(1U << (sensor % MCDI_MON_PAGE_SIZE))) != 0);
EFSYS_ASSERT((enp->en_nic_cfg.enc_mcdi_sensor_maskp[
sensor / (MC_CMD_SENSOR_PAGE0_NEXT + 1)] &
(1U << (sensor % (MC_CMD_SENSOR_PAGE0_NEXT + 1)))) != 0);
/* But we don't have to understand it */
if (sensor >= EFX_ARRAY_SIZE(mcdi_sensor_map)) {
/* And we need to understand it, to get port-map */
if (!efx_mon_mcdi_to_efx_stat(sensor, &id)) {
rc = ENOTSUP;
goto fail1;
}
id = mcdi_sensor_map[sensor].msm_stat;
if ((port_mask & mcdi_sensor_map[sensor].msm_port_mask) == 0)
if (!(efx_mon_get_stat_portmap(id, &sensor_port_mask) &&
(port_mask && sensor_port_mask))) {
return (ENODEV);
}
EFSYS_ASSERT(id < EFX_MON_NSTATS);
*idp = id;