Re: Thunderbolt: reboot hangs in nhi_pci_remove() with CalDigit TS5 Plus on AMD Strix Halo

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

Hi,

On Sat, Sep 26, 2026 at 02:06:42AM +0000, brandon.proulx@42fifty.dev wrote:
> Hi,
> On a Framework Desktop (AMD Ryzen AI Max 300 / Strix Halo) with a CalDigit
> TS5 Plus attached, reboot never completes. After systemd finishes, PID 1
> sits in D state in nhi_pci_remove() during device_shutdown() and the
> machine never resets. The hardware watchdog does not fire either. Only the
> power button recovers it.
> 
> Hardware:
>   System:  Framework Desktop (AMD Ryzen AI Max 300 Series), BIOS 03.06 (2026-07-13)
>   Host routers:
>     c5:00.5 AMD Strix Halo USB4 Host Router [1022:158d], subsys [f111:000a]
>     c5:00.6 AMD Strix Halo USB4 Host Router [1022:158e], subsys [f111:000a]
>   Device:  CalDigit TS5 Plus (thunderbolt 1-2, domain1 on c5:00.6), gen 4, NVM 64.c1
> 
> Kernel: 7.2.5 (distribution build 7.2.5-3-omarchy, Arch-based)
> thunderbolt.host_reset=Y (default)
> 
> Stack of PID 1, sampled every few seconds from reboot until power-off.
> Unchanged from 21:02:02 to 21:07:27:
> 
>   [<0>] nhi_pci_remove+0x53/0x60 [thunderbolt]
>   [<0>] pci_device_shutdown+0x3e/0x80
>   [<0>] device_shutdown+0x169/0x1d0
>   [<0>] kernel_restart+0x3a/0x70
>   [<0>] __do_sys_reboot+0x22b/0x270
>   [<0>] do_syscall_64+0xaa/0x690
>   [<0>] entry_SYSCALL_64_after_hwframe+0x76/0x7e
> 
> The offset lands on the wait_for_completion(&nhi->domain_released) after
> tb_domain_remove(), so it looks like the last reference to the domain is
> never dropped while the TS5 Plus is connected. Unbinding the NHI via sysfs
> (echo 0000:c5:00.6 > /sys/bus/pci/drivers/thunderbolt/unbind) before reboot
> blocks in the same place (unbind_store -> nhi_pci_remove).
> 
> Reproduction:
>   1. Boot with the TS5 Plus connected to a rear USB4 port.
>   2. systemctl reboot
>   3. Machine hangs after the last systemd message and never resets.
> 
> Current workaround: sync, then SysRq-b (emergency_restart), which skips the
> device_shutdown() walk.

There are bunch of fixes for this area in my "fixes" branch here:

https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git/

I wonder if you could try those and see if the problem goes away?