| Message ID | 20230616075241.27690-2-frank.wang@rock-chips.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8be558dcffe69b078b34b1fa93b82acaf4ce4957 |
| Headers | show |
| Series | [v4,1/2] usb: typec: tcpm: fix cc role at port reset | expand |
On 6/16/23 00:52, Frank Wang wrote: > Traverse fixed pdos to calculate the maximum power that the charger > can provide, and it can be get by POWER_SUPPLY_PROP_INPUT_POWER_LIMIT > property. > > Signed-off-by: Frank Wang <frank.wang@rock-chips.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > Changelog: > v4: > - No change > > v3: > - Use Microwatts instead of Milliwatts to follow the ABI, commented by Sebastian Reichel. > > v2: > - No change > > v1: > - https://patchwork.kernel.org/project/linux-usb/patch/20230313025843.17162-4-frank.wang@rock-chips.com/ > > drivers/usb/typec/tcpm/tcpm.c | 24 ++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index 9f6aaa3e70ca8..829d75ebab422 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -6340,6 +6340,27 @@ static int tcpm_psy_get_current_now(struct tcpm_port *port, > return 0; > } > > +static int tcpm_psy_get_input_power_limit(struct tcpm_port *port, > + union power_supply_propval *val) > +{ > + unsigned int src_mv, src_ma, max_src_uw = 0; > + unsigned int i, tmp; > + > + for (i = 0; i < port->nr_source_caps; i++) { > + u32 pdo = port->source_caps[i]; > + > + if (pdo_type(pdo) == PDO_TYPE_FIXED) { > + src_mv = pdo_fixed_voltage(pdo); > + src_ma = pdo_max_current(pdo); > + tmp = src_mv * src_ma; > + max_src_uw = tmp > max_src_uw ? tmp : max_src_uw; > + } > + } > + > + val->intval = max_src_uw; > + return 0; > +} > + > static int tcpm_psy_get_prop(struct power_supply *psy, > enum power_supply_property psp, > union power_supply_propval *val) > @@ -6369,6 +6390,9 @@ static int tcpm_psy_get_prop(struct power_supply *psy, > case POWER_SUPPLY_PROP_CURRENT_NOW: > ret = tcpm_psy_get_current_now(port, val); > break; > + case POWER_SUPPLY_PROP_INPUT_POWER_LIMIT: > + tcpm_psy_get_input_power_limit(port, val); > + break; > default: > ret = -EINVAL; > break;
On Fri, Jun 16, 2023 at 03:52:41PM +0800, Frank Wang wrote: > Traverse fixed pdos to calculate the maximum power that the charger > can provide, and it can be get by POWER_SUPPLY_PROP_INPUT_POWER_LIMIT > property. > > Signed-off-by: Frank Wang <frank.wang@rock-chips.com> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > Changelog: > v4: > - No change > > v3: > - Use Microwatts instead of Milliwatts to follow the ABI, commented by Sebastian Reichel. > > v2: > - No change > > v1: > - https://patchwork.kernel.org/project/linux-usb/patch/20230313025843.17162-4-frank.wang@rock-chips.com/ > > drivers/usb/typec/tcpm/tcpm.c | 24 ++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index 9f6aaa3e70ca8..829d75ebab422 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -6340,6 +6340,27 @@ static int tcpm_psy_get_current_now(struct tcpm_port *port, > return 0; > } > > +static int tcpm_psy_get_input_power_limit(struct tcpm_port *port, > + union power_supply_propval *val) > +{ > + unsigned int src_mv, src_ma, max_src_uw = 0; > + unsigned int i, tmp; > + > + for (i = 0; i < port->nr_source_caps; i++) { > + u32 pdo = port->source_caps[i]; > + > + if (pdo_type(pdo) == PDO_TYPE_FIXED) { > + src_mv = pdo_fixed_voltage(pdo); > + src_ma = pdo_max_current(pdo); > + tmp = src_mv * src_ma; > + max_src_uw = tmp > max_src_uw ? tmp : max_src_uw; > + } > + } > + > + val->intval = max_src_uw; > + return 0; > +} > + > static int tcpm_psy_get_prop(struct power_supply *psy, > enum power_supply_property psp, > union power_supply_propval *val) > @@ -6369,6 +6390,9 @@ static int tcpm_psy_get_prop(struct power_supply *psy, > case POWER_SUPPLY_PROP_CURRENT_NOW: > ret = tcpm_psy_get_current_now(port, val); > break; > + case POWER_SUPPLY_PROP_INPUT_POWER_LIMIT: > + tcpm_psy_get_input_power_limit(port, val); > + break; > default: > ret = -EINVAL; > break; > -- > 2.17.1
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 9f6aaa3e70ca8..829d75ebab422 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -6340,6 +6340,27 @@ static int tcpm_psy_get_current_now(struct tcpm_port *port, return 0; } +static int tcpm_psy_get_input_power_limit(struct tcpm_port *port, + union power_supply_propval *val) +{ + unsigned int src_mv, src_ma, max_src_uw = 0; + unsigned int i, tmp; + + for (i = 0; i < port->nr_source_caps; i++) { + u32 pdo = port->source_caps[i]; + + if (pdo_type(pdo) == PDO_TYPE_FIXED) { + src_mv = pdo_fixed_voltage(pdo); + src_ma = pdo_max_current(pdo); + tmp = src_mv * src_ma; + max_src_uw = tmp > max_src_uw ? tmp : max_src_uw; + } + } + + val->intval = max_src_uw; + return 0; +} + static int tcpm_psy_get_prop(struct power_supply *psy, enum power_supply_property psp, union power_supply_propval *val) @@ -6369,6 +6390,9 @@ static int tcpm_psy_get_prop(struct power_supply *psy, case POWER_SUPPLY_PROP_CURRENT_NOW: ret = tcpm_psy_get_current_now(port, val); break; + case POWER_SUPPLY_PROP_INPUT_POWER_LIMIT: + tcpm_psy_get_input_power_limit(port, val); + break; default: ret = -EINVAL; break;
Traverse fixed pdos to calculate the maximum power that the charger can provide, and it can be get by POWER_SUPPLY_PROP_INPUT_POWER_LIMIT property. Signed-off-by: Frank Wang <frank.wang@rock-chips.com> --- Changelog: v4: - No change v3: - Use Microwatts instead of Milliwatts to follow the ABI, commented by Sebastian Reichel. v2: - No change v1: - https://patchwork.kernel.org/project/linux-usb/patch/20230313025843.17162-4-frank.wang@rock-chips.com/ drivers/usb/typec/tcpm/tcpm.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)