Re: [PATCH 3/3] usb: typec: tcpm: allow switching to mode accessory to mux properly

[Heikki Krogerus <heikki.krogerus@linux.intel.com>]

+Badhri

On Fri, Apr 04, 2025 at 12:43:06AM +0200, Michael Grzeschik wrote:
> The funciton tcpm_acc_attach is not setting the proper state when
> calling tcpm_set_role. The function tcpm_set_role is currently only
> handling TYPEC_STATE_USB. For the tcpm_acc_attach to switch into other
> modal states tcpm_set_role needs to be extended by an extra state
> parameter. This patch is handling the proper state change when calling
> tcpm_acc_attach.
> 
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> ---
>  drivers/usb/typec/tcpm/tcpm.c | 27 ++++++++++++++++++---------
>  1 file changed, 18 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
> index 01714a42f848a..784fa23102f90 100644
> --- a/drivers/usb/typec/tcpm/tcpm.c
> +++ b/drivers/usb/typec/tcpm/tcpm.c
> @@ -1153,7 +1153,7 @@ static int tcpm_set_attached_state(struct tcpm_port *port, bool attached)
>  				     port->data_role);
>  }
>  
> -static int tcpm_set_roles(struct tcpm_port *port, bool attached,
> +static int tcpm_set_roles(struct tcpm_port *port, bool attached, int state,
>  			  enum typec_role role, enum typec_data_role data)
>  {
>  	enum typec_orientation orientation;
> @@ -1190,7 +1190,7 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached,
>  		}
>  	}
>  
> -	ret = tcpm_mux_set(port, TYPEC_STATE_USB, usb_role, orientation);
> +	ret = tcpm_mux_set(port, state, usb_role, orientation);
>  	if (ret < 0)
>  		return ret;
>  
> @@ -4355,7 +4355,8 @@ static int tcpm_src_attach(struct tcpm_port *port)
>  
>  	tcpm_enable_auto_vbus_discharge(port, true);
>  
> -	ret = tcpm_set_roles(port, true, TYPEC_SOURCE, tcpm_data_role_for_source(port));
> +	ret = tcpm_set_roles(port, true, TYPEC_STATE_USB,
> +			     TYPEC_SOURCE, tcpm_data_role_for_source(port));
>  	if (ret < 0)
>  		return ret;
>  
> @@ -4530,7 +4531,8 @@ static int tcpm_snk_attach(struct tcpm_port *port)
>  
>  	tcpm_enable_auto_vbus_discharge(port, true);
>  
> -	ret = tcpm_set_roles(port, true, TYPEC_SINK, tcpm_data_role_for_sink(port));
> +	ret = tcpm_set_roles(port, true, TYPEC_STATE_USB,
> +			     TYPEC_SINK, tcpm_data_role_for_sink(port));
>  	if (ret < 0)
>  		return ret;
>  
> @@ -4555,6 +4557,7 @@ static int tcpm_acc_attach(struct tcpm_port *port)
>  	int ret;
>  	enum typec_role role;
>  	enum typec_data_role data;
> +	int state = TYPEC_STATE_USB;
>  
>  	if (port->attached)
>  		return 0;
> @@ -4563,7 +4566,13 @@ static int tcpm_acc_attach(struct tcpm_port *port)
>  	data = tcpm_port_is_sink(port) ? tcpm_data_role_for_sink(port)
>  				       : tcpm_data_role_for_source(port);
>  
> -	ret = tcpm_set_roles(port, true, role, data);
> +	if (tcpm_port_is_audio(port))
> +		state = TYPEC_MODE_AUDIO;
> +
> +	if (tcpm_port_is_debug(port))
> +		state = TYPEC_MODE_DEBUG;
> +
> +	ret = tcpm_set_roles(port, true, state, role, data);
>  	if (ret < 0)
>  		return ret;
>  
> @@ -5349,7 +5358,7 @@ static void run_state_machine(struct tcpm_port *port)
>  		 */
>  		tcpm_set_vconn(port, false);
>  		tcpm_set_vbus(port, false);
> -		tcpm_set_roles(port, port->self_powered, TYPEC_SOURCE,
> +		tcpm_set_roles(port, port->self_powered, TYPEC_STATE_USB, TYPEC_SOURCE,
>  			       tcpm_data_role_for_source(port));
>  		/*
>  		 * If tcpc fails to notify vbus off, TCPM will wait for PD_T_SAFE_0V +
> @@ -5381,7 +5390,7 @@ static void run_state_machine(struct tcpm_port *port)
>  		tcpm_set_vconn(port, false);
>  		if (port->pd_capable)
>  			tcpm_set_charge(port, false);
> -		tcpm_set_roles(port, port->self_powered, TYPEC_SINK,
> +		tcpm_set_roles(port, port->self_powered, TYPEC_STATE_USB, TYPEC_SINK,
>  			       tcpm_data_role_for_sink(port));
>  		/*
>  		 * VBUS may or may not toggle, depending on the adapter.
> @@ -5505,10 +5514,10 @@ static void run_state_machine(struct tcpm_port *port)
>  	case DR_SWAP_CHANGE_DR:
>  		tcpm_unregister_altmodes(port);
>  		if (port->data_role == TYPEC_HOST)
> -			tcpm_set_roles(port, true, port->pwr_role,
> +			tcpm_set_roles(port, true, TYPEC_STATE_USB, port->pwr_role,
>  				       TYPEC_DEVICE);
>  		else
> -			tcpm_set_roles(port, true, port->pwr_role,
> +			tcpm_set_roles(port, true, TYPEC_STATE_USB, port->pwr_role,
>  				       TYPEC_HOST);
>  		tcpm_ams_finish(port);
>  		tcpm_set_state(port, ready_state(port), 0);
> 
> -- 
> 2.39.5

-- 
heikki