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

Commit 9adf9f9e authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman
Browse files

staging: typec: tcpm: Add timeout when waiting for role swap completion 



The Type-C protocol manager state machine could fail, which might result
in role swap requests from user space to hang forever. Add a generous
timeout when waiting for role swaps to complete to avoid this situation.

Originally-from: Badhri Jagan Sridharan <badhri@google.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b46a9c90

drivers/staging/typec/tcpm.c

+15 −6
Original line number Diff line number Diff line
@@ -3165,9 +3165,12 @@ static int tcpm_dr_set(const struct typec_capability *cap, 
	tcpm_set_state(port, DR_SWAP_SEND, 0);

	mutex_unlock(&port->lock);



	wait_for_completion(&port->swap_complete);



	if (!wait_for_completion_timeout(&port->swap_complete,

				msecs_to_jiffies(PD_ROLE_SWAP_TIMEOUT)))

		ret = -ETIMEDOUT;

	else

		ret = port->swap_status;



	goto swap_unlock;



port_unlock:
@@ -3222,9 +3225,12 @@ static int tcpm_pr_set(const struct typec_capability *cap, 
	tcpm_set_state(port, PR_SWAP_SEND, 0);

	mutex_unlock(&port->lock);



	wait_for_completion(&port->swap_complete);



	if (!wait_for_completion_timeout(&port->swap_complete,

				msecs_to_jiffies(PD_ROLE_SWAP_TIMEOUT)))

		ret = -ETIMEDOUT;

	else

		ret = port->swap_status;



	goto swap_unlock;



port_unlock:
@@ -3259,9 +3265,12 @@ static int tcpm_vconn_set(const struct typec_capability *cap, 
	tcpm_set_state(port, VCONN_SWAP_SEND, 0);

	mutex_unlock(&port->lock);



	wait_for_completion(&port->swap_complete);



	if (!wait_for_completion_timeout(&port->swap_complete,

				msecs_to_jiffies(PD_ROLE_SWAP_TIMEOUT)))

		ret = -ETIMEDOUT;

	else

		ret = port->swap_status;



	goto swap_unlock;



port_unlock:

drivers/staging/typec/tcpm.h

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ enum typec_cc_polarity { 
};



/* Time to wait for TCPC to complete transmit */

#define PD_T_TCPC_TX_TIMEOUT  100

#define PD_T_TCPC_TX_TIMEOUT	100		/* in ms	*/

#define PD_ROLE_SWAP_TIMEOUT	(MSEC_PER_SEC * 10)



enum tcpm_transmit_status {

	TCPC_TX_SUCCESS = 0,