Skip to content

Commit 1967f71

Browse files
Zbigniew Lukwinskigroeck
Zbigniew Lukwinski
authored andcommitted
hwmon: (core) Add support for rated attributes
Adding implementation for new attributes (rated_min/rated_max) for currentX, inX, powerX, tempX and humidityX. Tested with OpenBMC stack and simple hwmon driver using rated_min/rated_max for the following types of sensors: hwmon_temp, hwmon_in, hwmon_curr, hwmon_power, hwmon_humidity. For each sensor rated attributes were available and returned expected values. Signed-off-by: Zbigniew Lukwinski <zbigniew.lukwinski@linux.intel.com> Link: https://lore.kernel.org/r/1596224237-32280-3-git-send-email-zbigniew.lukwinski@linux.intel.com Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent e8e6123 commit 1967f71

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

drivers/hwmon/hwmon.c

+10
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,8 @@ static const char * const hwmon_temp_attr_templates[] = {
431431
[hwmon_temp_lowest] = "temp%d_lowest",
432432
[hwmon_temp_highest] = "temp%d_highest",
433433
[hwmon_temp_reset_history] = "temp%d_reset_history",
434+
[hwmon_temp_rated_min] = "temp%d_rated_min",
435+
[hwmon_temp_rated_max] = "temp%d_rated_max",
434436
};
435437

436438
static const char * const hwmon_in_attr_templates[] = {
@@ -450,6 +452,8 @@ static const char * const hwmon_in_attr_templates[] = {
450452
[hwmon_in_max_alarm] = "in%d_max_alarm",
451453
[hwmon_in_lcrit_alarm] = "in%d_lcrit_alarm",
452454
[hwmon_in_crit_alarm] = "in%d_crit_alarm",
455+
[hwmon_in_rated_min] = "in%d_rated_min",
456+
[hwmon_in_rated_max] = "in%d_rated_max",
453457
};
454458

455459
static const char * const hwmon_curr_attr_templates[] = {
@@ -469,6 +473,8 @@ static const char * const hwmon_curr_attr_templates[] = {
469473
[hwmon_curr_max_alarm] = "curr%d_max_alarm",
470474
[hwmon_curr_lcrit_alarm] = "curr%d_lcrit_alarm",
471475
[hwmon_curr_crit_alarm] = "curr%d_crit_alarm",
476+
[hwmon_curr_rated_min] = "curr%d_rated_min",
477+
[hwmon_curr_rated_max] = "curr%d_rated_max",
472478
};
473479

474480
static const char * const hwmon_power_attr_templates[] = {
@@ -501,6 +507,8 @@ static const char * const hwmon_power_attr_templates[] = {
501507
[hwmon_power_max_alarm] = "power%d_max_alarm",
502508
[hwmon_power_lcrit_alarm] = "power%d_lcrit_alarm",
503509
[hwmon_power_crit_alarm] = "power%d_crit_alarm",
510+
[hwmon_power_rated_min] = "power%d_rated_min",
511+
[hwmon_power_rated_max] = "power%d_rated_max",
504512
};
505513

506514
static const char * const hwmon_energy_attr_templates[] = {
@@ -519,6 +527,8 @@ static const char * const hwmon_humidity_attr_templates[] = {
519527
[hwmon_humidity_max_hyst] = "humidity%d_max_hyst",
520528
[hwmon_humidity_alarm] = "humidity%d_alarm",
521529
[hwmon_humidity_fault] = "humidity%d_fault",
530+
[hwmon_humidity_rated_min] = "humidity%d_rated_min",
531+
[hwmon_humidity_rated_max] = "humidity%d_rated_max",
522532
};
523533

524534
static const char * const hwmon_fan_attr_templates[] = {

include/linux/hwmon.h

+20
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ enum hwmon_temp_attributes {
8585
hwmon_temp_lowest,
8686
hwmon_temp_highest,
8787
hwmon_temp_reset_history,
88+
hwmon_temp_rated_min,
89+
hwmon_temp_rated_max,
8890
};
8991

9092
#define HWMON_T_ENABLE BIT(hwmon_temp_enable)
@@ -112,6 +114,8 @@ enum hwmon_temp_attributes {
112114
#define HWMON_T_LOWEST BIT(hwmon_temp_lowest)
113115
#define HWMON_T_HIGHEST BIT(hwmon_temp_highest)
114116
#define HWMON_T_RESET_HISTORY BIT(hwmon_temp_reset_history)
117+
#define HWMON_T_RATED_MIN BIT(hwmon_temp_rated_min)
118+
#define HWMON_T_RATED_MAX BIT(hwmon_temp_rated_max)
115119

116120
enum hwmon_in_attributes {
117121
hwmon_in_enable,
@@ -130,6 +134,8 @@ enum hwmon_in_attributes {
130134
hwmon_in_max_alarm,
131135
hwmon_in_lcrit_alarm,
132136
hwmon_in_crit_alarm,
137+
hwmon_in_rated_min,
138+
hwmon_in_rated_max,
133139
};
134140

135141
#define HWMON_I_ENABLE BIT(hwmon_in_enable)
@@ -148,6 +154,8 @@ enum hwmon_in_attributes {
148154
#define HWMON_I_MAX_ALARM BIT(hwmon_in_max_alarm)
149155
#define HWMON_I_LCRIT_ALARM BIT(hwmon_in_lcrit_alarm)
150156
#define HWMON_I_CRIT_ALARM BIT(hwmon_in_crit_alarm)
157+
#define HWMON_I_RATED_MIN BIT(hwmon_in_rated_min)
158+
#define HWMON_I_RATED_MAX BIT(hwmon_in_rated_max)
151159

152160
enum hwmon_curr_attributes {
153161
hwmon_curr_enable,
@@ -166,6 +174,8 @@ enum hwmon_curr_attributes {
166174
hwmon_curr_max_alarm,
167175
hwmon_curr_lcrit_alarm,
168176
hwmon_curr_crit_alarm,
177+
hwmon_curr_rated_min,
178+
hwmon_curr_rated_max,
169179
};
170180

171181
#define HWMON_C_ENABLE BIT(hwmon_curr_enable)
@@ -184,6 +194,8 @@ enum hwmon_curr_attributes {
184194
#define HWMON_C_MAX_ALARM BIT(hwmon_curr_max_alarm)
185195
#define HWMON_C_LCRIT_ALARM BIT(hwmon_curr_lcrit_alarm)
186196
#define HWMON_C_CRIT_ALARM BIT(hwmon_curr_crit_alarm)
197+
#define HWMON_C_RATED_MIN BIT(hwmon_curr_rated_min)
198+
#define HWMON_C_RATED_MAX BIT(hwmon_curr_rated_max)
187199

188200
enum hwmon_power_attributes {
189201
hwmon_power_enable,
@@ -215,6 +227,8 @@ enum hwmon_power_attributes {
215227
hwmon_power_max_alarm,
216228
hwmon_power_lcrit_alarm,
217229
hwmon_power_crit_alarm,
230+
hwmon_power_rated_min,
231+
hwmon_power_rated_max,
218232
};
219233

220234
#define HWMON_P_ENABLE BIT(hwmon_power_enable)
@@ -246,6 +260,8 @@ enum hwmon_power_attributes {
246260
#define HWMON_P_MAX_ALARM BIT(hwmon_power_max_alarm)
247261
#define HWMON_P_LCRIT_ALARM BIT(hwmon_power_lcrit_alarm)
248262
#define HWMON_P_CRIT_ALARM BIT(hwmon_power_crit_alarm)
263+
#define HWMON_P_RATED_MIN BIT(hwmon_power_rated_min)
264+
#define HWMON_P_RATED_MAX BIT(hwmon_power_rated_max)
249265

250266
enum hwmon_energy_attributes {
251267
hwmon_energy_enable,
@@ -267,6 +283,8 @@ enum hwmon_humidity_attributes {
267283
hwmon_humidity_max_hyst,
268284
hwmon_humidity_alarm,
269285
hwmon_humidity_fault,
286+
hwmon_humidity_rated_min,
287+
hwmon_humidity_rated_max,
270288
};
271289

272290
#define HWMON_H_ENABLE BIT(hwmon_humidity_enable)
@@ -278,6 +296,8 @@ enum hwmon_humidity_attributes {
278296
#define HWMON_H_MAX_HYST BIT(hwmon_humidity_max_hyst)
279297
#define HWMON_H_ALARM BIT(hwmon_humidity_alarm)
280298
#define HWMON_H_FAULT BIT(hwmon_humidity_fault)
299+
#define HWMON_H_RATED_MIN BIT(hwmon_humidity_rated_min)
300+
#define HWMON_H_RATED_MAX BIT(hwmon_humidity_rated_max)
281301

282302
enum hwmon_fan_attributes {
283303
hwmon_fan_enable,

0 commit comments

Comments
 (0)