summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2018-07-17 15:48:11 -0400
committerDavid S. Miller <davem@davemloft.net>2018-07-17 21:01:46 -0400
commitaa7f29b07c8702127124d0522e3cd46850cdbc41 (patch)
treef3848e5700e3283a6525601db5aaa8c074802fed
parent2fe31e43124040a67495fa81f7ac67bc4c09ebc8 (diff)
hwmon: Add support for power min, lcrit, min_alarm and lcrit_alarm
Some sensors support reporting minimal and lower critical power, as well as alarms when these thresholds are reached. Add support for these attributes to the hwmon core. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/hwmon/hwmon.c4
-rw-r--r--include/linux/hwmon.h8
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index e88c01961948..33d51281272b 100644
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -394,12 +394,16 @@ static const char * const hwmon_power_attr_templates[] = {
394 [hwmon_power_cap_hyst] = "power%d_cap_hyst", 394 [hwmon_power_cap_hyst] = "power%d_cap_hyst",
395 [hwmon_power_cap_max] = "power%d_cap_max", 395 [hwmon_power_cap_max] = "power%d_cap_max",
396 [hwmon_power_cap_min] = "power%d_cap_min", 396 [hwmon_power_cap_min] = "power%d_cap_min",
397 [hwmon_power_min] = "power%d_min",
397 [hwmon_power_max] = "power%d_max", 398 [hwmon_power_max] = "power%d_max",
399 [hwmon_power_lcrit] = "power%d_lcrit",
398 [hwmon_power_crit] = "power%d_crit", 400 [hwmon_power_crit] = "power%d_crit",
399 [hwmon_power_label] = "power%d_label", 401 [hwmon_power_label] = "power%d_label",
400 [hwmon_power_alarm] = "power%d_alarm", 402 [hwmon_power_alarm] = "power%d_alarm",
401 [hwmon_power_cap_alarm] = "power%d_cap_alarm", 403 [hwmon_power_cap_alarm] = "power%d_cap_alarm",
404 [hwmon_power_min_alarm] = "power%d_min_alarm",
402 [hwmon_power_max_alarm] = "power%d_max_alarm", 405 [hwmon_power_max_alarm] = "power%d_max_alarm",
406 [hwmon_power_lcrit_alarm] = "power%d_lcrit_alarm",
403 [hwmon_power_crit_alarm] = "power%d_crit_alarm", 407 [hwmon_power_crit_alarm] = "power%d_crit_alarm",
404}; 408};
405 409
diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h
index 1b74ad11a5a4..b217101ca76e 100644
--- a/include/linux/hwmon.h
+++ b/include/linux/hwmon.h
@@ -188,12 +188,16 @@ enum hwmon_power_attributes {
188 hwmon_power_cap_hyst, 188 hwmon_power_cap_hyst,
189 hwmon_power_cap_max, 189 hwmon_power_cap_max,
190 hwmon_power_cap_min, 190 hwmon_power_cap_min,
191 hwmon_power_min,
191 hwmon_power_max, 192 hwmon_power_max,
192 hwmon_power_crit, 193 hwmon_power_crit,
194 hwmon_power_lcrit,
193 hwmon_power_label, 195 hwmon_power_label,
194 hwmon_power_alarm, 196 hwmon_power_alarm,
195 hwmon_power_cap_alarm, 197 hwmon_power_cap_alarm,
198 hwmon_power_min_alarm,
196 hwmon_power_max_alarm, 199 hwmon_power_max_alarm,
200 hwmon_power_lcrit_alarm,
197 hwmon_power_crit_alarm, 201 hwmon_power_crit_alarm,
198}; 202};
199 203
@@ -214,12 +218,16 @@ enum hwmon_power_attributes {
214#define HWMON_P_CAP_HYST BIT(hwmon_power_cap_hyst) 218#define HWMON_P_CAP_HYST BIT(hwmon_power_cap_hyst)
215#define HWMON_P_CAP_MAX BIT(hwmon_power_cap_max) 219#define HWMON_P_CAP_MAX BIT(hwmon_power_cap_max)
216#define HWMON_P_CAP_MIN BIT(hwmon_power_cap_min) 220#define HWMON_P_CAP_MIN BIT(hwmon_power_cap_min)
221#define HWMON_P_MIN BIT(hwmon_power_min)
217#define HWMON_P_MAX BIT(hwmon_power_max) 222#define HWMON_P_MAX BIT(hwmon_power_max)
223#define HWMON_P_LCRIT BIT(hwmon_power_lcrit)
218#define HWMON_P_CRIT BIT(hwmon_power_crit) 224#define HWMON_P_CRIT BIT(hwmon_power_crit)
219#define HWMON_P_LABEL BIT(hwmon_power_label) 225#define HWMON_P_LABEL BIT(hwmon_power_label)
220#define HWMON_P_ALARM BIT(hwmon_power_alarm) 226#define HWMON_P_ALARM BIT(hwmon_power_alarm)
221#define HWMON_P_CAP_ALARM BIT(hwmon_power_cap_alarm) 227#define HWMON_P_CAP_ALARM BIT(hwmon_power_cap_alarm)
228#define HWMON_P_MIN_ALARM BIT(hwmon_power_max_alarm)
222#define HWMON_P_MAX_ALARM BIT(hwmon_power_max_alarm) 229#define HWMON_P_MAX_ALARM BIT(hwmon_power_max_alarm)
230#define HWMON_P_LCRIT_ALARM BIT(hwmon_power_lcrit_alarm)
223#define HWMON_P_CRIT_ALARM BIT(hwmon_power_crit_alarm) 231#define HWMON_P_CRIT_ALARM BIT(hwmon_power_crit_alarm)
224 232
225enum hwmon_energy_attributes { 233enum hwmon_energy_attributes {