Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30fc13ae authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by Greg Kroah-Hartman
Browse files

usb: typec: tcpm: charge current handling for sink during hard reset 



[ Upstream commit 157c0f2f641a9938382b092c64548ebdabfe25e0 ]

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: default avatarBadhri Jagan Sridharan <badhri@google.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.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


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5e989b6c

drivers/usb/typec/tcpm.c

+8 −1
Original line number Diff line number Diff line
@@ -3322,6 +3322,7 @@ 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);

		if (port->pd_capable)

			tcpm_set_charge(port, false);

		tcpm_set_roles(port, port->self_powered, TYPEC_SINK,

			       TYPEC_DEVICE);
@@ -3354,6 +3355,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;