From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
To: Andrey Smirnov <andrew.smirnov@gmail.com>,
Guenter Roeck <linux@roeck-us.net>,
Sebastian Reichel <sebastian.reichel@collabora.com>
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH v2 6/8] power: supply: core: add input voltage/current measurements
Date: Fri, 03 Apr 2020 18:23:33 +0200 [thread overview]
Message-ID: <2ce87c2511ddc5afb907a110fa0bc54af82b25d3.1585929579.git.mirq-linux@rere.qmqm.pl> (raw)
In-Reply-To: <cover.1585929579.git.mirq-linux@rere.qmqm.pl>
Introduce input voltage and current limits and measurements.
This makes room for e.g. VBUS measurements in USB chargers.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
v2: add parameter checking in power_supply_hwmon_read_string()
---
drivers/power/supply/power_supply_hwmon.c | 109 +++++++++++++++++++++-
drivers/power/supply/power_supply_sysfs.c | 2 +
include/linux/power_supply.h | 2 +
3 files changed, 108 insertions(+), 5 deletions(-)
diff --git a/drivers/power/supply/power_supply_hwmon.c b/drivers/power/supply/power_supply_hwmon.c
index a4f576f39b9c..ef6196bf9bec 100644
--- a/drivers/power/supply/power_supply_hwmon.c
+++ b/drivers/power/supply/power_supply_hwmon.c
@@ -13,7 +13,7 @@ struct power_supply_hwmon {
unsigned long *props;
};
-static int power_supply_hwmon_in_to_property(u32 attr)
+static int power_supply_hwmon_in0_to_property(u32 attr)
{
switch (attr) {
case hwmon_in_average:
@@ -29,7 +29,31 @@ static int power_supply_hwmon_in_to_property(u32 attr)
}
}
-static int power_supply_hwmon_curr_to_property(u32 attr)
+static int power_supply_hwmon_in1_to_property(u32 attr)
+{
+ switch (attr) {
+ case hwmon_in_max:
+ return POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT;
+ case hwmon_in_input:
+ return POWER_SUPPLY_PROP_INPUT_VOLTAGE_NOW;
+ default:
+ return -EINVAL;
+ }
+}
+
+static int power_supply_hwmon_in_to_property(u32 attr, int channel)
+{
+ switch (channel) {
+ case 0:
+ return power_supply_hwmon_in0_to_property(attr);
+ case 1:
+ return power_supply_hwmon_in1_to_property(attr);
+ default:
+ return -EINVAL;
+ }
+}
+
+static int power_supply_hwmon_curr0_to_property(u32 attr)
{
switch (attr) {
case hwmon_curr_average:
@@ -43,6 +67,35 @@ static int power_supply_hwmon_curr_to_property(u32 attr)
}
}
+static int power_supply_hwmon_curr1_to_property(u32 attr)
+{
+ switch (attr) {
+ case hwmon_curr_max:
+ return POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT;
+ case hwmon_curr_input:
+ return POWER_SUPPLY_PROP_INPUT_CURRENT_NOW;
+ default:
+ return -EINVAL;
+ }
+}
+
+static int power_supply_hwmon_curr_to_property(u32 attr, int channel)
+{
+ switch (channel) {
+ case 0:
+ return power_supply_hwmon_curr0_to_property(attr);
+ case 1:
+ return power_supply_hwmon_curr1_to_property(attr);
+ default:
+ return -EINVAL;
+ }
+}
+
+static const char *const ps_input_label[] = {
+ "battery",
+ "external source",
+};
+
static const char *const ps_temp_label[] = {
"temp",
"ambient temp",
@@ -87,9 +140,9 @@ power_supply_hwmon_to_property(enum hwmon_sensor_types type,
{
switch (type) {
case hwmon_in:
- return power_supply_hwmon_in_to_property(attr);
+ return power_supply_hwmon_in_to_property(attr, channel);
case hwmon_curr:
- return power_supply_hwmon_curr_to_property(attr);
+ return power_supply_hwmon_curr_to_property(attr, channel);
case hwmon_temp:
return power_supply_hwmon_temp_to_property(attr, channel);
default:
@@ -100,7 +153,9 @@ power_supply_hwmon_to_property(enum hwmon_sensor_types type,
static bool power_supply_hwmon_is_a_label(enum hwmon_sensor_types type,
u32 attr)
{
- return type == hwmon_temp && attr == hwmon_temp_label;
+ return (type == hwmon_temp && attr == hwmon_temp_label) ||
+ (type == hwmon_in && attr == hwmon_in_label) ||
+ (type == hwmon_curr && attr == hwmon_curr_label);
}
static bool power_supply_hwmon_has_property(
@@ -116,6 +171,14 @@ static bool power_supply_hwmon_has_input(
const struct power_supply_hwmon *psyhw,
enum hwmon_sensor_types type, int channel)
{
+ static const enum hwmon_in_attributes in_attrs[] = {
+ hwmon_in_input, hwmon_in_average,
+ hwmon_in_min, hwmon_in_max,
+ };
+ static const enum hwmon_curr_attributes curr_attrs[] = {
+ hwmon_curr_input, hwmon_curr_average,
+ hwmon_curr_max,
+ };
static const enum hwmon_temp_attributes temp_attrs[] = {
hwmon_temp_input,
hwmon_temp_min, hwmon_temp_max,
@@ -124,6 +187,20 @@ static bool power_supply_hwmon_has_input(
size_t i;
switch (type) {
+ case hwmon_in:
+ for (i = 0; i < ARRAY_SIZE(in_attrs); ++i)
+ if (power_supply_hwmon_has_property(psyhw, type,
+ in_attrs[i], channel))
+ return true;
+ break;
+
+ case hwmon_curr:
+ for (i = 0; i < ARRAY_SIZE(curr_attrs); ++i)
+ if (power_supply_hwmon_has_property(psyhw, type,
+ curr_attrs[i], channel))
+ return true;
+ break;
+
case hwmon_temp:
for (i = 0; i < ARRAY_SIZE(temp_attrs); ++i)
if (power_supply_hwmon_has_property(psyhw, type,
@@ -190,6 +267,13 @@ static int power_supply_hwmon_read_string(struct device *dev,
return -EINVAL;
switch (type) {
+ case hwmon_in:
+ case hwmon_curr:
+ if (channel >= ARRAY_SIZE(ps_input_label))
+ return -EINVAL;
+ *str = ps_input_label[channel];
+ return 0;
+
case hwmon_temp:
if (channel >= ARRAY_SIZE(ps_temp_label))
return -EINVAL;
@@ -309,15 +393,26 @@ static const struct hwmon_channel_info *power_supply_hwmon_info[] = {
HWMON_T_MAX_ALARM),
HWMON_CHANNEL_INFO(curr,
+ HWMON_C_LABEL |
HWMON_C_AVERAGE |
HWMON_C_MAX |
+ HWMON_C_INPUT,
+
+ HWMON_C_LABEL |
+ HWMON_C_MAX |
HWMON_C_INPUT),
HWMON_CHANNEL_INFO(in,
+ HWMON_I_LABEL |
HWMON_I_AVERAGE |
HWMON_I_MIN |
HWMON_I_MAX |
+ HWMON_I_INPUT,
+
+ HWMON_I_LABEL |
+ HWMON_I_MAX |
HWMON_I_INPUT),
+
NULL
};
@@ -382,6 +477,10 @@ int power_supply_add_hwmon_sysfs(struct power_supply *psy)
case POWER_SUPPLY_PROP_VOLTAGE_MIN:
case POWER_SUPPLY_PROP_VOLTAGE_MAX:
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+ case POWER_SUPPLY_PROP_INPUT_CURRENT_NOW:
+ case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
+ case POWER_SUPPLY_PROP_INPUT_VOLTAGE_NOW:
+ case POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT:
set_bit(prop, psyhw->props);
break;
default:
diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c
index 51de3f47b25d..1d1fb69516a8 100644
--- a/drivers/power/supply/power_supply_sysfs.c
+++ b/drivers/power/supply/power_supply_sysfs.c
@@ -273,7 +273,9 @@ static struct device_attribute power_supply_attrs[] = {
POWER_SUPPLY_ATTR(charge_control_limit_max),
POWER_SUPPLY_ATTR(charge_control_start_threshold),
POWER_SUPPLY_ATTR(charge_control_end_threshold),
+ POWER_SUPPLY_ATTR(input_current_now),
POWER_SUPPLY_ATTR(input_current_limit),
+ POWER_SUPPLY_ATTR(input_voltage_now),
POWER_SUPPLY_ATTR(input_voltage_limit),
POWER_SUPPLY_ATTR(input_power_limit),
POWER_SUPPLY_ATTR(energy_full_design),
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 6a34df65d4d1..5313d1284aad 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -127,7 +127,9 @@ enum power_supply_property {
POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX,
POWER_SUPPLY_PROP_CHARGE_CONTROL_START_THRESHOLD, /* in percents! */
POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD, /* in percents! */
+ POWER_SUPPLY_PROP_INPUT_CURRENT_NOW,
POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT,
+ POWER_SUPPLY_PROP_INPUT_VOLTAGE_NOW,
POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT,
POWER_SUPPLY_PROP_INPUT_POWER_LIMIT,
POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
--
2.20.1
next prev parent reply other threads:[~2020-04-03 16:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 16:23 [PATCH v2 0/8] power: supply: core: extensions and fixes Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 1/8] power: supply: core: reduce power_supply_show_usb_type() parameters Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 2/8] power: supply: core: allow to constify property lists Michał Mirosław
2020-04-10 20:41 ` kbuild test robot
2020-04-10 22:14 ` kbuild test robot
2020-04-03 16:23 ` [PATCH v2 3/8] power: supply: core: fix HWMON temperature labels Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 5/8] power: supply: core: hide unused HWMON labels Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 4/8] power: supply: core: tabularize HWMON temperature labels Michał Mirosław
2020-04-03 16:47 ` Guenter Roeck
2020-04-03 16:56 ` Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 7/8] power: supply: core: add output voltage measurements Michał Mirosław
2020-04-03 16:23 ` Michał Mirosław [this message]
2020-04-03 16:23 ` [PATCH v2 8/8] power: supply: core: document measurement points Michał Mirosław
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=2ce87c2511ddc5afb907a110fa0bc54af82b25d3.1585929579.git.mirq-linux@rere.qmqm.pl \
--to=mirq-linux@rere.qmqm.pl \
--cc=andrew.smirnov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=sebastian.reichel@collabora.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;
as well as URLs for NNTP newsgroup(s).