Re: Apple Thunderbolt Display chaining

[Mika Westerberg <mika.westerberg@linux.intel.com>]

Hi,

On Thu, Mar 31, 2022 at 05:02:58PM +0800, Brad Campbell wrote:
> On 30/3/22 22:47, Mika Westerberg wrote:
> > Hi,
> > 
> > On Wed, Mar 30, 2022 at 10:24:35PM +0800, Brad Campbell wrote:
> >> Nope, that did the same thing. I wonder though. I'm testing it on the laptop and that reports :
> >> [    0.442832] thunderbolt 0000:07:00.0:  Thunderbolt 2 Switch: 8086:156d (Revision: 0, TB Version: 2)
> >>
> >> Changing "if (in->sw->generation == 1)" to "if (in->sw->generation == 2)" on the laptop solves that.
> > 
> > Heh, indeed I forgot that this is Falcon Ridge.
> > 
> >> I can't test hotplug properly on the iMac due to the radeon training issue.
> >>
> >> The laptop still has the issue of a cold boot working in one socket
> >> and not the other, but hot plug is working correctly.
> > 
> > Let's try this one next:
> > 
> > diff --git a/drivers/thunderbolt/tunnel.c b/drivers/thunderbolt/tunnel.c
> > index a473cc7d9a8d..7150b5bc5403 100644
> > --- a/drivers/thunderbolt/tunnel.c
> > +++ b/drivers/thunderbolt/tunnel.c
> > @@ -865,6 +865,8 @@ struct tb_tunnel *tb_tunnel_alloc_dp(struct tb *tb, struct tb_port *in,
> >   	struct tb_tunnel *tunnel;
> >   	struct tb_path **paths;
> >   	struct tb_path *path;
> > +	struct tb_port *port;
> > +	int link_nr;
> >   
> 
> On the iMac, it cold boots on either port.
> 
> On the Laptop it is the same as the previous in that it cold boots on
> one port and not the other. Hotplug works in all cases I did try
> (in->sw->generation < 3) just in case, but it didn't change anything
> on the Laptop.
> 
> Testing from here down is on the iMac.
> 
> I've re-tested the original patch and aside from the thunderbolt
> controller locking up, the radeon doesn't fail clock recovery.
> 
> Further investigation on the iMac shows we don't see port 11. I added
> a debug for discovered port.
> 
> So my next thing is to try and figure out if there is a correlation between which link is paired with which DP source.
> 
> I've changed link_nr = in->port == 11 ? 1 : 0; to 12 ? 1 : 0; and that boots, but hotplug still fails if the EFI sets up a display first. I've also tried reversing the 1 : 0, but that fails out of the gate.
> 
> I've just done a test now by booting with the chain disconnected, then
> plugging it in just before the bootloader loads which prevents the EFI
> from getting involved. 
> 
> This works (wait until just before bootloader to plug the chain): 
> 
> brad@bkmac:~$ dmesg | egrep '(Tunnel|in->|in use|DP .* available)'
> [    1.618277] thunderbolt 0000:07:00.0: 0:c: DP IN resource available
> [    1.618280] thunderbolt 0000:07:00.0: 0:d: DP IN resource available
> [    1.618403] thunderbolt 0000:07:00.0: 303:b: DP OUT resource available
> [    1.618529] thunderbolt 0000:07:00.0: 0:c: DP IN available
> [    1.618656] thunderbolt 0000:07:00.0: 303:b: DP OUT available
> [    1.618916] thunderbolt 0000:07:00.0: in->port 12
> [    1.618920] thunderbolt 0000:07:00.0: Tunnel 1
> [    1.622751] thunderbolt 0000:07:00.0: 3:b: DP OUT resource available
> [    1.622880] thunderbolt 0000:07:00.0: 0:c: in use
> [    1.623007] thunderbolt 0000:07:00.0: 0:d: DP IN available
> [    1.623135] thunderbolt 0000:07:00.0: 303:b: in use
> [    1.623263] thunderbolt 0000:07:00.0: 3:b: DP OUT available
> [    1.623399] thunderbolt 0000:07:00.0: in->port 13
> [    1.623402] thunderbolt 0000:07:00.0: Tunnel 0
> 
> Both displays are working at this point.
> Unplug -> Replug
> [   45.799923] thunderbolt 0000:07:00.0: 0:c: DP IN available
> [   45.800051] thunderbolt 0000:07:00.0: 0:d: DP IN available
> [   45.800053] thunderbolt 0000:07:00.0: no suitable DP IN adapter available, not tunneling
> [   54.606243] thunderbolt 0000:07:00.0: 303:b: DP OUT resource available
> [   54.606371] thunderbolt 0000:07:00.0: 0:c: DP IN available
> [   54.606497] thunderbolt 0000:07:00.0: 303:b: DP OUT available
> [   54.606763] thunderbolt 0000:07:00.0: in->port 12
> [   54.606768] thunderbolt 0000:07:00.0: Tunnel 1
> [   54.615067] thunderbolt 0000:07:00.0: 3:b: DP OUT resource available
> [   54.615176] thunderbolt 0000:07:00.0: 0:c: in use
> [   54.615309] thunderbolt 0000:07:00.0: 0:d: DP IN available
> [   54.615434] thunderbolt 0000:07:00.0: 303:b: in use
> [   54.615561] thunderbolt 0000:07:00.0: 3:b: DP OUT available
> [   54.615692] thunderbolt 0000:07:00.0: in->port 13
> [   54.615694] thunderbolt 0000:07:00.0: Tunnel 0
> 
> Both displays are working
> 
> This doesn't (standard cold boot):
> 
> brad@bkmac:~$ dmesg | egrep '(Tunnel|in->|in use|DP .* available)'
> [    1.611396] thunderbolt 0000:07:00.0: 0:c: DP IN resource available
> [    1.611399] thunderbolt 0000:07:00.0: 0:d: DP IN resource available
> [    1.611521] thunderbolt 0000:07:00.0: 303:b: DP OUT resource available
> [    1.611648] thunderbolt 0000:07:00.0: 0:c: in use
> [    1.611777] thunderbolt 0000:07:00.0: 0:d: DP IN available
> [    1.611904] thunderbolt 0000:07:00.0: 303:b: DP OUT available
> [    1.612162] thunderbolt 0000:07:00.0: in->port 13
> [    1.612166] thunderbolt 0000:07:00.0: Tunnel 0
> 
> Both displays are working at this point.
> Unplug -> Replug
> [   72.181366] thunderbolt 0000:07:00.0: 0:c: DP IN available
> [   72.181487] thunderbolt 0000:07:00.0: 0:d: DP IN available
> [   72.181489] thunderbolt 0000:07:00.0: no suitable DP IN adapter available, not tunneling
> [   81.369074] thunderbolt 0000:07:00.0: 3:b: DP OUT resource available
> [   81.369207] thunderbolt 0000:07:00.0: 0:c: DP IN available
> [   81.369335] thunderbolt 0000:07:00.0: 3:b: DP OUT available
> [   81.369468] thunderbolt 0000:07:00.0: in->port 12
> [   81.369471] thunderbolt 0000:07:00.0: Tunnel 1
> [   81.376542] thunderbolt 0000:07:00.0: 303:b: DP OUT resource available
> [   81.376669] thunderbolt 0000:07:00.0: 0:c: in use
> [   81.376797] thunderbolt 0000:07:00.0: 0:d: DP IN available
> [   81.376925] thunderbolt 0000:07:00.0: 3:b: in use
> [   81.377058] thunderbolt 0000:07:00.0: 303:b: DP OUT available
> [   81.377320] thunderbolt 0000:07:00.0: in->port 13
> [   81.377328] thunderbolt 0000:07:00.0: Tunnel 0
> 
> First display in the chain fails clock recovery.

Okay, thanks for testing. I think at this point we need to look a what
the Apple boot firmware actually configures for these paths. Can you
drop my previous patch and apply the below? Then on both problematic
systems boot up with the monitors connected and then send me dmesg.

If possible do this so that you have the chain connected to each port on
the system. I'm hoping we find some pattern here ;-)

diff --git a/drivers/thunderbolt/path.c b/drivers/thunderbolt/path.c
index 299712accfe9..ee03fd75a472 100644
--- a/drivers/thunderbolt/path.c
+++ b/drivers/thunderbolt/path.c
@@ -166,6 +166,9 @@ struct tb_path *tb_path_discover(struct tb_port *src, int src_hopid,
 		return NULL;
 	}
 
+	tb_dbg(path->tb, "discovering %s path starting from %llx:%u\n",
+	       path->name, tb_route(src->sw), src->port);
+
 	p = src;
 	h = src_hopid;
 
@@ -198,10 +201,13 @@ struct tb_path *tb_path_discover(struct tb_port *src, int src_hopid,
 		path->hops[i].out_port = out_port;
 		path->hops[i].next_hop_index = next_hop;
 
+		tb_dump_hop(&path->hops[i], &hop);
+
 		h = next_hop;
 		p = out_port->remote;
 	}
 
+	tb_dbg(path->tb, "path discovery complete\n");
 	return path;
 
 err: