aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Cree <ecree@solarflare.com>2013-10-03 14:06:18 -0400
committerBen Hutchings <bhutchings@solarflare.com>2013-12-12 17:06:53 -0500
commit0cf7a455d4fed61549098fa8cce37462185c1bf8 (patch)
tree9506c40183693c5212bc6252d2c463f3b8306ea9
parent2b216cef086a5b564a4415d7f1b6095ea1c2089c (diff)
sfc: Revise sensor names to be more understandable and consistent
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat
-rw-r--r--drivers/net/ethernet/sfc/mcdi_mon.c49
1 files changed, 26 insertions, 23 deletions
diff --git a/drivers/net/ethernet/sfc/mcdi_mon.c b/drivers/net/ethernet/sfc/mcdi_mon.c
index 99c80f8c0a0e..2891b409d263 100644
--- a/drivers/net/ethernet/sfc/mcdi_mon.c
+++ b/drivers/net/ethernet/sfc/mcdi_mon.c
@@ -42,13 +42,13 @@ static const struct {
42} efx_mcdi_sensor_type[] = { 42} efx_mcdi_sensor_type[] = {
43#define SENSOR(name, label, hwmon_type, port) \ 43#define SENSOR(name, label, hwmon_type, port) \
44 [MC_CMD_SENSOR_##name] = { label, EFX_HWMON_ ## hwmon_type, port } 44 [MC_CMD_SENSOR_##name] = { label, EFX_HWMON_ ## hwmon_type, port }
45 SENSOR(CONTROLLER_TEMP, "Controller ext. temp.", TEMP, -1), 45 SENSOR(CONTROLLER_TEMP, "Controller board temp.", TEMP, -1),
46 SENSOR(PHY_COMMON_TEMP, "PHY temp.", TEMP, -1), 46 SENSOR(PHY_COMMON_TEMP, "PHY temp.", TEMP, -1),
47 SENSOR(CONTROLLER_COOLING, "Controller cooling", COOL, -1), 47 SENSOR(CONTROLLER_COOLING, "Controller heat sink", COOL, -1),
48 SENSOR(PHY0_TEMP, "PHY temp.", TEMP, 0), 48 SENSOR(PHY0_TEMP, "PHY temp.", TEMP, 0),
49 SENSOR(PHY0_COOLING, "PHY cooling", COOL, 0), 49 SENSOR(PHY0_COOLING, "PHY heat sink", COOL, 0),
50 SENSOR(PHY1_TEMP, "PHY temp.", TEMP, 1), 50 SENSOR(PHY1_TEMP, "PHY temp.", TEMP, 1),
51 SENSOR(PHY1_COOLING, "PHY cooling", COOL, 1), 51 SENSOR(PHY1_COOLING, "PHY heat sink", COOL, 1),
52 SENSOR(IN_1V0, "1.0V supply", IN, -1), 52 SENSOR(IN_1V0, "1.0V supply", IN, -1),
53 SENSOR(IN_1V2, "1.2V supply", IN, -1), 53 SENSOR(IN_1V2, "1.2V supply", IN, -1),
54 SENSOR(IN_1V8, "1.8V supply", IN, -1), 54 SENSOR(IN_1V8, "1.8V supply", IN, -1),
@@ -56,34 +56,37 @@ static const struct {
56 SENSOR(IN_3V3, "3.3V supply", IN, -1), 56 SENSOR(IN_3V3, "3.3V supply", IN, -1),
57 SENSOR(IN_12V0, "12.0V supply", IN, -1), 57 SENSOR(IN_12V0, "12.0V supply", IN, -1),
58 SENSOR(IN_1V2A, "1.2V analogue supply", IN, -1), 58 SENSOR(IN_1V2A, "1.2V analogue supply", IN, -1),
59 SENSOR(IN_VREF, "ref. voltage", IN, -1), 59 SENSOR(IN_VREF, "Ref. voltage", IN, -1),
60 SENSOR(OUT_VAOE, "AOE power supply", IN, -1), 60 SENSOR(OUT_VAOE, "AOE FPGA supply", IN, -1),
61 SENSOR(AOE_TEMP, "AOE temp.", TEMP, -1), 61 SENSOR(AOE_TEMP, "AOE FPGA temp.", TEMP, -1),
62 SENSOR(PSU_AOE_TEMP, "AOE PSU temp.", TEMP, -1), 62 SENSOR(PSU_AOE_TEMP, "AOE regulator temp.", TEMP, -1),
63 SENSOR(PSU_TEMP, "Controller PSU temp.", TEMP, -1), 63 SENSOR(PSU_TEMP, "Controller regulator temp.",
64 SENSOR(FAN_0, NULL, COOL, -1), 64 TEMP, -1),
65 SENSOR(FAN_1, NULL, COOL, -1), 65 SENSOR(FAN_0, "Fan 0", COOL, -1),
66 SENSOR(FAN_2, NULL, COOL, -1), 66 SENSOR(FAN_1, "Fan 1", COOL, -1),
67 SENSOR(FAN_3, NULL, COOL, -1), 67 SENSOR(FAN_2, "Fan 2", COOL, -1),
68 SENSOR(FAN_4, NULL, COOL, -1), 68 SENSOR(FAN_3, "Fan 3", COOL, -1),
69 SENSOR(FAN_4, "Fan 4", COOL, -1),
69 SENSOR(IN_VAOE, "AOE input supply", IN, -1), 70 SENSOR(IN_VAOE, "AOE input supply", IN, -1),
70 SENSOR(OUT_IAOE, "AOE output current", CURR, -1), 71 SENSOR(OUT_IAOE, "AOE output current", CURR, -1),
71 SENSOR(IN_IAOE, "AOE input current", CURR, -1), 72 SENSOR(IN_IAOE, "AOE input current", CURR, -1),
72 SENSOR(NIC_POWER, "Board power use", POWER, -1), 73 SENSOR(NIC_POWER, "Board power use", POWER, -1),
73 SENSOR(IN_0V9, "0.9V supply", IN, -1), 74 SENSOR(IN_0V9, "0.9V supply", IN, -1),
74 SENSOR(IN_I0V9, "0.9V input current", CURR, -1), 75 SENSOR(IN_I0V9, "0.9V supply current", CURR, -1),
75 SENSOR(IN_I1V2, "1.2V input current", CURR, -1), 76 SENSOR(IN_I1V2, "1.2V supply current", CURR, -1),
76 SENSOR(IN_0V9_ADC, "0.9V supply (at ADC)", IN, -1), 77 SENSOR(IN_0V9_ADC, "0.9V supply (ext. ADC)", IN, -1),
77 SENSOR(CONTROLLER_2_TEMP, "Controller ext. temp. 2", TEMP, -1), 78 SENSOR(CONTROLLER_2_TEMP, "Controller board temp. 2", TEMP, -1),
78 SENSOR(VREG_INTERNAL_TEMP, "Voltage regulator temp.", TEMP, -1), 79 SENSOR(VREG_INTERNAL_TEMP, "Regulator die temp.", TEMP, -1),
79 SENSOR(VREG_0V9_TEMP, "0.9V regulator temp.", TEMP, -1), 80 SENSOR(VREG_0V9_TEMP, "0.9V regulator temp.", TEMP, -1),
80 SENSOR(VREG_1V2_TEMP, "1.2V regulator temp.", TEMP, -1), 81 SENSOR(VREG_1V2_TEMP, "1.2V regulator temp.", TEMP, -1),
81 SENSOR(CONTROLLER_VPTAT, "Controller int. temp. raw", IN, -1), 82 SENSOR(CONTROLLER_VPTAT,
82 SENSOR(CONTROLLER_INTERNAL_TEMP, "Controller int. temp.", TEMP, -1), 83 "Controller PTAT voltage (int. ADC)", IN, -1),
84 SENSOR(CONTROLLER_INTERNAL_TEMP,
85 "Controller die temp. (int. ADC)", TEMP, -1),
83 SENSOR(CONTROLLER_VPTAT_EXTADC, 86 SENSOR(CONTROLLER_VPTAT_EXTADC,
84 "Controller int. temp. raw (at ADC)", IN, -1), 87 "Controller PTAT voltage (ext. ADC)", IN, -1),
85 SENSOR(CONTROLLER_INTERNAL_TEMP_EXTADC, 88 SENSOR(CONTROLLER_INTERNAL_TEMP_EXTADC,
86 "Controller int. temp. (via ADC)", TEMP, -1), 89 "Controller die temp. (ext. ADC)", TEMP, -1),
87 SENSOR(AMBIENT_TEMP, "Ambient temp.", TEMP, -1), 90 SENSOR(AMBIENT_TEMP, "Ambient temp.", TEMP, -1),
88 SENSOR(AIRFLOW, "Air flow raw", IN, -1), 91 SENSOR(AIRFLOW, "Air flow raw", IN, -1),
89#undef SENSOR 92#undef SENSOR
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-12 20:49:42 -0400