summaryrefslogtreecommitdiffstats
path: root/drivers/power/supply
diff options
context:
space:
mode:
authorEnric Balletbo i Serra <enric.balletbo@collabora.com>2019-05-07 05:52:48 -0400
committerSebastian Reichel <sre@kernel.org>2019-06-28 11:28:27 -0400
commit2ffb500d824bbe6535c64d3e7e9971cca0db0a3e (patch)
tree5fcbf30bd0b5b075ebebb8f048b2ea1b8066f91b /drivers/power/supply
parenta4496d52b3430cb3c4c16d03cdd5f4ee97ad1241 (diff)
power: supply: cros: allow to set input voltage and current limit
This patch allows reading and writing the input voltage and current limit through the POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT and POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT sysfs properties. This allows userspace to see current values and to re-configure these values at runtime based on system-level knowledge or user input. By default there is no limit, this is reported as a -1 when reading from userspace. Writing a value will set the current or voltage limit in uA or uV, and writing any negative value will remove that limit. Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Reviewed-by: Guenter Roeck <groeck@chromium.org> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power/supply')
-rw-r--r--drivers/power/supply/cros_usbpd-charger.c116
1 files changed, 116 insertions, 0 deletions
diff --git a/drivers/power/supply/cros_usbpd-charger.c b/drivers/power/supply/cros_usbpd-charger.c
index 7e9c3984ef6a..3a9ea94c3de3 100644
--- a/drivers/power/supply/cros_usbpd-charger.c
+++ b/drivers/power/supply/cros_usbpd-charger.c
@@ -53,6 +53,8 @@ struct charger_data {
53}; 53};
54 54
55static enum power_supply_property cros_usbpd_charger_props[] = { 55static enum power_supply_property cros_usbpd_charger_props[] = {
56 POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT,
57 POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT,
56 POWER_SUPPLY_PROP_ONLINE, 58 POWER_SUPPLY_PROP_ONLINE,
57 POWER_SUPPLY_PROP_STATUS, 59 POWER_SUPPLY_PROP_STATUS,
58 POWER_SUPPLY_PROP_CURRENT_MAX, 60 POWER_SUPPLY_PROP_CURRENT_MAX,
@@ -80,6 +82,10 @@ static enum power_supply_usb_type cros_usbpd_charger_usb_types[] = {
80 POWER_SUPPLY_USB_TYPE_APPLE_BRICK_ID 82 POWER_SUPPLY_USB_TYPE_APPLE_BRICK_ID
81}; 83};
82 84
85/* Input voltage/current limit in mV/mA. Default to none. */
86static u16 input_voltage_limit = EC_POWER_LIMIT_NONE;
87static u16 input_current_limit = EC_POWER_LIMIT_NONE;
88
83static bool cros_usbpd_charger_port_is_dedicated(struct port_data *port) 89static bool cros_usbpd_charger_port_is_dedicated(struct port_data *port)
84{ 90{
85 return port->port_number >= port->charger->num_usbpd_ports; 91 return port->port_number >= port->charger->num_usbpd_ports;
@@ -324,6 +330,26 @@ static int cros_usbpd_charger_get_port_status(struct port_data *port,
324 return ret; 330 return ret;
325} 331}
326 332
333static int cros_usbpd_charger_set_ext_power_limit(struct charger_data *charger,
334 u16 current_lim,
335 u16 voltage_lim)
336{
337 struct ec_params_external_power_limit_v1 req;
338 int ret;
339
340 req.current_lim = current_lim;
341 req.voltage_lim = voltage_lim;
342
343 ret = cros_usbpd_charger_ec_command(charger, 0,
344 EC_CMD_EXTERNAL_POWER_LIMIT,
345 &req, sizeof(req), NULL, 0);
346 if (ret < 0)
347 dev_err(charger->dev,
348 "Unable to set the 'External Power Limit': %d\n", ret);
349
350 return ret;
351}
352
327static void cros_usbpd_charger_power_changed(struct power_supply *psy) 353static void cros_usbpd_charger_power_changed(struct power_supply *psy)
328{ 354{
329 struct port_data *port = power_supply_get_drvdata(psy); 355 struct port_data *port = power_supply_get_drvdata(psy);
@@ -396,6 +422,18 @@ static int cros_usbpd_charger_get_prop(struct power_supply *psy,
396 case POWER_SUPPLY_PROP_USB_TYPE: 422 case POWER_SUPPLY_PROP_USB_TYPE:
397 val->intval = port->psy_usb_type; 423 val->intval = port->psy_usb_type;
398 break; 424 break;
425 case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
426 if (input_current_limit == EC_POWER_LIMIT_NONE)
427 val->intval = -1;
428 else
429 val->intval = input_current_limit * 1000;
430 break;
431 case POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT:
432 if (input_voltage_limit == EC_POWER_LIMIT_NONE)
433 val->intval = -1;
434 else
435 val->intval = input_voltage_limit * 1000;
436 break;
399 case POWER_SUPPLY_PROP_MODEL_NAME: 437 case POWER_SUPPLY_PROP_MODEL_NAME:
400 val->strval = port->model_name; 438 val->strval = port->model_name;
401 break; 439 break;
@@ -409,6 +447,81 @@ static int cros_usbpd_charger_get_prop(struct power_supply *psy,
409 return 0; 447 return 0;
410} 448}
411 449
450static int cros_usbpd_charger_set_prop(struct power_supply *psy,
451 enum power_supply_property psp,
452 const union power_supply_propval *val)
453{
454 struct port_data *port = power_supply_get_drvdata(psy);
455 struct charger_data *charger = port->charger;
456 struct device *dev = charger->dev;
457 u16 intval;
458 int ret;
459
460 /* U16_MAX in mV/mA is the maximum supported value */
461 if (val->intval >= U16_MAX * 1000)
462 return -EINVAL;
463 /* A negative number is used to clear the limit */
464 if (val->intval < 0)
465 intval = EC_POWER_LIMIT_NONE;
466 else /* Convert from uA/uV to mA/mV */
467 intval = val->intval / 1000;
468
469 switch (psp) {
470 case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
471 ret = cros_usbpd_charger_set_ext_power_limit(charger, intval,
472 input_voltage_limit);
473 if (ret < 0)
474 break;
475
476 input_current_limit = intval;
477 if (input_current_limit == EC_POWER_LIMIT_NONE)
478 dev_info(dev,
479 "External Current Limit cleared for all ports\n");
480 else
481 dev_info(dev,
482 "External Current Limit set to %dmA for all ports\n",
483 input_current_limit);
484 break;
485 case POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT:
486 ret = cros_usbpd_charger_set_ext_power_limit(charger,
487 input_current_limit,
488 intval);
489 if (ret < 0)
490 break;
491
492 input_voltage_limit = intval;
493 if (input_voltage_limit == EC_POWER_LIMIT_NONE)
494 dev_info(dev,
495 "External Voltage Limit cleared for all ports\n");
496 else
497 dev_info(dev,
498 "External Voltage Limit set to %dmV for all ports\n",
499 input_voltage_limit);
500 break;
501 default:
502 ret = -EINVAL;
503 }
504
505 return ret;
506}
507
508static int cros_usbpd_charger_property_is_writeable(struct power_supply *psy,
509 enum power_supply_property psp)
510{
511 int ret;
512
513 switch (psp) {
514 case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
515 case POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT:
516 ret = 1;
517 break;
518 default:
519 ret = 0;
520 }
521
522 return ret;
523}
524
412static int cros_usbpd_charger_ec_event(struct notifier_block *nb, 525static int cros_usbpd_charger_ec_event(struct notifier_block *nb,
413 unsigned long queued_during_suspend, 526 unsigned long queued_during_suspend,
414 void *_notify) 527 void *_notify)
@@ -525,6 +638,9 @@ static int cros_usbpd_charger_probe(struct platform_device *pd)
525 638
526 psy_desc = &port->psy_desc; 639 psy_desc = &port->psy_desc;
527 psy_desc->get_property = cros_usbpd_charger_get_prop; 640 psy_desc->get_property = cros_usbpd_charger_get_prop;
641 psy_desc->set_property = cros_usbpd_charger_set_prop;
642 psy_desc->property_is_writeable =
643 cros_usbpd_charger_property_is_writeable;
528 psy_desc->external_power_changed = 644 psy_desc->external_power_changed =
529 cros_usbpd_charger_power_changed; 645 cros_usbpd_charger_power_changed;
530 psy_cfg.drv_data = port; 646 psy_cfg.drv_data = port;