Skip to content

Commit 288a2ca

Browse files
t-8chsre
authored andcommitted
power: supply: core: add UAPI to discover currently used extensions
Userspace wants to now about the used power supply extensions, for example to handle a device extended by a certain extension differently or to discover information about the extending device. Add a sysfs directory to the power supply device. This directory contains links which are named after the used extension and point to the device implementing that extension. Signed-off-by: Thomas Weißschuh <[email protected]> Reviewed-by: Armin Wolf <[email protected]> Link: https://lore.kernel.org/r/20241211-power-supply-extensions-v6-4-9d9dc3f3d387@weissschuh.net Signed-off-by: Sebastian Reichel <[email protected]>
1 parent bcfe7d6 commit 288a2ca

File tree

7 files changed

+47
-4
lines changed

7 files changed

+47
-4
lines changed

Documentation/ABI/testing/sysfs-class-power

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -813,3 +813,12 @@ Description:
813813

814814
Access: Read
815815
Valid values: 1-31
816+
817+
What: /sys/class/power_supply/<supply_name>/extensions/<extension_name>
818+
Date: March 2025
819+
820+
Description:
821+
Reports the extensions registered to the power supply.
822+
Each entry is a link to the device which registered the extension.
823+
824+
Access: Read

drivers/power/supply/cros_charge-control.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333
struct cros_chctl_priv {
34+
struct device *dev;
3435
struct cros_ec_device *cros_ec;
3536
struct acpi_battery_hook battery_hook;
3637
struct power_supply *hooked_battery;
@@ -202,6 +203,7 @@ static int cros_chctl_psy_prop_is_writeable(struct power_supply *psy,
202203
}; \
203204
\
204205
static const struct power_supply_ext _name = { \
206+
.name = "cros-charge-control", \
205207
.properties = _name ## _props, \
206208
.num_properties = ARRAY_SIZE(_name ## _props), \
207209
.charge_behaviours = EC_CHARGE_CONTROL_BEHAVIOURS, \
@@ -233,7 +235,7 @@ static int cros_chctl_add_battery(struct power_supply *battery, struct acpi_batt
233235
return 0;
234236

235237
priv->hooked_battery = battery;
236-
return power_supply_register_extension(battery, priv->psy_ext, priv);
238+
return power_supply_register_extension(battery, priv->psy_ext, priv->dev, priv);
237239
}
238240

239241
static int cros_chctl_remove_battery(struct power_supply *battery, struct acpi_battery_hook *hook)
@@ -299,6 +301,7 @@ static int cros_chctl_probe(struct platform_device *pdev)
299301

300302
dev_dbg(dev, "Command version: %u\n", (unsigned int)priv->cmd_version);
301303

304+
priv->dev = dev;
302305
priv->cros_ec = cros_ec;
303306

304307
if (priv->cmd_version == 1)

drivers/power/supply/power_supply.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ extern bool power_supply_ext_has_property(const struct power_supply_ext *ext,
2525
struct power_supply_ext_registration {
2626
struct list_head list_head;
2727
const struct power_supply_ext *ext;
28+
struct device *dev;
2829
void *data;
2930
};
3031

@@ -39,6 +40,7 @@ struct power_supply_ext_registration {
3940

4041
extern void __init power_supply_init_attrs(void);
4142
extern int power_supply_uevent(const struct device *dev, struct kobj_uevent_env *env);
43+
extern const struct attribute_group power_supply_extension_group;
4244
extern const struct attribute_group *power_supply_attr_groups[];
4345

4446
#else

drivers/power/supply/power_supply_core.c

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,17 +1358,21 @@ static int power_supply_update_sysfs_and_hwmon(struct power_supply *psy)
13581358
}
13591359

13601360
int power_supply_register_extension(struct power_supply *psy, const struct power_supply_ext *ext,
1361-
void *data)
1361+
struct device *dev, void *data)
13621362
{
13631363
struct power_supply_ext_registration *reg;
13641364
size_t i;
13651365
int ret;
13661366

1367-
if (!psy || !ext || !ext->properties || !ext->num_properties)
1367+
if (!psy || !dev || !ext || !ext->name || !ext->properties || !ext->num_properties)
13681368
return -EINVAL;
13691369

13701370
guard(rwsem_write)(&psy->extensions_sem);
13711371

1372+
power_supply_for_each_extension(reg, psy)
1373+
if (strcmp(ext->name, reg->ext->name) == 0)
1374+
return -EEXIST;
1375+
13721376
for (i = 0; i < ext->num_properties; i++)
13731377
if (power_supply_has_property(psy, ext->properties[i]))
13741378
return -EEXIST;
@@ -1378,16 +1382,24 @@ int power_supply_register_extension(struct power_supply *psy, const struct power
13781382
return -ENOMEM;
13791383

13801384
reg->ext = ext;
1385+
reg->dev = dev;
13811386
reg->data = data;
13821387
list_add(&reg->list_head, &psy->extensions);
13831388

1389+
ret = sysfs_add_link_to_group(&psy->dev.kobj, power_supply_extension_group.name,
1390+
&dev->kobj, ext->name);
1391+
if (ret)
1392+
goto sysfs_link_failed;
1393+
13841394
ret = power_supply_update_sysfs_and_hwmon(psy);
13851395
if (ret)
13861396
goto sysfs_hwmon_failed;
13871397

13881398
return 0;
13891399

13901400
sysfs_hwmon_failed:
1401+
sysfs_remove_link_from_group(&psy->dev.kobj, power_supply_extension_group.name, ext->name);
1402+
sysfs_link_failed:
13911403
list_del(&reg->list_head);
13921404
kfree(reg);
13931405
return ret;
@@ -1403,6 +1415,9 @@ void power_supply_unregister_extension(struct power_supply *psy, const struct po
14031415
power_supply_for_each_extension(reg, psy) {
14041416
if (reg->ext == ext) {
14051417
list_del(&reg->list_head);
1418+
sysfs_remove_link_from_group(&psy->dev.kobj,
1419+
power_supply_extension_group.name,
1420+
reg->ext->name);
14061421
kfree(reg);
14071422
power_supply_update_sysfs_and_hwmon(psy);
14081423
return;

drivers/power/supply/power_supply_sysfs.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,18 @@ static const struct attribute_group power_supply_attr_group = {
458458
.is_visible = power_supply_attr_is_visible,
459459
};
460460

461+
static struct attribute *power_supply_extension_attrs[] = {
462+
NULL
463+
};
464+
465+
const struct attribute_group power_supply_extension_group = {
466+
.name = "extensions",
467+
.attrs = power_supply_extension_attrs,
468+
};
469+
461470
const struct attribute_group *power_supply_attr_groups[] = {
462471
&power_supply_attr_group,
472+
&power_supply_extension_group,
463473
NULL
464474
};
465475

drivers/power/supply/test_power.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ static int test_power_battery_extproperty_is_writeable(struct power_supply *psy,
293293
}
294294

295295
static const struct power_supply_ext test_power_battery_ext = {
296+
.name = "test_power",
296297
.properties = test_power_battery_extprops,
297298
.num_properties = ARRAY_SIZE(test_power_battery_extprops),
298299
.get_property = test_power_battery_extget_property,
@@ -307,7 +308,8 @@ static void test_power_configure_battery_extension(bool enable)
307308
psy = test_power_supplies[TEST_BATTERY];
308309

309310
if (enable) {
310-
if (power_supply_register_extension(psy, &test_power_battery_ext, NULL)) {
311+
if (power_supply_register_extension(psy, &test_power_battery_ext, &psy->dev,
312+
NULL)) {
311313
pr_err("registering battery extension failed\n");
312314
return;
313315
}

include/linux/power_supply.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ struct power_supply_desc {
286286
};
287287

288288
struct power_supply_ext {
289+
const char *const name;
289290
u8 charge_behaviours;
290291
const enum power_supply_property *properties;
291292
size_t num_properties;
@@ -911,6 +912,7 @@ extern int power_supply_powers(struct power_supply *psy, struct device *dev);
911912
extern int __must_check
912913
power_supply_register_extension(struct power_supply *psy,
913914
const struct power_supply_ext *ext,
915+
struct device *dev,
914916
void *data);
915917
extern void power_supply_unregister_extension(struct power_supply *psy,
916918
const struct power_supply_ext *ext);

0 commit comments

Comments
 (0)