| Message ID | 1531856893-27884-3-git-send-email-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On Tue, Jul 17, 2018 at 09:48:11PM +0200, Andrew Lunn wrote: > 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> > --- > drivers/hwmon/hwmon.c | 4 ++++ > include/linux/hwmon.h | 8 ++++++++ > 2 files changed, 12 insertions(+) > > 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[] = { > [hwmon_power_cap_hyst] = "power%d_cap_hyst", > [hwmon_power_cap_max] = "power%d_cap_max", > [hwmon_power_cap_min] = "power%d_cap_min", > + [hwmon_power_min] = "power%d_min", > [hwmon_power_max] = "power%d_max", > + [hwmon_power_lcrit] = "power%d_lcrit", > [hwmon_power_crit] = "power%d_crit", > [hwmon_power_label] = "power%d_label", > [hwmon_power_alarm] = "power%d_alarm", > [hwmon_power_cap_alarm] = "power%d_cap_alarm", > + [hwmon_power_min_alarm] = "power%d_min_alarm", > [hwmon_power_max_alarm] = "power%d_max_alarm", > + [hwmon_power_lcrit_alarm] = "power%d_lcrit_alarm", > [hwmon_power_crit_alarm] = "power%d_crit_alarm", > }; > > 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 { > hwmon_power_cap_hyst, > hwmon_power_cap_max, > hwmon_power_cap_min, > + hwmon_power_min, > hwmon_power_max, > hwmon_power_crit, > + hwmon_power_lcrit, > hwmon_power_label, > hwmon_power_alarm, > hwmon_power_cap_alarm, > + hwmon_power_min_alarm, > hwmon_power_max_alarm, > + hwmon_power_lcrit_alarm, > hwmon_power_crit_alarm, > }; > > @@ -214,12 +218,16 @@ enum hwmon_power_attributes { > #define HWMON_P_CAP_HYST BIT(hwmon_power_cap_hyst) > #define HWMON_P_CAP_MAX BIT(hwmon_power_cap_max) > #define HWMON_P_CAP_MIN BIT(hwmon_power_cap_min) > +#define HWMON_P_MIN BIT(hwmon_power_min) > #define HWMON_P_MAX BIT(hwmon_power_max) > +#define HWMON_P_LCRIT BIT(hwmon_power_lcrit) > #define HWMON_P_CRIT BIT(hwmon_power_crit) > #define HWMON_P_LABEL BIT(hwmon_power_label) > #define HWMON_P_ALARM BIT(hwmon_power_alarm) > #define HWMON_P_CAP_ALARM BIT(hwmon_power_cap_alarm) > +#define HWMON_P_MIN_ALARM BIT(hwmon_power_max_alarm) > #define HWMON_P_MAX_ALARM BIT(hwmon_power_max_alarm) > +#define HWMON_P_LCRIT_ALARM BIT(hwmon_power_lcrit_alarm) > #define HWMON_P_CRIT_ALARM BIT(hwmon_power_crit_alarm) > > enum hwmon_energy_attributes { > -- > 2.18.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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[] = { [hwmon_power_cap_hyst] = "power%d_cap_hyst", [hwmon_power_cap_max] = "power%d_cap_max", [hwmon_power_cap_min] = "power%d_cap_min", + [hwmon_power_min] = "power%d_min", [hwmon_power_max] = "power%d_max", + [hwmon_power_lcrit] = "power%d_lcrit", [hwmon_power_crit] = "power%d_crit", [hwmon_power_label] = "power%d_label", [hwmon_power_alarm] = "power%d_alarm", [hwmon_power_cap_alarm] = "power%d_cap_alarm", + [hwmon_power_min_alarm] = "power%d_min_alarm", [hwmon_power_max_alarm] = "power%d_max_alarm", + [hwmon_power_lcrit_alarm] = "power%d_lcrit_alarm", [hwmon_power_crit_alarm] = "power%d_crit_alarm", }; 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 { hwmon_power_cap_hyst, hwmon_power_cap_max, hwmon_power_cap_min, + hwmon_power_min, hwmon_power_max, hwmon_power_crit, + hwmon_power_lcrit, hwmon_power_label, hwmon_power_alarm, hwmon_power_cap_alarm, + hwmon_power_min_alarm, hwmon_power_max_alarm, + hwmon_power_lcrit_alarm, hwmon_power_crit_alarm, }; @@ -214,12 +218,16 @@ enum hwmon_power_attributes { #define HWMON_P_CAP_HYST BIT(hwmon_power_cap_hyst) #define HWMON_P_CAP_MAX BIT(hwmon_power_cap_max) #define HWMON_P_CAP_MIN BIT(hwmon_power_cap_min) +#define HWMON_P_MIN BIT(hwmon_power_min) #define HWMON_P_MAX BIT(hwmon_power_max) +#define HWMON_P_LCRIT BIT(hwmon_power_lcrit) #define HWMON_P_CRIT BIT(hwmon_power_crit) #define HWMON_P_LABEL BIT(hwmon_power_label) #define HWMON_P_ALARM BIT(hwmon_power_alarm) #define HWMON_P_CAP_ALARM BIT(hwmon_power_cap_alarm) +#define HWMON_P_MIN_ALARM BIT(hwmon_power_max_alarm) #define HWMON_P_MAX_ALARM BIT(hwmon_power_max_alarm) +#define HWMON_P_LCRIT_ALARM BIT(hwmon_power_lcrit_alarm) #define HWMON_P_CRIT_ALARM BIT(hwmon_power_crit_alarm) enum hwmon_energy_attributes {
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> --- drivers/hwmon/hwmon.c | 4 ++++ include/linux/hwmon.h | 8 ++++++++ 2 files changed, 12 insertions(+)