| Message ID | 20210407200723.1914388-3-badhri@google.com |
|---|---|
| State | Accepted |
| Commit | 4050f2683f2c3151dc3dd1501ac88c57caf810ff |
| Headers | show |
| Series | [v2,1/6] usb: typec: tcpm: Address incorrect values of tcpm psy for fixed supply | expand |
On Wed, Apr 07, 2021 at 01:07:20PM -0700, Badhri Jagan Sridharan wrote: > power_supply_changed needs to be called to notify clients > after the partner accepts the requested values for the pps > case. > > Also, remove the redundant power_supply_changed at the end > of the tcpm_reset_port as power_supply_changed is already > called right after usb_type is changed. > > Fixes: f2a8aa053c176 ("typec: tcpm: Represent source supply through power_supply") > Signed-off-by: Badhri Jagan Sridharan <badhri@google.com> > Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > Changes since V1: > * Updated commit description to clarify Guenter Roeck's concern. > * Added Reviewed-by tags > --- > drivers/usb/typec/tcpm/tcpm.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index b4a40099d7e9..d1d03ee90d8f 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -2568,6 +2568,7 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, > port->pps_data.max_curr = port->pps_data.req_max_curr; > port->req_supply_voltage = port->pps_data.req_out_volt; > port->req_current_limit = port->pps_data.req_op_curr; > + power_supply_changed(port->psy); > tcpm_set_state(port, SNK_TRANSITION_SINK, 0); > break; > case SOFT_RESET_SEND: > @@ -3136,7 +3137,6 @@ static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port) > port->pps_data.req_out_volt)); > port->pps_data.req_op_curr = min(port->pps_data.max_curr, > port->pps_data.req_op_curr); > - power_supply_changed(port->psy); > } > > return src_pdo; > @@ -3561,8 +3561,6 @@ static void tcpm_reset_port(struct tcpm_port *port) > port->sink_cap_done = false; > if (port->tcpc->enable_frs) > port->tcpc->enable_frs(port->tcpc, false); > - > - power_supply_changed(port->psy); > } > > static void tcpm_detach(struct tcpm_port *port) > -- > 2.31.1.295.g9ea45b61b8-goog
On 4/7/21 1:07 PM, Badhri Jagan Sridharan wrote: > power_supply_changed needs to be called to notify clients > after the partner accepts the requested values for the pps > case. > > Also, remove the redundant power_supply_changed at the end > of the tcpm_reset_port as power_supply_changed is already > called right after usb_type is changed. > > Fixes: f2a8aa053c176 ("typec: tcpm: Represent source supply through power_supply") > Signed-off-by: Badhri Jagan Sridharan <badhri@google.com> > Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > Changes since V1: > * Updated commit description to clarify Guenter Roeck's concern. > * Added Reviewed-by tags > --- > drivers/usb/typec/tcpm/tcpm.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index b4a40099d7e9..d1d03ee90d8f 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -2568,6 +2568,7 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, > port->pps_data.max_curr = port->pps_data.req_max_curr; > port->req_supply_voltage = port->pps_data.req_out_volt; > port->req_current_limit = port->pps_data.req_op_curr; > + power_supply_changed(port->psy); > tcpm_set_state(port, SNK_TRANSITION_SINK, 0); > break; > case SOFT_RESET_SEND: > @@ -3136,7 +3137,6 @@ static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port) > port->pps_data.req_out_volt)); > port->pps_data.req_op_curr = min(port->pps_data.max_curr, > port->pps_data.req_op_curr); > - power_supply_changed(port->psy); > } > > return src_pdo; > @@ -3561,8 +3561,6 @@ static void tcpm_reset_port(struct tcpm_port *port) > port->sink_cap_done = false; > if (port->tcpc->enable_frs) > port->tcpc->enable_frs(port->tcpc, false); > - > - power_supply_changed(port->psy); > } > > static void tcpm_detach(struct tcpm_port *port) >
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index b4a40099d7e9..d1d03ee90d8f 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -2568,6 +2568,7 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, port->pps_data.max_curr = port->pps_data.req_max_curr; port->req_supply_voltage = port->pps_data.req_out_volt; port->req_current_limit = port->pps_data.req_op_curr; + power_supply_changed(port->psy); tcpm_set_state(port, SNK_TRANSITION_SINK, 0); break; case SOFT_RESET_SEND: @@ -3136,7 +3137,6 @@ static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port) port->pps_data.req_out_volt)); port->pps_data.req_op_curr = min(port->pps_data.max_curr, port->pps_data.req_op_curr); - power_supply_changed(port->psy); } return src_pdo; @@ -3561,8 +3561,6 @@ static void tcpm_reset_port(struct tcpm_port *port) port->sink_cap_done = false; if (port->tcpc->enable_frs) port->tcpc->enable_frs(port->tcpc, false); - - power_supply_changed(port->psy); } static void tcpm_detach(struct tcpm_port *port)
power_supply_changed needs to be called to notify clients after the partner accepts the requested values for the pps case. Also, remove the redundant power_supply_changed at the end of the tcpm_reset_port as power_supply_changed is already called right after usb_type is changed. Fixes: f2a8aa053c176 ("typec: tcpm: Represent source supply through power_supply") Signed-off-by: Badhri Jagan Sridharan <badhri@google.com> Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> --- Changes since V1: * Updated commit description to clarify Guenter Roeck's concern. * Added Reviewed-by tags --- drivers/usb/typec/tcpm/tcpm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)