Add support for automatically exposing data from the
simple-battery firmware node with a single configuration
option in the power-supply device.
Signed-off-by: Sebastian Reichel <[email protected]>
---
drivers/power/supply/power_supply_core.c | 153 +++++++++++++++++++---
drivers/power/supply/power_supply_sysfs.c | 16 +++
include/linux/power_supply.h | 31 +++++
3 files changed, 181 insertions(+), 19 deletions(-)
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index f3d7c1da299f..c3684ec46b3f 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -388,7 +388,7 @@ static int __power_supply_get_supplier_property(struct device *dev, void *_data)
struct psy_get_supplier_prop_data *data = _data;
if (__power_supply_is_supplied_by(epsy, data->psy))
- if (!epsy->desc->get_property(epsy, data->psp, data->val))
+ if (!power_supply_get_property(epsy, data->psp, data->val))
return 1; /* Success */
return 0; /* Continue iterating */
@@ -832,6 +832,111 @@ void power_supply_put_battery_info(struct power_supply *psy,
}
EXPORT_SYMBOL_GPL(power_supply_put_battery_info);
+bool power_supply_battery_info_has_prop(struct power_supply_battery_info *info,
+ enum power_supply_property psp)
+{
+ if (!info)
+ return false;
+
+ switch (psp) {
+ case POWER_SUPPLY_PROP_TECHNOLOGY:
+ return info->technology != POWER_SUPPLY_TECHNOLOGY_UNKNOWN;
+ case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
+ return info->energy_full_design_uwh >= 0;
+ case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
+ return info->charge_full_design_uah >= 0;
+ case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
+ return info->voltage_min_design_uv >= 0;
+ case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
+ return info->voltage_max_design_uv >= 0;
+ case POWER_SUPPLY_PROP_PRECHARGE_CURRENT:
+ return info->precharge_current_ua >= 0;
+ case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT:
+ return info->charge_term_current_ua >= 0;
+ case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
+ return info->constant_charge_current_max_ua >= 0;
+ case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
+ return info->constant_charge_voltage_max_uv >= 0;
+ case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN:
+ return info->temp_ambient_alert_min > INT_MIN;
+ case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX:
+ return info->temp_ambient_alert_max < INT_MAX;
+ case POWER_SUPPLY_PROP_TEMP_ALERT_MIN:
+ return info->temp_alert_min > INT_MIN;
+ case POWER_SUPPLY_PROP_TEMP_ALERT_MAX:
+ return info->temp_alert_max < INT_MAX;
+ case POWER_SUPPLY_PROP_TEMP_MIN:
+ return info->temp_min > INT_MIN;
+ case POWER_SUPPLY_PROP_TEMP_MAX:
+ return info->temp_max < INT_MAX;
+ default:
+ return false;
+ }
+}
+EXPORT_SYMBOL_GPL(power_supply_battery_info_has_prop);
+
+int power_supply_battery_info_get_prop(struct power_supply_battery_info *info,
+ enum power_supply_property psp,
+ union power_supply_propval *val)
+{
+ if (!info)
+ return -EINVAL;
+
+ if (!power_supply_battery_info_has_prop(info, psp))
+ return -EINVAL;
+
+ switch (psp) {
+ case POWER_SUPPLY_PROP_TECHNOLOGY:
+ val->intval = info->technology;
+ return 0;
+ case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
+ val->intval = info->energy_full_design_uwh;
+ return 0;
+ case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
+ val->intval = info->charge_full_design_uah;
+ return 0;
+ case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
+ val->intval = info->voltage_min_design_uv;
+ return 0;
+ case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
+ val->intval = info->voltage_max_design_uv;
+ return 0;
+ case POWER_SUPPLY_PROP_PRECHARGE_CURRENT:
+ val->intval = info->precharge_current_ua;
+ return 0;
+ case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT:
+ val->intval = info->charge_term_current_ua;
+ return 0;
+ case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
+ val->intval = info->constant_charge_current_max_ua;
+ return 0;
+ case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
+ val->intval = info->constant_charge_voltage_max_uv;
+ return 0;
+ case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN:
+ val->intval = info->temp_ambient_alert_min;
+ return 0;
+ case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX:
+ val->intval = info->temp_ambient_alert_max;
+ return 0;
+ case POWER_SUPPLY_PROP_TEMP_ALERT_MIN:
+ val->intval = info->temp_alert_min;
+ return 0;
+ case POWER_SUPPLY_PROP_TEMP_ALERT_MAX:
+ val->intval = info->temp_alert_max;
+ return 0;
+ case POWER_SUPPLY_PROP_TEMP_MIN:
+ val->intval = info->temp_min;
+ return 0;
+ case POWER_SUPPLY_PROP_TEMP_MAX:
+ val->intval = info->temp_max;
+ return 0;
+ default:
+ return -EINVAL;
+ }
+}
+EXPORT_SYMBOL_GPL(power_supply_battery_info_get_prop);
+
/**
* power_supply_temp2resist_simple() - find the battery internal resistance
* percent from temperature
@@ -1046,6 +1151,22 @@ bool power_supply_battery_bti_in_range(struct power_supply_battery_info *info,
}
EXPORT_SYMBOL_GPL(power_supply_battery_bti_in_range);
+static bool psy_has_property(const struct power_supply_desc *psy_desc,
+ enum power_supply_property psp)
+{
+ bool found = false;
+ int i;
+
+ for (i = 0; i < psy_desc->num_properties; i++) {
+ if (psy_desc->properties[i] == psp) {
+ found = true;
+ break;
+ }
+ }
+
+ return found;
+}
+
int power_supply_get_property(struct power_supply *psy,
enum power_supply_property psp,
union power_supply_propval *val)
@@ -1056,9 +1177,13 @@ int power_supply_get_property(struct power_supply *psy,
return -ENODEV;
}
- return psy->desc->get_property(psy, psp, val);
+ if (psy_has_property(psy->desc, psp))
+ return psy->desc->get_property(psy, psp, val);
+ else if(psy->desc->expose_battery_info)
+ return power_supply_battery_info_get_prop(psy->battery_info, psp, val);
+ else
+ return -EINVAL;
}
-EXPORT_SYMBOL_GPL(power_supply_get_property);
int power_supply_set_property(struct power_supply *psy,
enum power_supply_property psp,
@@ -1117,22 +1242,6 @@ void power_supply_unreg_notifier(struct notifier_block *nb)
}
EXPORT_SYMBOL_GPL(power_supply_unreg_notifier);
-static bool psy_has_property(const struct power_supply_desc *psy_desc,
- enum power_supply_property psp)
-{
- bool found = false;
- int i;
-
- for (i = 0; i < psy_desc->num_properties; i++) {
- if (psy_desc->properties[i] == psp) {
- found = true;
- break;
- }
- }
-
- return found;
-}
-
#ifdef CONFIG_THERMAL
static int power_supply_read_temp(struct thermal_zone_device *tzd,
int *temp)
@@ -1255,6 +1364,12 @@ __power_supply_register(struct device *parent,
goto check_supplies_failed;
}
+ if (psy->desc->expose_battery_info) {
+ rc = power_supply_get_battery_info(psy, &psy->battery_info);
+ if (rc)
+ goto check_supplies_failed;
+ }
+
spin_lock_init(&psy->changed_lock);
rc = device_add(dev);
if (rc)
diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c
index c228205e0953..8822a17f9589 100644
--- a/drivers/power/supply/power_supply_sysfs.c
+++ b/drivers/power/supply/power_supply_sysfs.c
@@ -380,6 +380,11 @@ static umode_t power_supply_attr_is_visible(struct kobject *kobj,
}
}
+ if (psy->desc->expose_battery_info) {
+ if (power_supply_battery_info_has_prop(psy->battery_info, attrno))
+ return mode;
+ }
+
return 0;
}
@@ -488,6 +493,17 @@ int power_supply_uevent(const struct device *dev, struct kobj_uevent_env *env)
goto out;
}
+ if (psy->desc->expose_battery_info) {
+ for (j = 0; j < ARRAY_SIZE(power_supply_battery_info_properties); j++) {
+ if (!power_supply_battery_info_has_prop(psy->battery_info, power_supply_battery_info_properties[j]))
+ continue;
+ ret = add_prop_uevent(dev, env, power_supply_battery_info_properties[j],
+ prop_buf);
+ if (ret)
+ goto out;
+ }
+ }
+
out:
free_page((unsigned long)prop_buf);
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index aa2c4a7c4826..de0ea8320f3d 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -275,6 +275,13 @@ struct power_supply_desc {
* sensors or other supplies.
*/
bool no_thermal;
+ /*
+ * Set if constant battery information from firmware should be
+ * exposed automatically. No driver specific code is required
+ * in that case. If the driver also handles a property provided
+ * by constant firmware data, the driver's handler is preferred.
+ */
+ bool expose_battery_info;
/* For APM emulation, think legacy userspace. */
int use_for_apm;
};
@@ -301,6 +308,7 @@ struct power_supply {
bool initialized;
bool removing;
atomic_t use_cnt;
+ struct power_supply_battery_info *battery_info;
#ifdef CONFIG_THERMAL
struct thermal_zone_device *tzd;
struct thermal_cooling_device *tcd;
@@ -766,6 +774,24 @@ struct power_supply_battery_info {
int bti_resistance_tolerance;
};
+static const enum power_supply_property power_supply_battery_info_properties[] = {
+ POWER_SUPPLY_PROP_TECHNOLOGY,
+ POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
+ POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
+ POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
+ POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
+ POWER_SUPPLY_PROP_PRECHARGE_CURRENT,
+ POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT,
+ POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
+ POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX,
+ POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN,
+ POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX,
+ POWER_SUPPLY_PROP_TEMP_ALERT_MIN,
+ POWER_SUPPLY_PROP_TEMP_ALERT_MAX,
+ POWER_SUPPLY_PROP_TEMP_MIN,
+ POWER_SUPPLY_PROP_TEMP_MAX,
+};
+
extern struct atomic_notifier_head power_supply_notifier;
extern int power_supply_reg_notifier(struct notifier_block *nb);
extern void power_supply_unreg_notifier(struct notifier_block *nb);
@@ -795,6 +821,11 @@ extern int power_supply_get_battery_info(struct power_supply *psy,
struct power_supply_battery_info **info_out);
extern void power_supply_put_battery_info(struct power_supply *psy,
struct power_supply_battery_info *info);
+extern bool power_supply_battery_info_has_prop(struct power_supply_battery_info *info,
+ enum power_supply_property psp);
+extern int power_supply_battery_info_get_prop(struct power_supply_battery_info *info,
+ enum power_supply_property psp,
+ union power_supply_propval *val);
extern int power_supply_ocv2cap_simple(struct power_supply_battery_ocv_table *table,
int table_len, int ocv);
extern struct power_supply_battery_ocv_table *
--
2.39.2
Hi Sebastian,
I love your patch! Perhaps something to improve:
[auto build test WARNING on sre-power-supply/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Sebastian-Reichel/dt-bindings-power-supply-adc-battery-add-binding/20230310-065229
base: https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git for-next
patch link: https://lore.kernel.org/r/20230309225041.477440-3-sre%40kernel.org
patch subject: [PATCHv1 02/11] power: supply: core: auto-exposure of simple-battery data
config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20230310/[email protected]/config)
compiler: gcc-11 (Debian 11.3.0-8) 11.3.0
reproduce (this is a W=1 build):
# https://github.com/intel-lab-lkp/linux/commit/83ec4c841d68a66bc95f5e534a805e765785f934
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Sebastian-Reichel/dt-bindings-power-supply-adc-battery-add-binding/20230310-065229
git checkout 83ec4c841d68a66bc95f5e534a805e765785f934
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=x86_64 olddefconfig
make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/power/supply/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
In file included from drivers/power/supply/power_supply_core.c:21:
>> include/linux/power_supply.h:777:41: warning: 'power_supply_battery_info_properties' defined but not used [-Wunused-const-variable=]
777 | static const enum power_supply_property power_supply_battery_info_properties[] = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/power_supply_battery_info_properties +777 include/linux/power_supply.h
776
> 777 static const enum power_supply_property power_supply_battery_info_properties[] = {
778 POWER_SUPPLY_PROP_TECHNOLOGY,
779 POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
780 POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
781 POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
782 POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
783 POWER_SUPPLY_PROP_PRECHARGE_CURRENT,
784 POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT,
785 POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
786 POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX,
787 POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN,
788 POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX,
789 POWER_SUPPLY_PROP_TEMP_ALERT_MIN,
790 POWER_SUPPLY_PROP_TEMP_ALERT_MAX,
791 POWER_SUPPLY_PROP_TEMP_MIN,
792 POWER_SUPPLY_PROP_TEMP_MAX,
793 };
794
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests
Hi Sebastian,
I love your patch! Yet something to improve:
[auto build test ERROR on sre-power-supply/for-next]
[also build test ERROR on robh/for-next linus/master v6.3-rc1 next-20230310]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Sebastian-Reichel/dt-bindings-power-supply-adc-battery-add-binding/20230310-065229
base: https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git for-next
patch link: https://lore.kernel.org/r/20230309225041.477440-3-sre%40kernel.org
patch subject: [PATCHv1 02/11] power: supply: core: auto-exposure of simple-battery data
config: x86_64-randconfig-a002 (https://download.01.org/0day-ci/archive/20230310/[email protected]/config)
compiler: gcc-11 (Debian 11.3.0-8) 11.3.0
reproduce (this is a W=1 build):
# https://github.com/intel-lab-lkp/linux/commit/83ec4c841d68a66bc95f5e534a805e765785f934
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Sebastian-Reichel/dt-bindings-power-supply-adc-battery-add-binding/20230310-065229
git checkout 83ec4c841d68a66bc95f5e534a805e765785f934
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=x86_64 olddefconfig
make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>, old ones prefixed by <<):
>> ERROR: modpost: "power_supply_get_property" [drivers/phy/ti/phy-tusb1210.ko] undefined!
>> ERROR: modpost: "power_supply_get_property" [drivers/power/supply/88pm860x_charger.ko] undefined!
>> ERROR: modpost: "power_supply_get_property" [drivers/power/supply/charger-manager.ko] undefined!
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests
Hi Sebastian,
thanks for your patch!
On Thu, Mar 9, 2023 at 11:50 PM Sebastian Reichel <[email protected]> wrote:
> + /*
> + * Set if constant battery information from firmware should be
> + * exposed automatically. No driver specific code is required
> + * in that case. If the driver also handles a property provided
> + * by constant firmware data, the driver's handler is preferred.
> + */
> + bool expose_battery_info;
Playing it safe with opt-in I see! But I would probably invert it and add
a hide_battery_info for those that don't wanna expose it. It seems
pretty useful to just expose this in general.
However I have no insight in what happens on laptops etc for this
so I guess you have your reasons, either way:
Reviewed-by: Linus Walleij <[email protected]>
> +extern bool power_supply_battery_info_has_prop(struct power_supply_battery_info *info,
> + enum power_supply_property psp);
> +extern int power_supply_battery_info_get_prop(struct power_supply_battery_info *info,
> + enum power_supply_property psp,
> + union power_supply_propval *val);
I think the build robots complain because you need to add some stubs
for the not enabled case.
Yours,
Linus Walleij
On 3/10/23 00:50, Sebastian Reichel wrote:
> Add support for automatically exposing data from the
> simple-battery firmware node with a single configuration
> option in the power-supply device.
>
> Signed-off-by: Sebastian Reichel <[email protected]>
> ---
> drivers/power/supply/power_supply_core.c | 153 +++++++++++++++++++---
> drivers/power/supply/power_supply_sysfs.c | 16 +++
> include/linux/power_supply.h | 31 +++++
> 3 files changed, 181 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
> index f3d7c1da299f..c3684ec46b3f 100644
> --- a/drivers/power/supply/power_supply_core.c
> +++ b/drivers/power/supply/power_supply_core.c
> @@ -388,7 +388,7 @@ static int __power_supply_get_supplier_property(struct device *dev, void *_data)
> struct psy_get_supplier_prop_data *data = _data;
>
> if (__power_supply_is_supplied_by(epsy, data->psy))
> - if (!epsy->desc->get_property(epsy, data->psp, data->val))
> + if (!power_supply_get_property(epsy, data->psp, data->val))
> return 1; /* Success */
>
> return 0; /* Continue iterating */
> @@ -832,6 +832,111 @@ void power_supply_put_battery_info(struct power_supply *psy,
> }
> EXPORT_SYMBOL_GPL(power_supply_put_battery_info);
>
> +bool power_supply_battery_info_has_prop(struct power_supply_battery_info *info,
> + enum power_supply_property psp)
> +{
> + if (!info)
> + return false;
> +
> + switch (psp) {
> + case POWER_SUPPLY_PROP_TECHNOLOGY:
> + return info->technology != POWER_SUPPLY_TECHNOLOGY_UNKNOWN;
> + case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
> + return info->energy_full_design_uwh >= 0;
> + case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
> + return info->charge_full_design_uah >= 0;
> + case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
> + return info->voltage_min_design_uv >= 0;
> + case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
> + return info->voltage_max_design_uv >= 0;
> + case POWER_SUPPLY_PROP_PRECHARGE_CURRENT:
> + return info->precharge_current_ua >= 0;
> + case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT:
> + return info->charge_term_current_ua >= 0;
> + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
> + return info->constant_charge_current_max_ua >= 0;
> + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
> + return info->constant_charge_voltage_max_uv >= 0;
> + case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN:
> + return info->temp_ambient_alert_min > INT_MIN;
> + case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX:
> + return info->temp_ambient_alert_max < INT_MAX;
> + case POWER_SUPPLY_PROP_TEMP_ALERT_MIN:
> + return info->temp_alert_min > INT_MIN;
> + case POWER_SUPPLY_PROP_TEMP_ALERT_MAX:
> + return info->temp_alert_max < INT_MAX;
> + case POWER_SUPPLY_PROP_TEMP_MIN:
> + return info->temp_min > INT_MIN;
> + case POWER_SUPPLY_PROP_TEMP_MAX:
> + return info->temp_max < INT_MAX;
> + default:
> + return false;
> + }
> +}
> +EXPORT_SYMBOL_GPL(power_supply_battery_info_has_prop);
> +
> +int power_supply_battery_info_get_prop(struct power_supply_battery_info *info,
> + enum power_supply_property psp,
> + union power_supply_propval *val)
> +{
> + if (!info)
> + return -EINVAL;
> +
> + if (!power_supply_battery_info_has_prop(info, psp))
> + return -EINVAL;
> +
> + switch (psp) {
> + case POWER_SUPPLY_PROP_TECHNOLOGY:
> + val->intval = info->technology;
> + return 0;
> + case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
> + val->intval = info->energy_full_design_uwh;
> + return 0;
> + case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
> + val->intval = info->charge_full_design_uah;
> + return 0;
> + case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
> + val->intval = info->voltage_min_design_uv;
> + return 0;
> + case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
> + val->intval = info->voltage_max_design_uv;
> + return 0;
> + case POWER_SUPPLY_PROP_PRECHARGE_CURRENT:
> + val->intval = info->precharge_current_ua;
> + return 0;
> + case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT:
> + val->intval = info->charge_term_current_ua;
> + return 0;
> + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
> + val->intval = info->constant_charge_current_max_ua;
> + return 0;
> + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
> + val->intval = info->constant_charge_voltage_max_uv;
> + return 0;
> + case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN:
> + val->intval = info->temp_ambient_alert_min;
> + return 0;
> + case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX:
> + val->intval = info->temp_ambient_alert_max;
> + return 0;
> + case POWER_SUPPLY_PROP_TEMP_ALERT_MIN:
> + val->intval = info->temp_alert_min;
> + return 0;
> + case POWER_SUPPLY_PROP_TEMP_ALERT_MAX:
> + val->intval = info->temp_alert_max;
> + return 0;
> + case POWER_SUPPLY_PROP_TEMP_MIN:
> + val->intval = info->temp_min;
> + return 0;
> + case POWER_SUPPLY_PROP_TEMP_MAX:
> + val->intval = info->temp_max;
> + return 0;
> + default:
> + return -EINVAL;
> + }
> +}
> +EXPORT_SYMBOL_GPL(power_supply_battery_info_get_prop);
This is not really relevant for the series. Just speaking it as it came
into my mind - I am not expecting changes to this series.
I do very much like the way you have these battery-info APIs not
requiring the "struct power_supply *psy". It may be useful for drivers
to get the stuff from battery-node prior registering to the power-supply
core. I think it'd be nice to have a 'power-supply-info getter API like
power_supply_get_battery_info() - which does not require the struct
power_supply * but just a device pointer or fwnode pointer. I think it
might also be reasonable to pull the battery-info parsing APIs in own
file. Or maybe not - definitely up-to you guys. I don't have any active
psy-stuff at my hands right now :)
> +
> /**
> * power_supply_temp2resist_simple() - find the battery internal resistance
> * percent from temperature
> @@ -1046,6 +1151,22 @@ bool power_supply_battery_bti_in_range(struct power_supply_battery_info *info,
> }
> EXPORT_SYMBOL_GPL(power_supply_battery_bti_in_range);
>
> +static bool psy_has_property(const struct power_supply_desc *psy_desc,
> + enum power_supply_property psp)
> +{
> + bool found = false;
> + int i;
> +
> + for (i = 0; i < psy_desc->num_properties; i++) {
> + if (psy_desc->properties[i] == psp) {
> + found = true;
> + break;
> + }
> + }
> +
> + return found;
> +}
> +
> int power_supply_get_property(struct power_supply *psy,
> enum power_supply_property psp,
> union power_supply_propval *val)
> @@ -1056,9 +1177,13 @@ int power_supply_get_property(struct power_supply *psy,
> return -ENODEV;
> }
>
> - return psy->desc->get_property(psy, psp, val);
> + if (psy_has_property(psy->desc, psp))
> + return psy->desc->get_property(psy, psp, val);
> + else if(psy->desc->expose_battery_info)
> + return power_supply_battery_info_get_prop(psy->battery_info, psp, val);
> + else
> + return -EINVAL;
> }
> -EXPORT_SYMBOL_GPL(power_supply_get_property);
>
> int power_supply_set_property(struct power_supply *psy,
> enum power_supply_property psp,
> @@ -1117,22 +1242,6 @@ void power_supply_unreg_notifier(struct notifier_block *nb)
> }
> EXPORT_SYMBOL_GPL(power_supply_unreg_notifier);
>
> -static bool psy_has_property(const struct power_supply_desc *psy_desc,
> - enum power_supply_property psp)
> -{
> - bool found = false;
> - int i;
> -
> - for (i = 0; i < psy_desc->num_properties; i++) {
> - if (psy_desc->properties[i] == psp) {
> - found = true;
> - break;
> - }
> - }
> -
> - return found;
> -}
> -
> #ifdef CONFIG_THERMAL
> static int power_supply_read_temp(struct thermal_zone_device *tzd,
> int *temp)
> @@ -1255,6 +1364,12 @@ __power_supply_register(struct device *parent,
> goto check_supplies_failed;
> }
>
> + if (psy->desc->expose_battery_info) {
> + rc = power_supply_get_battery_info(psy, &psy->battery_info);
> + if (rc)
> + goto check_supplies_failed;
> + }
> +
> spin_lock_init(&psy->changed_lock);
> rc = device_add(dev);
> if (rc)
> diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c
> index c228205e0953..8822a17f9589 100644
> --- a/drivers/power/supply/power_supply_sysfs.c
> +++ b/drivers/power/supply/power_supply_sysfs.c
> @@ -380,6 +380,11 @@ static umode_t power_supply_attr_is_visible(struct kobject *kobj,
> }
> }
>
> + if (psy->desc->expose_battery_info) {
> + if (power_supply_battery_info_has_prop(psy->battery_info, attrno))
> + return mode;
> + }
> +
> return 0;
> }
>
> @@ -488,6 +493,17 @@ int power_supply_uevent(const struct device *dev, struct kobj_uevent_env *env)
> goto out;
> }
>
> + if (psy->desc->expose_battery_info) {
> + for (j = 0; j < ARRAY_SIZE(power_supply_battery_info_properties); j++) {
> + if (!power_supply_battery_info_has_prop(psy->battery_info, power_supply_battery_info_properties[j]))
> + continue;
> + ret = add_prop_uevent(dev, env, power_supply_battery_info_properties[j],
> + prop_buf);
Usually I do not spot styling things like this - but for some reason it
now caught my attention. If you for some reason respin, then you might
want to either do this an oneliner - or split the longer line
"power_supply_battery_info_has_prop(..." just above.
With or without that:
Reviewed-by: Matti Vaittinen <[email protected]>
--
Matti Vaittinen
Linux kernel developer at ROHM Semiconductors
Oulu Finland
~~ When things go utterly wrong vim users can always type :help! ~~