sensors: Add support for rated values

Sysfs attributes for rated values were recently added to the kernel[1].
This adds support for displaying them in lm-sensors.

[1] - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e8e61235

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
This commit is contained in:
Chris Packham committed 2021-08-12 15:07:38 +12:00
1 parent 42f240d2a4
commit 88f6c5ec9b
3 files changed
+18

No files matched your search

+6
View File
@@ -163,6 +163,8 @@ typedef enum sensors_subfeature_type {
SENSORS_SUBFEATURE_IN_AVERAGE,
SENSORS_SUBFEATURE_IN_LOWEST,
SENSORS_SUBFEATURE_IN_HIGHEST,
SENSORS_SUBFEATURE_IN_RATED_MIN,
SENSORS_SUBFEATURE_IN_RATED_MAX,
SENSORS_SUBFEATURE_IN_ALARM = (SENSORS_FEATURE_IN << 8) | 0x80,
SENSORS_SUBFEATURE_IN_MIN_ALARM,
SENSORS_SUBFEATURE_IN_MAX_ALARM,
@@ -217,6 +219,8 @@ typedef enum sensors_subfeature_type {
SENSORS_SUBFEATURE_POWER_CRIT,
SENSORS_SUBFEATURE_POWER_MIN,
SENSORS_SUBFEATURE_POWER_LCRIT,
SENSORS_SUBFEATURE_POWER_RATED_MIN,
SENSORS_SUBFEATURE_POWER_RATED_MAX,
SENSORS_SUBFEATURE_POWER_AVERAGE_INTERVAL = (SENSORS_FEATURE_POWER << 8) | 0x80,
SENSORS_SUBFEATURE_POWER_ALARM,
SENSORS_SUBFEATURE_POWER_CAP_ALARM,
@@ -235,6 +239,8 @@ typedef enum sensors_subfeature_type {
SENSORS_SUBFEATURE_CURR_AVERAGE,
SENSORS_SUBFEATURE_CURR_LOWEST,
SENSORS_SUBFEATURE_CURR_HIGHEST,
SENSORS_SUBFEATURE_CURR_RATED_MIN,
SENSORS_SUBFEATURE_CURR_RATED_MAX,
SENSORS_SUBFEATURE_CURR_ALARM = (SENSORS_FEATURE_CURR << 8) | 0x80,
SENSORS_SUBFEATURE_CURR_MIN_ALARM,
SENSORS_SUBFEATURE_CURR_MAX_ALARM,
+6
View File
@@ -251,6 +251,8 @@ static const struct subfeature_type_match in_matches[] = {
{ "lcrit_alarm", SENSORS_SUBFEATURE_IN_LCRIT_ALARM },
{ "crit_alarm", SENSORS_SUBFEATURE_IN_CRIT_ALARM },
{ "beep", SENSORS_SUBFEATURE_IN_BEEP },
{ "rated_min", SENSORS_SUBFEATURE_IN_RATED_MIN },
{ "rated_max", SENSORS_SUBFEATURE_IN_RATED_MAX },
{ NULL, 0 }
};
@@ -288,6 +290,8 @@ static const struct subfeature_type_match power_matches[] = {
{ "crit_alarm", SENSORS_SUBFEATURE_POWER_CRIT_ALARM },
{ "lcrit_alarm", SENSORS_SUBFEATURE_POWER_LCRIT_ALARM },
{ "average_interval", SENSORS_SUBFEATURE_POWER_AVERAGE_INTERVAL },
{ "rated_min", SENSORS_SUBFEATURE_POWER_RATED_MIN },
{ "rated_max", SENSORS_SUBFEATURE_POWER_RATED_MAX },
{ NULL, 0 }
};
@@ -311,6 +315,8 @@ static const struct subfeature_type_match curr_matches[] = {
{ "lcrit_alarm", SENSORS_SUBFEATURE_CURR_LCRIT_ALARM },
{ "crit_alarm", SENSORS_SUBFEATURE_CURR_CRIT_ALARM },
{ "beep", SENSORS_SUBFEATURE_CURR_BEEP },
{ "rated_min", SENSORS_SUBFEATURE_CURR_RATED_MIN },
{ "rated_max", SENSORS_SUBFEATURE_CURR_RATED_MAX },
{ NULL, 0 }
};
+6
View File
@@ -428,6 +428,8 @@ static const struct sensor_subfeature_list voltage_sensors[] = {
{ SENSORS_SUBFEATURE_IN_AVERAGE, NULL, 0, "avg" },
{ SENSORS_SUBFEATURE_IN_LOWEST, NULL, 0, "lowest" },
{ SENSORS_SUBFEATURE_IN_HIGHEST, NULL, 0, "highest" },
{ SENSORS_SUBFEATURE_IN_RATED_MIN, NULL, 0, "rated min" },
{ SENSORS_SUBFEATURE_IN_RATED_MAX, NULL, 0, "rated max" },
{ -1, NULL, 0, NULL }
};
@@ -584,6 +586,8 @@ static const struct sensor_subfeature_list power_common_sensors[] = {
{ SENSORS_SUBFEATURE_POWER_LCRIT, NULL, 0, "lcrit" },
{ SENSORS_SUBFEATURE_POWER_CRIT, NULL, 0, "crit" },
{ SENSORS_SUBFEATURE_POWER_CAP, NULL, 0, "cap" },
{ SENSORS_SUBFEATURE_POWER_RATED_MIN, NULL, 0, "rated min" },
{ SENSORS_SUBFEATURE_POWER_RATED_MAX, NULL, 0, "rated max" },
{ -1, NULL, 0, NULL }
};
@@ -788,6 +792,8 @@ static const struct sensor_subfeature_list current_sensors[] = {
{ SENSORS_SUBFEATURE_CURR_AVERAGE, NULL, 0, "avg" },
{ SENSORS_SUBFEATURE_CURR_LOWEST, NULL, 0, "lowest" },
{ SENSORS_SUBFEATURE_CURR_HIGHEST, NULL, 0, "highest" },
{ SENSORS_SUBFEATURE_CURR_RATED_MIN, NULL, 0, "rated min" },
{ SENSORS_SUBFEATURE_CURR_RATED_MAX, NULL, 0, "rated max" },
{ -1, NULL, 0, NULL }
};