From: Badhri Jagan Sridharan <badhri@google.com>
To: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Cc: Guenter Roeck <linux@roeck-us.net>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Rob Herring <robh+dt@kernel.org>,
"linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
Kyle Tso <kyletso@google.com>
Subject: Re: [PATCH v1 1/6] usb: typec: tcpm: Address incorrect values of tcpm psy for fixed supply
Date: Wed, 7 Apr 2021 13:13:24 -0700 [thread overview]
Message-ID: <CAPTae5Lqv4E_w31gEWjqPB_-H9A=ed3NNhc=18psih_Vs1U4ug@mail.gmail.com> (raw)
In-Reply-To: <AM9PR10MB4134A5A4A0D34EC3F2C572BD80759@AM9PR10MB4134.EURPRD10.PROD.OUTLOOK.COM>
Hi Guenter and Adam,
Thanks for the reviews !
Fixed up the typo in V2.
Thanks,
Badhri
On Wed, Apr 7, 2021 at 9:04 AM Adam Thomson
<Adam.Thomson.Opensource@diasemi.com> wrote:
>
> On 06 April 2021 02:37, Badhri Jagan Sridharan wrote:
>
> > tcpm_pd_build_request overwrites current_limit and supply_voltage
> > even before port partner accepts the requests. This leaves stale
> > values in current_limit and supply_voltage that get exported by
> > "tcpm-source-psy-". Solving this problem by caching the request
> > values of current limit/supply voltage in req_current_limit
> > and req_supply_voltage. current_limit/supply_voltage gets updated
> > once the port partner accepts the request.
> >
> > Fixes: f2a8aa053c176 ("typec: tcpm: Represent source supply through
> > power_supply")
> > Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
> > ---
>
> Looks sensible, typo aside:
>
> Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
>
> > drivers/usb/typec/tcpm/tcpm.c | 17 ++++++++++-------
> > 1 file changed, 10 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
> > index ca1fc77697fc..03eca5061132 100644
> > --- a/drivers/usb/typec/tcpm/tcpm.c
> > +++ b/drivers/usb/typec/tcpm/tcpm.c
> > @@ -389,7 +389,10 @@ struct tcpm_port {
> > unsigned int operating_snk_mw;
> > bool update_sink_caps;
> >
> > - /* Requested current / voltage */
> > + /* Requested current / voltage to the port partner */
> > + u32 req_current_limit;
> > + u32 req_supply_voltage;
> > + /* Acutal current / voltage limit of the local port */
> > u32 current_limit;
> > u32 supply_voltage;
> >
> > @@ -2435,8 +2438,8 @@ static void tcpm_pd_ctrl_request(struct tcpm_port
> > *port,
> > case SNK_TRANSITION_SINK:
> > if (port->vbus_present) {
> > tcpm_set_current_limit(port,
> > - port->current_limit,
> > - port->supply_voltage);
> > + port->req_current_limit,
> > + port->req_supply_voltage);
> > port->explicit_contract = true;
> > tcpm_set_auto_vbus_discharge_threshold(port,
> >
> > TYPEC_PWR_MODE_PD,
> > @@ -2545,8 +2548,8 @@ static void tcpm_pd_ctrl_request(struct tcpm_port
> > *port,
> > break;
> > case SNK_NEGOTIATE_PPS_CAPABILITIES:
> > port->pps_data.active = true;
> > - port->supply_voltage = port->pps_data.out_volt;
> > - port->current_limit = port->pps_data.op_curr;
> > + port->req_supply_voltage = port->pps_data.out_volt;
> > + port->req_current_limit = port->pps_data.op_curr;
> > tcpm_set_state(port, SNK_TRANSITION_SINK, 0);
> > break;
> > case SOFT_RESET_SEND:
> > @@ -3195,8 +3198,8 @@ static int tcpm_pd_build_request(struct tcpm_port
> > *port, u32 *rdo)
> > flags & RDO_CAP_MISMATCH ? " [mismatch]" : "");
> > }
> >
> > - port->current_limit = ma;
> > - port->supply_voltage = mv;
> > + port->req_current_limit = ma;
> > + port->req_supply_voltage = mv;
> >
> > return 0;
> > }
> > --
> > 2.31.0.208.g409f899ff0-goog
>
next prev parent reply other threads:[~2021-04-07 20:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-06 1:36 [PATCH v1 0/6] Fixes for tcpm-source-psy- and pSnkStby Badhri Jagan Sridharan
2021-04-06 1:36 ` [PATCH v1 1/6] usb: typec: tcpm: Address incorrect values of tcpm psy for fixed supply Badhri Jagan Sridharan
2021-04-06 1:56 ` Guenter Roeck
2021-04-07 16:04 ` Adam Thomson
2021-04-07 20:13 ` Badhri Jagan Sridharan [this message]
2021-04-06 1:36 ` [PATCH v1 2/6] usb: typec: tcpm: Address incorrect values of tcpm psy for pps supply Badhri Jagan Sridharan
2021-04-06 14:14 ` Greg Kroah-Hartman
2021-04-07 16:07 ` Adam Thomson
2021-04-07 20:12 ` Badhri Jagan Sridharan
2021-04-06 1:36 ` [PATCH v1 3/6] usb: typec: tcpm: update power supply once partner accepts Badhri Jagan Sridharan
2021-04-06 1:57 ` Guenter Roeck
2021-04-07 16:08 ` Adam Thomson
2021-04-07 20:11 ` Badhri Jagan Sridharan
2021-04-06 1:36 ` [PATCH v1 4/6] usb: typec: tcpm: Honour pSnkStdby requirement during negotiation Badhri Jagan Sridharan
2021-04-06 1:36 ` [PATCH v1 5/6] usb: typec: tcpm: Allow slow charging loops to comply to pSnkStby Badhri Jagan Sridharan
2021-04-06 1:36 ` [PATCH v1 6/6] Documentation: connector: Add slow-charger-loop definition Badhri Jagan Sridharan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPTae5Lqv4E_w31gEWjqPB_-H9A=ed3NNhc=18psih_Vs1U4ug@mail.gmail.com' \
--to=badhri@google.com \
--cc=Adam.Thomson.Opensource@diasemi.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=kyletso@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).