Repository navigation
Conversation
T6031 (M3 Max) shares T6030's PCIe-C MSI layout: the ADT gives every apcie and apciec host one 512-vector AIC window, the internal apcie0 takes its first 32 vectors, and each tunnel host owns the next 32-vector slice. Two things differ: the window starts at AIC 1854 instead of 1342, and T6031's AIC takes a four-cell specifier with a die number. Look the window up by SoC in apple_t603x_msi_window(), accept both specifier forms (die 0 only), and treat T6031 like T6030 where apple_pcie_tunnel_prepare() decides whether to keep the t8122 hardware description. T6030 behaviour is unchanged. Tested on a J516C (MacBook Pro 16", M3 Max) with the ATC0 tunnel from the following patch: a Thunderbolt 3 audio interface (Universal Audio Apollo Twin X) enumerates behind its JHL6240 bridges, and its driver's MSI self-test passes with no DART faults. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Will Bunting <18180928+wbunting@users.noreply.github.com>
Describe ATC0's PCIe-C host, its DART and the apple,pcie-tunnel link in a new t6031-usb4.dtsi, modelled on t6030-usb4.dtsi. Every value is from the J516C ADT (apciec0, dart-apciec0, apciec0-piodma, acio0). The register windows and tunables match T6030. The AIC numbers (1347, 1348) and the MSI slice (AIC 1854 + 0x20, 32 vectors) are T6031's. Add the usb4_0_pcie and usb4_0_pcie_adapter aliases so m1n1 fills the rc, fabric, debug, root port and PCIe adapter tunables. Give the ACIO its PCIe adapter window and its fourth power domain (ps_atc0_pcie). Unlike T6030, leave out the ACIO's "cpu" window: the T6031 ACIO uses the t8103 start sequence. Only ATC0 is described. ATC1 and ATC2 need their own ADT values and testing. Compared with the current t6031-j516c.dtb, only /aliases, the ATC0 ACIO node and the new /usb4-pcie-tunnel-0 subtree change. Tested on a J516C: a Thunderbolt 3 device on the ATC0 port enumerates through the tunnel as 0001:03:00.0 with the PCIe-C link up and no DART faults. Not tested: the J514C (14" M3 Max), suspend/resume, and hot unplug. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Will Bunting <18180928+wbunting@users.noreply.github.com>
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.
Brings up the USB4 PCIe tunnel on ATC0 of the 16" M3 Max (J516C, T6031), the same way t6030-usb4.dtsi does it for the M3 Pro. Thunderbolt PCIe devices behind that port now enumerate and get working MSIs.
PCI: apple: accept the T6031 PCIe-C MSI slicesT6031 has the T6030 PCIe-C MSI layout: one shared 512-vector AIC window, internal apcie0 on the first 32 vectors, and a 32-vector slice per tunnel host. Two things differ:
The patch looks the window up per SoC (
apple_t603x_msi_window()), accepts both specifier forms (die 0 only), and treats T6031 like T6030 inapple_pcie_tunnel_prepare(). T6030 behaviour is unchanged.arm64: dts: apple: t6031-j516c: add the ATC0 USB4 PCIe tunnelA new
t6031-usb4.dtsidescribes the ATC0 PCIe-C host, its DART and theapple,pcie-tunnellink.cpuwindow, because the T6031 ACIO uses the t8103 start sequence./aliases, the ATC0 ACIO node and the new/usb4-pcie-tunnel-0subtree change.Testing
On a J516C (MacBook Pro 16", M3 Max), with this branch merged with #292 (external displays):
0001:03:00.0behind its JHL6240 bridges. The PCIe-C link is up within 1 ms of cold init.ua_apollodriver's MSI self-test passes. A 5-minute playback and capture run had 0 xruns and 0 dropouts.W=1and no new warnings.t6031-j516c.dtbbuilds.apple,t6031-dartandapple,t8122-pcieccompatibles.Not tested:
AI assistance
Written with Claude (Opus 5.5) in an agent harness: the ADT extraction, the driver and DT changes, and these commit messages. I reviewed the diffs, and the hardware testing above is from my machine. Each commit carries
Assisted-by: Claude:claude-opus-5-5.