mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Guenter Roeck <guenter.roeck@ericsson.com>
To: Jean Delvare <khali@linux-fr.org>,
	Jonathan Cameron <kernel@jic23.retrosnub.co.uk>,
	Randy Dunlap <rdunlap@xenotime.net>,
	Andrew Morton <akpm@linux-foundation.org>,
	"Ira W. Snyder" <iws@ovro.caltech.edu>,
	"Darrick J. Wong" <djwong@us.ibm.com>,
	"Ben Dooks (embedded platforms)" <ben-linux@fluff.org>,
	Hans de Goede <hdegoede@redhat.com>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Samuel Ortiz <sameo@linux.intel.com>,
	Crane Cai <crane.cai@amd.com>,
	Linus Walleij <linus.walleij@stericsson.com>,
	Ralf Baechle <ralf@linux-mips.org>
Cc: lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org,
	linux-i2c@vger.kernel.org,
	Guenter Roeck <guenter.roeck@ericsson.com>
Subject: [PATCH/RFC v2 4/4] hwmon: sysfs API updates
Date: Sun, 4 Jul 2010 21:10:18 -0700	[thread overview]
Message-ID: <1278303018-22069-5-git-send-email-guenter.roeck@ericsson.com> (raw)
In-Reply-To: <1278303018-22069-1-git-send-email-guenter.roeck@ericsson.com>

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
---
 Documentation/hwmon/sysfs-interface |   37 +++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index d4e2917..2dcec0f 100644
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -421,11 +421,12 @@ power[1-*]_accuracy		Accuracy of the power meter.
 				Unit: Percent
 				RO
 
-power[1-*]_alarm		1 if the system is drawing more power than the
-				cap allows; 0 otherwise.  A poll notification is
-				sent to this file when the power use exceeds the
-				cap.  This file only appears if the cap is known
-				to be enforced by hardware.
+power[1-*]_alarm		1 if the system is drawing more power than cap
+				or max allows; 0 otherwise.  A poll notification
+				is sent to this file when the power use exceeds
+				the cap or max limit. If only cap is supported,
+				this file only appears if the cap is known to be
+				enforced by hardware.
 				RO
 
 power[1-*]_cap			If power use rises above this limit, the
@@ -450,6 +451,18 @@ power[1-*]_cap_min		Minimum cap that can be set.
 				Unit: microWatt
 				RO
 
+power[1-*]_max			Maximum power.
+				Unit: microWatt
+				RW
+
+power[1-*]_crit			Critical maximum power.
+				If power rises to or above this limit, the
+				system will take drastic action to reduce power
+				consumption, such as a system shutdown. At the
+				very least, a power fault will be generated.
+				Unit: microWatt
+				RO
+
 **********
 * Energy *
 **********
@@ -471,8 +484,14 @@ limit-related alarms, not both. The driver should just reflect the hardware
 implementation.
 
 in[0-*]_alarm
+in[0-*]_crit_alarm
+curr[1-*]_alarm
+curr[1-*]_crit_alarm
+power[1-*]_alarm
+power[1-*]_crit_alarm
 fan[1-*]_alarm
 temp[1-*]_alarm
+temp[1-*]_crit_alarm
 		Channel alarm
 		0: no alarm
 		1: alarm
@@ -482,10 +501,17 @@ OR
 
 in[0-*]_min_alarm
 in[0-*]_max_alarm
+in[0-*]_lcrit_alarm
+in[0-*]_crit_alarm
+curr[1-*]_lcrit_alarm
+curr[1-*]_crit_alarm
+power[1-*]_min_alarm
+power[1-*]_max_alarm
 fan[1-*]_min_alarm
 fan[1-*]_max_alarm
 temp[1-*]_min_alarm
 temp[1-*]_max_alarm
+temp[1-*]_lcrit_alarm
 temp[1-*]_crit_alarm
 		Limit alarm
 		0: no alarm
@@ -497,7 +523,6 @@ to notify open diodes, unconnected fans etc. where the hardware
 supports it. When this boolean has value 1, the measurement for that
 channel should not be trusted.
 
-in[0-*]_fault
 fan[1-*]_fault
 temp[1-*]_fault
 		Input fault condition
-- 
1.7.0.87.g0901d


  parent reply	other threads:[~2010-07-05  4:17 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-05  4:10 [PATCH/RFC v2 0/4] hwmon: PMBus device driver Guenter Roeck
2010-07-05  4:10 ` [PATCH/RFC v2 1/4] " Guenter Roeck
2010-07-05  4:10 ` [PATCH/RFC v2 2/4] hwmon: i2c PMBus device emulator Guenter Roeck
2010-07-05  4:10 ` [PATCH/RFC v2 3/4] hwmon: pmbus driver documentation Guenter Roeck
2010-07-05  4:10 ` Guenter Roeck [this message]
2010-07-05  7:18   ` [PATCH/RFC v2 4/4] hwmon: sysfs API updates Jean Delvare
2010-07-05 21:39     ` Guenter Roeck
2010-07-06  7:21       ` Jean Delvare

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1278303018-22069-5-git-send-email-guenter.roeck@ericsson.com \
    --to=guenter.roeck@ericsson.com \
    --cc=akpm@linux-foundation.org \
    --cc=ben-linux@fluff.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=crane.cai@amd.com \
    --cc=djwong@us.ibm.com \
    --cc=hdegoede@redhat.com \
    --cc=iws@ovro.caltech.edu \
    --cc=kernel@jic23.retrosnub.co.uk \
    --cc=khali@linux-fr.org \
    --cc=linus.walleij@stericsson.com \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lm-sensors@lm-sensors.org \
    --cc=ralf@linux-mips.org \
    --cc=rdunlap@xenotime.net \
    --cc=sameo@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome