Hi all,

Today's linux-next merge of the usb tree got a conflict in:

  drivers/usb/typec/tcpm/tcpm.c

between commit:

  afb92ad8733e ("usb: typec: tcpm: restrict SNK_WAIT_CAPABILITIES_TIMEOUT transitions to non self-powered devices")

from the usb.current tree and commit:

  33a0302455d6 ("usb: typec: tcpm: Add support for parsing time dt properties")

from the usb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/usb/typec/tcpm/tcpm.c
index 7ae341a40342,a8fcca029e78..000000000000
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@@ -5042,13 -5055,10 +5056,14 @@@ static void run_state_machine(struct tc
  		if (port->vbus_never_low) {
  			port->vbus_never_low = false;
  			tcpm_set_state(port, SNK_SOFT_RESET,
- 				       PD_T_SINK_WAIT_CAP);
+ 				       port->timings.sink_wait_cap_time);
  		} else {
 -			tcpm_set_state(port, SNK_WAIT_CAPABILITIES_TIMEOUT,
 +			if (!port->self_powered)
 +				upcoming_state = SNK_WAIT_CAPABILITIES_TIMEOUT;
 +			else
 +				upcoming_state = hard_reset_state(port);
- 			tcpm_set_state(port, upcoming_state, PD_T_SINK_WAIT_CAP);
++			tcpm_set_state(port, upcoming_state,
+ 				       port->timings.sink_wait_cap_time);
  		}
  		break;
  	case SNK_WAIT_CAPABILITIES_TIMEOUT:

On Fri, Nov 01, 2024 at 03:07:30PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/usb/typec/tcpm/tcpm.c
> 
> between commit:
> 
>   afb92ad8733e ("usb: typec: tcpm: restrict SNK_WAIT_CAPABILITIES_TIMEOUT transitions to non self-powered devices")
> 
> from the usb.current tree and commit:
> 
>   33a0302455d6 ("usb: typec: tcpm: Add support for parsing time dt properties")
> 
> from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/usb/typec/tcpm/tcpm.c
> index 7ae341a40342,a8fcca029e78..000000000000
> --- a/drivers/usb/typec/tcpm/tcpm.c
> +++ b/drivers/usb/typec/tcpm/tcpm.c
> @@@ -5042,13 -5055,10 +5056,14 @@@ static void run_state_machine(struct tc
>   		if (port->vbus_never_low) {
>   			port->vbus_never_low = false;
>   			tcpm_set_state(port, SNK_SOFT_RESET,
> - 				       PD_T_SINK_WAIT_CAP);
> + 				       port->timings.sink_wait_cap_time);
>   		} else {
>  -			tcpm_set_state(port, SNK_WAIT_CAPABILITIES_TIMEOUT,
>  +			if (!port->self_powered)
>  +				upcoming_state = SNK_WAIT_CAPABILITIES_TIMEOUT;
>  +			else
>  +				upcoming_state = hard_reset_state(port);
> - 			tcpm_set_state(port, upcoming_state, PD_T_SINK_WAIT_CAP);
> ++			tcpm_set_state(port, upcoming_state,
> + 				       port->timings.sink_wait_cap_time);
>   		}
>   		break;
>   	case SNK_WAIT_CAPABILITIES_TIMEOUT:

Looks good, I've now resolved this in my branches.

greg k-h

On Fri, Nov 01, 2024 at 03:07:30PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/usb/typec/tcpm/tcpm.c
> 
> between commit:
> 
>   afb92ad8733e ("usb: typec: tcpm: restrict SNK_WAIT_CAPABILITIES_TIMEOUT transitions to non self-powered devices")
> 
> from the usb.current tree and commit:
> 
>   33a0302455d6 ("usb: typec: tcpm: Add support for parsing time dt properties")
> 
> from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/usb/typec/tcpm/tcpm.c
> index 7ae341a40342,a8fcca029e78..000000000000
> --- a/drivers/usb/typec/tcpm/tcpm.c
> +++ b/drivers/usb/typec/tcpm/tcpm.c
> @@@ -5042,13 -5055,10 +5056,14 @@@ static void run_state_machine(struct tc
>   		if (port->vbus_never_low) {
>   			port->vbus_never_low = false;
>   			tcpm_set_state(port, SNK_SOFT_RESET,
> - 				       PD_T_SINK_WAIT_CAP);
> + 				       port->timings.sink_wait_cap_time);
>   		} else {
>  -			tcpm_set_state(port, SNK_WAIT_CAPABILITIES_TIMEOUT,
>  +			if (!port->self_powered)
>  +				upcoming_state = SNK_WAIT_CAPABILITIES_TIMEOUT;
>  +			else
>  +				upcoming_state = hard_reset_state(port);
> - 			tcpm_set_state(port, upcoming_state, PD_T_SINK_WAIT_CAP);
> ++			tcpm_set_state(port, upcoming_state,
> + 				       port->timings.sink_wait_cap_time);
>   		}
>   		break;
>   	case SNK_WAIT_CAPABILITIES_TIMEOUT:


Thanks, I"ll handle this when merging them together later this week.

greg k-h