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

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

staging: typec: tcpm: explicit_contract is always established 



While in SNK_READY state, the explicit_contract seems to be
set to true irrespective of whether an explicit contract
was established for the current connection. TCPM also seems
to report the pwr_opmode as TYPEC_PWR_MODE_PD always once
the port gets into SNK_READY state. This isn't completely
true as port gets into the SNK_READY state for non-pd
type-c ports as well.

This patch sets the explicit_contract flag only when
the PS_READY message is received and the vbus has been
detected by the port controller.

Signed-off-by: default avatarBadhri Jagan Sridharan <Badhri@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent efd44cf4

drivers/staging/typec/tcpm.c

+7 −3
Original line number Diff line number Diff line
@@ -1373,6 +1373,7 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, 
				tcpm_set_current_limit(port,

						       port->current_limit,

						       port->supply_voltage);

				port->explicit_contract = true;

				tcpm_set_state(port, SNK_READY, 0);

			} else {

				/*
@@ -2467,9 +2468,11 @@ static void run_state_machine(struct tcpm_port *port) 
		break;

	case SNK_READY:

		port->try_snk_count = 0;

		port->explicit_contract = true;

		typec_set_pwr_opmode(port->typec_port, TYPEC_PWR_MODE_PD);

		if (port->explicit_contract) {

			typec_set_pwr_opmode(port->typec_port,

					     TYPEC_PWR_MODE_PD);

			port->pwr_opmode = TYPEC_PWR_MODE_PD;

		}



		tcpm_swap_complete(port, 0);

		tcpm_typec_connect(port);
@@ -2958,6 +2961,7 @@ static void _tcpm_pd_vbus_on(struct tcpm_port *port) 
	port->vbus_present = true;

	switch (port->state) {

	case SNK_TRANSITION_SINK_VBUS:

		port->explicit_contract = true;

		tcpm_set_state(port, SNK_READY, 0);

		break;

	case SNK_DISCOVERY: