From: Badhri Jagan Sridharan <badhri@google.com>
To: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Chanwoo Choi <cw00.choi@samsung.com>,
Andrzej Hajda <a.hajda@samsung.com>, Li Jun <jun.li@nxp.com>,
linux@roeck-us.net, jackp@codeaurora.org
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-usb@vger.kernel.org,
Badhri Jagan Sridharan <badhri@google.com>
Subject: [v3,3/3] usb: typec: tcpm: charge current handling for sink during hard reset
Date: Mon, 1 Oct 2018 12:45:01 -0700 [thread overview]
Message-ID: <20181001194501.58338-3-badhri@google.com> (raw)
During the initial connect to a non-pd port, sink would hard reset
twice before deeming that the port partner is non-pd. TCPM sets the
the charge path to false during the hard reset. This causes unnecessary
connects/disconnects of charge path and makes port take longer to
charge from the non-pd ports. Avoid this by not setting the charge path
to false unless the partner has already identified to be pd capable.
When partner is a pd port, set the charge path to false in
SNK_HARD_RESET_SINK_OFF. Set the current limits to default value based
of CC pull up and resume the charge path when port enters
SNK_HARD_RESET_SINK_ON.
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
--------
Changes in V3:
Rebase on top of usb-next
Changes in V2:
Based on feedback of jackp@codeaurora.org
- vsafe_5v_hard_reset flag from tcpc_config is removed
- Patch only differentiates between pd port partner and non-pd port
partner
V1 version of the patch is here:
https://lkml.org/lkml/2018/9/14/11
---
drivers/usb/typec/tcpm/tcpm.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index c3ac0e46106b..c25a69922ee6 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -3273,7 +3273,8 @@ static void run_state_machine(struct tcpm_port *port)
case SNK_HARD_RESET_SINK_OFF:
memset(&port->pps_data, 0, sizeof(port->pps_data));
tcpm_set_vconn(port, false);
- tcpm_set_charge(port, false);
+ if (port->pd_capable)
+ tcpm_set_charge(port, false);
tcpm_set_roles(port, port->self_powered, TYPEC_SINK,
TYPEC_DEVICE);
/*
@@ -3305,6 +3306,12 @@ static void run_state_machine(struct tcpm_port *port)
* Similar, dual-mode ports in source mode should transition
* to PE_SNK_Transition_to_default.
*/
+ if (port->pd_capable) {
+ tcpm_set_current_limit(port,
+ tcpm_get_current_limit(port),
+ 5000);
+ tcpm_set_charge(port, true);
+ }
tcpm_set_attached_state(port, true);
tcpm_set_state(port, SNK_STARTUP, 0);
break;
WARNING: multiple messages have this Message-ID (diff)
From: Badhri Jagan Sridharan <badhri@google.com>
To: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Chanwoo Choi <cw00.choi@samsung.com>,
Andrzej Hajda <a.hajda@samsung.com>, Li Jun <jun.li@nxp.com>,
linux@roeck-us.net, jackp@codeaurora.org
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-usb@vger.kernel.org,
Badhri Jagan Sridharan <badhri@google.com>
Subject: [PATCH v3 3/3] usb: typec: tcpm: charge current handling for sink during hard reset
Date: Mon, 1 Oct 2018 12:45:01 -0700 [thread overview]
Message-ID: <20181001194501.58338-3-badhri@google.com> (raw)
In-Reply-To: <20181001194501.58338-1-badhri@google.com>
During the initial connect to a non-pd port, sink would hard reset
twice before deeming that the port partner is non-pd. TCPM sets the
the charge path to false during the hard reset. This causes unnecessary
connects/disconnects of charge path and makes port take longer to
charge from the non-pd ports. Avoid this by not setting the charge path
to false unless the partner has already identified to be pd capable.
When partner is a pd port, set the charge path to false in
SNK_HARD_RESET_SINK_OFF. Set the current limits to default value based
of CC pull up and resume the charge path when port enters
SNK_HARD_RESET_SINK_ON.
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
--------
Changes in V3:
Rebase on top of usb-next
Changes in V2:
Based on feedback of jackp@codeaurora.org
- vsafe_5v_hard_reset flag from tcpc_config is removed
- Patch only differentiates between pd port partner and non-pd port
partner
V1 version of the patch is here:
https://lkml.org/lkml/2018/9/14/11
---
drivers/usb/typec/tcpm/tcpm.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index c3ac0e46106b..c25a69922ee6 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -3273,7 +3273,8 @@ static void run_state_machine(struct tcpm_port *port)
case SNK_HARD_RESET_SINK_OFF:
memset(&port->pps_data, 0, sizeof(port->pps_data));
tcpm_set_vconn(port, false);
- tcpm_set_charge(port, false);
+ if (port->pd_capable)
+ tcpm_set_charge(port, false);
tcpm_set_roles(port, port->self_powered, TYPEC_SINK,
TYPEC_DEVICE);
/*
@@ -3305,6 +3306,12 @@ static void run_state_machine(struct tcpm_port *port)
* Similar, dual-mode ports in source mode should transition
* to PE_SNK_Transition_to_default.
*/
+ if (port->pd_capable) {
+ tcpm_set_current_limit(port,
+ tcpm_get_current_limit(port),
+ 5000);
+ tcpm_set_charge(port, true);
+ }
tcpm_set_attached_state(port, true);
tcpm_set_state(port, SNK_STARTUP, 0);
break;
--
2.19.0.605.g01d371f741-goog
next reply other threads:[~2018-10-01 19:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-01 19:45 Badhri Jagan Sridharan [this message]
2018-10-01 19:45 ` [PATCH v3 3/3] usb: typec: tcpm: charge current handling for sink during hard reset Badhri Jagan Sridharan
-- strict thread matches above, loose matches on Subject: below --
2018-11-06 9:10 [v3,3/3] " Heikki Krogerus
2018-11-06 9:10 ` [PATCH v3 3/3] " Heikki Krogerus
2018-11-06 0:15 [v3,3/3] " Badhri Jagan Sridharan
2018-11-06 0:15 ` [PATCH v3 3/3] " Badhri Jagan Sridharan
2018-11-02 13:44 [v3,1/3] dt-bindings: connector: Add self-powered property Rob Herring
2018-11-02 13:44 ` [PATCH v3 1/3] " Rob Herring
2018-11-02 13:28 [v3,3/3] usb: typec: tcpm: charge current handling for sink during hard reset Heikki Krogerus
2018-11-02 13:28 ` [PATCH v3 3/3] " Heikki Krogerus
2018-11-02 13:28 [v3,2/3] usb: typec: tcpm: Do not disconnect link for self powered devices Heikki Krogerus
2018-11-02 13:28 ` [PATCH v3 2/3] " Heikki Krogerus
2018-11-02 13:27 [v3,1/3] dt-bindings: connector: Add self-powered property Heikki Krogerus
2018-11-02 13:27 ` [PATCH v3 1/3] " Heikki Krogerus
2018-10-12 14:48 [v3,3/3] usb: typec: tcpm: charge current handling for sink during hard reset Rob Herring
2018-10-12 14:48 ` [PATCH v3 3/3] " Rob Herring
2018-10-12 14:48 ` Rob Herring
2018-10-01 19:45 [v3,2/3] usb: typec: tcpm: Do not disconnect link for self powered devices Badhri Jagan Sridharan
2018-10-01 19:45 ` [PATCH v3 2/3] " Badhri Jagan Sridharan
2018-10-01 19:45 ` Badhri Jagan Sridharan
2018-10-01 19:44 [v3,1/3] dt-bindings: connector: Add self-powered property Badhri Jagan Sridharan
2018-10-01 19:44 ` [PATCH v3 1/3] " Badhri Jagan Sridharan
2018-10-01 19:44 ` 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=20181001194501.58338-3-badhri@google.com \
--to=badhri@google.com \
--cc=a.hajda@samsung.com \
--cc=cw00.choi@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=jackp@codeaurora.org \
--cc=jun.li@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mark.rutland@arm.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.