From: Badhri Jagan Sridharan <badhri@google.com>
To: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Guenter Roeck <linux@roeck-us.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
USB <linux-usb@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v7 11/11] usb: typec: tcpci_maxim: Implemnent set_auto_vbus_discharge_threshold
Date: Fri, 18 Sep 2020 19:53:22 -0700 [thread overview]
Message-ID: <CAPTae5KNabvw7sHyCdj2BE6xPDqfmOQaEm3fXTMx_LxMtuYP-g@mail.gmail.com> (raw)
In-Reply-To: <20200918142007.GF1630537@kuha.fi.intel.com>
On Fri, Sep 18, 2020 at 7:20 AM Heikki Krogerus
<heikki.krogerus@linux.intel.com> wrote:
>
> On Thu, Sep 17, 2020 at 03:18:56AM -0700, Badhri Jagan Sridharan wrote:
> > Programs VBUS_SINK_DISCONNECT_THRESHOLD based on the power_role,
> > voltage requested as sink, mode of operation.
> >
> > The programmed threshold is based on vSinkDisconnect and
> > vSinkDisconnectPD values.
> >
> > Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
> > ---
> > Changes since v1:
> > - Changing patch version to v6 to fix version number confusion.
> >
> > Changes since v6:
> > - Rebase on usb-next.
> > ---
> > drivers/usb/typec/tcpm/tcpci_maxim.c | 48 ++++++++++++++++++++++++++++
> > 1 file changed, 48 insertions(+)
> >
> > diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.c b/drivers/usb/typec/tcpm/tcpci_maxim.c
> > index 723d7dd38f75..8289b596d2ee 100644
> > --- a/drivers/usb/typec/tcpm/tcpci_maxim.c
> > +++ b/drivers/usb/typec/tcpm/tcpci_maxim.c
> > @@ -137,6 +137,52 @@ static void max_tcpci_init_regs(struct max_tcpci_chip *chip)
> > return;
> > }
> >
> > +static int max_tcpci_set_auto_vbus_discharge_threshold(struct tcpci *tcpci, struct tcpci_data *data,
> > + enum typec_role port_role,
> > + enum typec_pwr_opmode mode, bool pps_active,
> > + u32 requested_vbus_voltage_mv)
> > +{
> > + struct max_tcpci_chip *chip = tdata_to_max_tcpci(data);
> > + u32 threshold = 0;
> > + u8 pwr_ctrl;
> > +
> > + /*
> > + * Indicates that vbus is going to go away due PR_SWAP, hard reset etc.
> > + * Do not discharge vbus here.
> > + */
> > + if (requested_vbus_voltage_mv == 0)
> > + goto write_thresh;
>
> I would assume that step is the same for every TCPC, no?
I agree so moved to tcpci.c code.
>
> > + if (port_role == TYPEC_SINK) {
> > + max_tcpci_read8(chip, TCPC_POWER_CTRL, &pwr_ctrl);
> > + if (pwr_ctrl & TCPC_FAST_ROLE_SWAP_EN) {
> > + /* To prevent disconnect when the source is fast role swap is capable. */
> > + threshold = 3500;
> > + } else if (mode == TYPEC_PWR_MODE_PD) {
> > + if (pps_active)
> > + threshold = (95 * requested_vbus_voltage_mv / 100) - 850;
> > + else
> > + threshold = (95 * requested_vbus_voltage_mv / 100) - 1250;
> > + } else {
> > + /* 3.5V for non-pd sink */
> > + threshold = 3500;
> > + }
> > + } else {
> > + /* 4V for source */
> > + threshold = 4000;
> > + }
> > +
> > + threshold = threshold / TCPC_VBUS_SINK_DISCONNECT_THRESH_LSB;
> > +
> > + if (threshold > TCPC_VBUS_SINK_DISCONNECT_THRESH_MAX) {
> > + dev_err(chip->dev, "VBUS_SINK_DISCONNECT_THRESH out of range");
> > + return -EINVAL;
> > + }
> > +
> > +write_thresh:
> > + return max_tcpci_write16(chip, TCPC_VBUS_SINK_DISCONNECT_THRESH, threshold);
>
> So couldn't tcpci.c write that register? This callback would then just
> calculate the value. I just want to avoid boilerplate.
Done !
>
> The threshold has type u32, but you still pass it to
> max_tcpci_write16(). Is that on purpose (doesn't the compiler
> complain)?
I didnt see any warnings ! I don't know why.
It wouldn't overflow though as TCPC_VBUS_SINK_DISCONNECT_THRESH_MAX
has a max value of 0x3ff. Have corrected it though and moved the code
to tcpci.c in v8.
Thanks,
Badhri
>
> thanks,
>
> --
> heikki
prev parent reply other threads:[~2020-09-19 2:54 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-17 10:18 [PATCH v7 01/11] usb: typec: tcpci: Add a getter method to retrieve tcpm_port reference Badhri Jagan Sridharan
2020-09-17 10:18 ` [PATCH v7 02/11] usb: typec: tcpci: Add set_vbus tcpci callback Badhri Jagan Sridharan
2020-09-18 12:33 ` Heikki Krogerus
2020-09-17 10:18 ` [PATCH v7 03/11] dt-bindings: usb: Maxim type-c controller device tree binding document Badhri Jagan Sridharan
2020-09-17 10:18 ` [PATCH v7 04/11] usb: typec: tcpci_maxim: Chip level TCPC driver Badhri Jagan Sridharan
2020-09-18 12:35 ` Heikki Krogerus
2020-09-17 10:18 ` [PATCH v7 05/11] dt-bindings: connector: Add property to set initial current cap for FRS Badhri Jagan Sridharan
2020-09-20 14:09 ` Greg Kroah-Hartman
2020-09-20 23:06 ` Badhri Jagan Sridharan
2020-09-22 8:40 ` Greg Kroah-Hartman
2020-09-17 10:18 ` [PATCH v7 06/11] usb: typec: tcpm: Add support for Sink Fast Role SWAP(FRS) Badhri Jagan Sridharan
2020-09-18 12:36 ` Heikki Krogerus
2020-09-17 10:18 ` [PATCH v7 07/11] usb: typec: tcpci: Implement callbacks for FRS Badhri Jagan Sridharan
2020-09-17 10:18 ` [PATCH v7 08/11] usb: typec: tcpci_maxim: Add support for Sink FRS Badhri Jagan Sridharan
2020-09-17 10:18 ` [PATCH v7 09/11] usb: typec: tcpm: Implement enabling Auto Discharge disconnect support Badhri Jagan Sridharan
2020-09-17 10:18 ` [PATCH v7 10/11] usb: typec: tcpci: Implement Auto discharge disconnect callbacks Badhri Jagan Sridharan
2020-09-17 10:18 ` [PATCH v7 11/11] usb: typec: tcpci_maxim: Implemnent set_auto_vbus_discharge_threshold Badhri Jagan Sridharan
[not found] ` <20200918142007.GF1630537@kuha.fi.intel.com>
2020-09-19 2:53 ` Badhri Jagan Sridharan [this message]
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=CAPTae5KNabvw7sHyCdj2BE6xPDqfmOQaEm3fXTMx_LxMtuYP-g@mail.gmail.com \
--to=badhri@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
/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).