Repository navigation
arm64: dts: apple: t6040-j773s: USB4 on the three back Type-C ports - #2290
Closed
RyanTheTide wants to merge 2 commits into
Closed
RyanTheTide wants to merge 2 commits into
RyanTheTide wants to merge 2 commits into
Conversation
The J614s and J616s each carried the same 108 lines enabling the three USB4 routers, their NHIs, DARTs, mailboxes, ATC CIO power states and the CIO reset controller, while the Type-C to router links of both already lived in t604x-j614-j616-usb4.dtsi. Both ADTs have the same acio0-2, dart-acio0-2 and acio-cpu0-2, so move the enables into that shared file, next to the links they go with. No functional change: the J614s, J616s and J616s-tether DTBs are byte-identical before and after (and the J773s, which does not include the file). Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
The Mac mini (J773s) left its three USB4 routers disabled and had no links from its Type-C connectors to them, so its back Thunderbolt ports only did USB and DisplayPort alt mode. The links and the router enables lived in a file only the M4 Pro MacBook Pros included, but the J773s has the same wiring: its ADT pairs acio0-2 with atc-phy0-2 and with the port controllers hpm0-2 (back middle, back left, back right), which the board already names typec0-2, and the router, DART (vm-base) and lstx GPIO addresses match the laptops'. Rename t604x-j614-j616-usb4.dtsi to t6040-usb4-typec.dtsi and include it from the J773s as well. The J614s, J616s and J616s-tether DTBs are byte-identical; the J773s gains ACIO0-2 with their NHIs and DARTs, the three router mailboxes, the ATC0-2 CIO/PCIe power states, the CIO reset controller and the port@2 links of typec0-2. PCIe tunnels stay off, as on the laptops. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
The Mac mini M4 Pro (J773s) has its three USB4 routers described in
t6040-usb4.dtsi, but they stay disabled, and its Type-C connectors have no links to them. Its three back Thunderbolt 5 ports therefore only do USB and DisplayPort alt mode: no thunderbolt-net, no USB4 docks.Change
Stacked on #2289. Review only the last commit.
The J773s has the same USB4 wiring as the M4 Pro MacBook Pros. Its ADT pairs acio0-2 with atc-phy0-2 (atc-phy-parent) and with the port controllers hpm0-2 (acio-parent): hpm0 at 0xc (back middle) to acio0, hpm1 at 0xa (back left) to acio1, hpm2 at 0x8 (back right) to acio2. The board already names those connectors typec0-2. The router, DART (vm-base 1 TiB) and lstx GPIO addresses are the laptops' too.
t604x-j614-j616-usb4.dtsi(router enables plus the typec to ACIO links) becomest6040-usb4-typec.dtsi, and the J773s includes it as well. PCIe tunnels stay off, as on the laptops.DTB delta
integration/aurora).ports/port@1endpoints, mailboxes @381108000/389108000/391108000, the ATC0-2 cio/pcie/cio_pcie/cio_usb power states, power-management@502820000 (CIO reset), andconnector/ports/port@2on usb-pd@c/a/8 linked to ACIO0/1/2.usb4-N-*aliases, so it does not depend on the board.Testing
Still to run
A J773s boot (community tester, #1479) once aura admits the board:
dmesg | grep -iE 'acio|thunderbolt|nhi'shows three routers probing without errors.ls /sys/bus/thunderbolt/deviceslists domain0-2.cat /sys/bus/thunderbolt/devices/*/rx_speedandrx_lanesread 20.0 / 2 (40 Gb/s; Gen4 is not requested on T6040 yet).Assisted-by: LLM (Claude:Opus 5.5)