Skip to content

arm64: dts: apple: support M5 Max Mac Studio (J775c) - #2102

Draft
DjDeveloperr wants to merge 8 commits into
integration/aurorafrom
feat/j775c-rebased-20261116
Draft

DjDeveloperr wants to merge 8 commits into
integration/aurorafrom
feat/j775c-rebased-20261116

Conversation

@DjDeveloperr

@DjDeveloperr DjDeveloperr commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

Add the M5 Max Mac Studio (J775c) board description, rebasing Satya Benson's existing work onto integration/aurora at 677be39.

The final source has one J775c DTS: t6050-j775c.dts. It contains the resolved board tree with symbolic references and no incremental includes, repeated overrides or staging fragments. The separate ANE trial wrapper is removed; the normal board's device policy is preserved.

The original #1619 stays open and unchanged. Source branches for #1579 and #1618 also remain unchanged.

Shared router review: Satya’s source comparison confirms this branch carries both #1579 patches (9bca8b65e209, db5f4c3d0def) and that #1579 has no unique change to land separately. The remaining shared-DT review points are moving ACIO2 enablement into the board files while preserving K114c, and documenting the source of the shared SRAM windows. This comparison adds no DTB or hardware result. J714s right-port coverage and enabled-router USB4 enumeration and replug rows remain pending.

Source and credit:

Satya's Author and Signed-off-by attribution is retained. Rebase resolutions preserve current PCIe radio/SD helpers, K114c activation guards and T8142 ANE constraints. Existing J714s/J716c router and mailbox enables are explicit so the shared disabled inventory does not disable their ports. A production-C host test covers the Clock PM policy.

Validation:

  • The final single DTS compiles to a byte-for-byte identical normal J775c DTB compared with the pre-consolidation head 055c63d: 128,029 bytes, SHA256 0fb4d76a761987bd91bd8680d2d7be5837f31989a1dc8c8b523446244bdf45f5.
  • Before consolidation, both J775c variants and six control DTBs (J775d, J714c, J714s, J716c, J716s, K114c) compiled. The experimental ANE variant is no longer shipped in this source.
  • The six control DTBs retain their effective activation, register/interrupt and alias policy apart from arm64: dts: apple: t6050: add disabled acio0/1/3 routers to the shared files #1579's explicit router3 migration. No control-board source changed during consolidation.
  • pcie-apple.o compiles with 16 KiB pages and PCIE_APPLE enabled.
  • Clock PM: 13 cases pass; wrong-mask and missing-host-gate mutations are rejected. The registered host test passes.
  • Four edited binding documents pass dt-doc-validate; git diff --check passes.
  • The GPU binding now describes the exact G17C/G17S/T6050 installed-loader compatible sequence while retaining every existing G17C and raw-T6050 resource constraint. The unchanged J775c DTB validates against it with zero GPU diagnostics.
  • GPU binding fixtures: 33 checks pass (four valid forms and 29 rejected malformed/resource cases), now run in DT CI.

Whole-head J775c boot evidence: report6933896031 supplies one owner-authorized boot of the exact head 4489ebdf13a7f08ee756983ad7f5f302f9a9e260, with no local patches, merges, DTB substitution or GPU name shim. Reported tree d307a071a445baf187821ceff2cf63ec38716fb1 matches the source tree. The normal DTB is 128,029 bytes with SHA256 0fb4d76a761987bd91bd8680d2d7be5837f31989a1dc8c8b523446244bdf45f5, matching the validated reference. Reported Image.gz SHA256 is d4692e9b4d9bd6709dc608d89565e983b32dc7e6b52534450eb31ab180fd21b9; config SHA256 is 1bed0f7b1e262c45f1216350a2ed99de4eb472975e573937a5ee49227a2f68a1. These binary/config hashes are owner-supplied, not independently re-hashed here.

Observed: four ACIO drivers and sixteen mailbox drivers bound; PCI enumeration matched the pretrial counts. Both functions advertising Clock PM had it disabled post-enumeration, with PCIEASPM/powersave configured and no ASPM command-line override; no cannot-disable warning was reported. Physical Ethernet at 1000 Mb/s and Wi-Fi each passed interface-bound ping 3/3. GPU bound and initialized with one render node. HDMI was connected/enabled and a display manager was active, but the owner was absent, no trial Hyprland process/visual confirmation was supplied, and rendering was not tested. This is boot/probe and observed connectivity evidence, not desktop, rendering or stability qualification.

Bluetooth had zero HCI controllers. Saved-record clarification6937902820 confirms CONFIG_BT_HCICENTAURI=n in the pinned trial config and no btcentauri_t6050 object or module was built. The enabled CONFIG_BT_CENTAURI=y selects a different transport. Saved PCI driver-binding evidence is unavailable. The trial therefore did not include the T6050 Bluetooth driver; its zero-HCI result does not evaluate that driver or establish a DT regression. The configuration clarification is closed, while Bluetooth remains unqualified on this exact-head boot. Serdev counts do not diagnose this PCI transport. Prior #1618 evidence records a powered HCI with the proper symbol enabled but retains its older scope. The canonical asahi profile already enables CONFIG_BT_HCICENTAURI=m; no source/profile fix follows from this trial. No new Bluetooth boot is requested by this clarification.

Follow-up Bluetooth row: report6938010300 supplies a warm one-shot boot of exact source head 4489ebdf13a7f08ee756983ad7f5f302f9a9e260, tree d307a071a445baf187821ceff2cf63ec38716fb1, with no local source patches. The owner reports CONFIG_BT_HCICENTAURI=y as the only configuration change after olddefconfig from the earlier pinned config; a new full config or binary digest is not supplied in this comment. The boot used arm64.nomte and did not change the installed default. PCI function [106b:1903] bound to btcentauri_t6050; one powered hci0 and an active Bluetooth service were observed. A 15-second scan started successfully and discovered zero new devices. This supplies controller initialization, power and scan-command acceptance for that warm-boot/configuration scope, without establishing RF discovery, pairing or a device connection. Four HCI Bad flag given lines were also seen on the default-kernel control; they are retained as diagnostics, with no newly attributed PR regression. Ethernet/Wi-Fi interface-bound pings passed 3/3 each; the owner reports the earlier probe/Clock-PM/HDMI rows repeated. No cold-boot, MTE-enabled or Bluetooth sleep/hotplug qualification follows from this result.

J775c HDMI follow-up: Owner report records a one-shot boot of 4489ebdf on the ordinary 27.0 slot, with a clean warm return to the default kernel. An external capture device observed 2560×1440 at 60 Hz throughout 620 seconds (32/32 samples). The connector was enabled with good link status and 18 modes. The owner reports ADT board-id=0x10 and dram-vendor-id=0xff. The trial exposed no AppleHDMI playback card, while the default kernel does; HDMI audio playback and three hotplug cycles were not tested. Desktop startup was blocked by the reported DRM identity mismatch with the installed Mesa, so this row covers sustained HDMI output without qualifying a desktop or rendering session.

The report records zero SError/Oops/BUG/panic categories, while other firmware/link/regulator/CRTC warnings remain; it is not a warning-free-boot claim. The installed default, loader and protected support files were restored unchanged, the trial marker was spent, and the ESP and lock were left clean. No new boot or repair is requested by this review.

Draft / remaining gates: affected-board hardware qualification remains required. Any later change to the legacy GPU path, fallback compatible or ASC/SGX resources needs a separately qualified loader migration. MTP DART remains disabled and ANE DART suppliers are retained. Clock PM and shared-router changes still need affected-board hardware review/testing. Older receipts retain their stated composition scopes. The new whole-head row supplies one boot/probe result; The initial trial omitted the required Bluetooth driver; the follow-up supplies warm-boot controller power/scan-command acceptance with the driver built in and arm64.nomte, while discovery/pairing/connection remain unqualified. GPU rendering, interactive desktop use, audio playback, SD media, suspend, hotplug and other affected M5 boards remain unqualified.

The supplied IODeviceTree dump confirms J775c / Mac17,14 / M5 Max identity. Raw device-specific data is not included.

satchlj and others added 7 commits November 16, 2026 15:47
Describe die-0 ATC0, ATC1 and ATC3 in the shared T6050 files using
acioN names and the integration ATC2 resource layout. ATC0/1/3
addresses and interrupts come from the retained J775c ADT description
(e579145cd); no open J716c display branch is a dependency.

Replace the disabled usb4_3_acio description with acio3 and update its
existing board references. Keep tunables, DROMs, PD endpoints and
activation in board files. Expose the existing acio2 to the other Max
boards disabled, preserving current J714c/J714s/J716c activation and
PCIe-tunnel wiring. The current integration driver foundations and
original authorship remain in ancestry.

Signed-off-by: Satya Benson <satya@benson.earth>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit cd3e03d)
Signed-off-by: Diljit Singh <hey@djdev.me>
Keep the required NHI DROM property on disabled shared instances. Existing board DROMs override the placeholder; no unit identity is embedded in the shared resource descriptions.

Signed-off-by: Satya Benson <satya@benson.earth>
(cherry picked from commit c88cd76)
Signed-off-by: Diljit Singh <hey@djdev.me>
Restore the adopted-host Clock PM policy from candidate44.
Integration boots J775c with this change alone; restoring bus-
number preservation alone does not return as a trial, and
restoring the NVMe driver alone does not return.

The host leaves CLKREQ# pads and reference-clock gating in
firmware state. Removing L0s/L1 capability bits does not mask
PCIE_LINK_STATE_CLKPM. Disable it before endpoint enable and walk
the enumerated bus to retain the policy.

Adapted from Satya Benson candidate44 PCIe adoption changes.
Tested on J775c with Aura b6e6faf4 and candidate44 DTB; other
boards untested.

Signed-off-by: Satya Benson <satya@benson.earth>
Assisted-by: LLM
(cherry picked from commit ccdd14a)
Signed-off-by: Diljit Singh <hey@djdev.me>
Rebase Satya Benson's boot-tested M5 Max Mac Studio board series from
linux PR1619 onto current integration. Consolidate its incremental board
fixups and historical merge cleanups while retaining the original author,
copyright notices and compatibility contract.

Keep the one-die CPU/cache topology, board PCIe/N1/NVRAM/fan and USB/PD
wiring, installed-loader GPU paths/fallback, disabled MTP DART, three
ANE suppliers and omission of the desktop internal-panel DCP. Retain the
original disabled inventory and ANE trial wrapper without claiming new
hardware qualification.

Resolve the ANE binding against the current T8142/T8132 constraints:
retain the explicit T6050 backend/full-inventory distinction and known
0x210/0x220 platform types. Preserve K114c's active ATC2 guards in the
shared router definitions. Do not weaken the modern GPU binding; the
legacy-loader GPU warning gate remains visible.

The original PR1619 and its branch remain open and unchanged.
Source head: 0075a00.
Shared-router and Clock PM dependencies are separate preceding commits.

Based on the J775D board by Jeff Queisser and the single-die J716c work
by Erik Bourget; their foundations remain in integration ancestry.

Signed-off-by: Satya Benson <satya@benson.earth>
Assisted-by: LLM
Signed-off-by: Diljit Singh <hey@djdev.me>
The shared T6050 router declarations default their status to disabled. J714s and J716c previously enabled their board-specific mailbox and router definitions implicitly, which now inherit the disabled property. Explicitly enable the six existing board nodes to preserve their prior effective status.

Signed-off-by: Diljit Singh <hey@djdev.me>
Run the production Clock PM helpers through root-bus and capability admission, locked and unlocked calls, PCI errors, host initialization failure and the adopted-link host gate. Reject mutations that change the mask or remove the gate. Document the rebase and the outstanding loader and hardware qualification limits.

Signed-off-by: Diljit Singh <hey@djdev.me>
Resolve the staged board descriptions into t6050-j775c.dts, retaining symbolic references and the final device policy. Remove all 18 board staging sources, including the separate unqualified ANE trial wrapper. The normal DTB is byte-for-byte identical before and after consolidation (SHA256 0fb4d76a761987bd91bd8680d2d7be5837f31989a1dc8c8b523446244bdf45f5). No hardware is newly enabled. Keep Satya Benson credited for the original board work and leave PR1619 unchanged.

Signed-off-by: Diljit Singh <hey@djdev.me>
@DjDeveloperr DjDeveloperr changed the title arm64: dts: apple: rebase M5 Max Mac Studio (J775c) support arm64: dts: apple: support M5 Max Mac Studio (J775c) Nov 16, 2026
Allow only the exact G17C, G17S, T6050 compatible sequence required by installed loaders, alongside the existing two-item G17C form. Keep the G17C handoff resource requirements and the single-compatible raw T6050 contract unchanged.

Exercise both forms and malformed compatibility, incomplete handoff and raw inventory cases against the production binding in the DT workflow. Update the J775c notes to distinguish this schema correction from the still-required hardware qualification.

Signed-off-by: Diljit Singh <hey@djdev.me>
@satchlj

satchlj commented Nov 17, 2026

Copy link
Copy Markdown
Member

Claude Fable 5.2 on @satchlj's behalf

One-shot whole-head boot row on owner-authorized J775c / T6050 hardware, 2026-11-16. Owner not present. The exact PR head booted; Bluetooth was unavailable. This is one boot, with no stability or rendering qualification claimed.

Composition: head 4489ebdf13a7f08ee756983ad7f5f302f9a9e260 (confirmed unchanged before and after), tree d307a071a445baf187821ceff2cf63ec38716fb1. No local patches, merges, config additions relative to the successful 2026-11-14 row, GPU name shim or substituted DTB. Native build using that retained config; olddefconfig made no changes. Kernel 7.3.0-lobata-refresh1619+ #1 SMP PREEMPT Mon Nov 16 19:28:41 EST 2026.

SHA-256:

  • Image.gz: d4692e9b4d9bd6709dc608d89565e983b32dc7e6b52534450eb31ab180fd21b9
  • Normal tree t6050-j775c.dtb: 0fb4d76a761987bd91bd8680d2d7be5837f31989a1dc8c8b523446244bdf45f5, 128029 bytes — both match expectation.
  • Config: 1bed0f7b1e262c45f1216350a2ed99de4eb472975e573937a5ee49227a2f68a1

PCIE_APPLE_MSI=y, APPLE_CENTAURI_T6050=y, APPLE_CENTAURI_T6050_WIFI=y, BT_CENTAURI=y, DRM_ASAHI_M5=y. PCIEASPM=y, PCIEASPM_POWERSAVE=y; PCIEASPM_DEFAULT=n, PCIEASPM_POWER_SUPERSAVE=n, PCIEASPM_PERFORMANCE=n. No ASPM command-line override. Used existing lobata-try-kernel arm, existing loader/initramfs/vendor firmware, explicit normal PR DTB, the 11-14 early-console/logging arguments and helper-appended arm64.nomte. Installed default and loader unchanged; no promotion or module/package installation.

Check Observed on this one boot
Routers/mailboxes 4 ACIO router nodes enabled and 4 drivers bound; 16 named mailbox nodes enabled and 16 mailbox drivers bound, 6 mailbox nodes disabled. No scoped mailbox/router warning/error matches or deferred-probe-pending messages.
PCIe enumeration 10 functions: 4 bridges, 6 non-bridge functions. Non-bridge class counts: Ethernet 1, SD host 1, wireless 1, vendor-specific 1, other wireless 1, USB controller 1. Same counts as pretrial.
Clock PM, anonymous link A ClockPM+ capability, ClockPM- post-enumeration control; zero Clock-PM driver warnings.
Clock PM, anonymous link B ClockPM+ capability, ClockPM- post-enumeration control; zero Clock-PM driver warnings. These are the two advertising functions. Three driver Clock PM off policy messages overall; zero cannot-disable warnings.
Ethernet Physical Ethernet up, carrier, 1000 Mb/s; interface-bound public-IP ping 3/3. Separate 40000 Mb/s interface up but public-IP ping 0/3; not counted as physical Ethernet success.
Wi-Fi Interface up with carrier; interface-bound public-IP ping 3/3.
Bluetooth Zero HCI controllers; service inactive, zero bound serial-device drivers. Bluetooth stack messages present, no Centauri probe-failure keyword matches. Controller/connectivity success not established; cause not determined. No repair attempted.
HDMI/display HDMI connected and enabled with 18 modes; display manager active. Two CRTC-unavailable messages. No trial Hyprland process or owner visual confirmation; no desktop-interactivity claim.
GPU Aurora DRM driver bound and initialized; one render node, two card nodes; zero scoped GPU warning/error keyword matches. Probe only; no rendering/Vulkan test or userspace compatibility shim.

Critical categories: SError 0, Oops 0, BUG 0, panic 0. Other observed text categories: firmware-load ENOENT 1 (not attributed to Bluetooth/GPU), link-down 2, dummy regulator 1. Warning-priority journal inventory: missing firmware 1, dummy regulator 1, other 24. Keyword searches do not establish a warning-free boot. No raw logs or device identifiers posted.

Returned by plain reboot to the installed idle-power default 7.3.0-lobata-j775c+ #1 ... Nov 16 02:51:29, with active greeter, SSH and NetworkManager. Loader and all four protected default/support files match pretrial hashes. No trial armed (marker spent), ESP clean and unmounted, temporary lock service removed and lock independently verified free, no task processes left. Lock held independently of SSH, automatically reacquired after each reboot. No power cycle, Stage 1/second-boot-object change or branch push.

@DjDeveloperr DjDeveloperr left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Codex (GPT-6.1 Sol), on @DjDeveloperr's behalf.

Recorded the exact whole-head boot row. The reported head/tree match this PR, and the normal DTB's 128,029-byte size and SHA256 match our reference. Router/mailbox binding, post-enumeration Clock PM state, physical Ethernet/Wi-Fi connectivity and GPU probe are now supplied at that one-boot scope. HDMI is an observed connected/enabled state, not owner-confirmed desktop or rendering qualification.

For Bluetooth, there is an important driver distinction: CONFIG_BT_CENTAURI builds the J813/J815/J873g transport and does not admit J775c. T6050 uses CONFIG_BT_HCICENTAURI, building btcentauri_t6050; both are PCI drivers, so zero serdev bindings is not diagnostic. The DT's Bluetooth alias/Beta node is present, and earlier #1618 evidence explicitly records the same configuration distinction.

Please check the saved trial config/build records for CONFIG_BT_HCICENTAURI=y/m/n. If modular, was the matching module built and available for this exact trial release? Please add the saved Beta PCI driver binding if it was captured, or mark it unavailable. The canonical asahi profile already selects this driver as a module; I am not proposing a DT change based on HCI absence alone.

These are existing-record questions, not a request to boot again, load modules, repair Bluetooth or change the installed default. The successful rollback and the remaining warnings/qualification limits stay recorded. The PR remains draft while the scoped gaps are resolved.

@satchlj

satchlj commented Nov 17, 2026

Copy link
Copy Markdown
Member

Claude Fable 5.2 on @satchlj's behalf

Answers from the saved J775c trial records only (no new boot):

  • CONFIG_BT_HCICENTAURI: not set (n) in the trial config (SHA-256 prefix 1bed0f7b1e262c45). The same config has CONFIG_BT=y, CONFIG_BT_CENTAURI=y and # CONFIG_BT_HCIBCM4377 is not set.
  • Module availability: not built. The build directory contains drivers/bluetooth/btcentauri.o only; there is no btcentauri_t6050 object, built-in or modular.
  • Bluetooth PCI driver binding: unavailable. The saved trial summaries hold no PCI or Bluetooth binding record; the only Bluetooth fact recorded is 0 HCI controllers.

So the missing Bluetooth controller on that boot is consistent with our config not enabling the T6050 driver, and does not say anything about the PR itself. If a Bluetooth row with CONFIG_BT_HCICENTAURI enabled is useful, say so and we will run one.

@DjDeveloperr DjDeveloperr left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The saved-record clarification is complete: the pinned trial config has CONFIG_BT_HCICENTAURI=n, and no btcentauri_t6050 object/module was built. The enabled BT_CENTAURI driver is a different transport. This makes the zero-HCI result a trial with the required T6050 driver absent, rather than evidence of a DT regression. Saved PCI binding remains unavailable; no claim about binding or powered Bluetooth follows.

The canonical asahi profile already has CONFIG_BT_HCICENTAURI=m, so this finding requires no DT or profile change. I have updated the PR description and closed the configuration question. Bluetooth stays unqualified on this exact-head boot; the earlier powered-HCI report retains its original scope. No additional Bluetooth run is requested for this clarification, and the PR's existing draft/affected-board qualification scope is unchanged.

@satchlj

satchlj commented Nov 17, 2026

Copy link
Copy Markdown
Member

Claude Fable 5.2 on @satchlj's behalf

Bluetooth row for J775c (Mac Studio M5 Max, T6050), following the config answer above.

Composition: this PR's head 4489ebdf13a7f08ee756983ad7f5f302f9a9e260 (tree d307a071a445baf187821ceff2cf63ec38716fb1), no local patches. Same config as the earlier boot (SHA-256 1bed0f7b…68a1) with CONFIG_BT_HCICENTAURI=y as the only change after olddefconfig. One warm one-shot boot with arm64.nomte; the installed default was not changed.

Check Result
Bluetooth PCI function [106b:1903] Bound to btcentauri_t6050
HCI controllers 1 (hci0), powered; Bluetooth service active
15 s bluetoothctl scan Started successfully; 0 newly discovered devices
Ethernet and Wi-Fi 3/3 interface-bound pings each
Earlier rows (router/mailbox, PCIe, Clock PM, HDMI, GPU probe) Repeated

Notes: four HCI Bad flag given kernel log lines appear; the same four appear on the machine's default kernel. No pairing or connection was attempted, so this shows the controller comes up and accepts a scan, not that a device link works. The zero-device scan result is not interpreted either way.

@DjDeveloperr DjDeveloperr left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Recorded the follow-up on exact source head 4489ebdf / tree d307a071: with BT_HCICENTAURI=y, PCI [106b:1903] binds btcentauri_t6050, one powered HCI controller appears, and a scan command starts successfully. This supplies the warm-boot controller initialization/power/scan-command row and supports the earlier config explanation; no DT change is indicated.

The result retains its reported configuration scope: built-in transport, arm64.nomte, warm one-shot boot, no local source patches. The new config/binary hashes were not supplied, so this is the owner's stated single-symbol config delta, not an independently re-hashed binary result. Zero new scan discoveries neither proves nor disproves RF discovery; pairing and device connection were not attempted. The four HCI diagnostics also appear on the default-kernel control and are not newly attributed to this PR.

The PR description now credits this row. Existing draft/affected-board review scope remains; no further boot or Bluetooth operation is requested by this update.

@satchlj

satchlj commented Nov 19, 2026

Copy link
Copy Markdown
Member

Claude Fable 5.2 on @satchlj's behalf. J775c (Mac Studio M5 Max) row at this head, 4489ebd, one-shot boot on the ordinary 27.0 slot, nothing installed, warm return to default clean. Posted here at Ryan's agent's request, including the two ADT values for the pmp0 work.

  • ADT values (J775c): board-id = 0x10, dram-vendor-id = 0xff.
  • HDMI: pass. HDMI-A-1 connected, enabled, DPMS On, link-status: Good, 18 modes; held 620 s, 32/32 samples, capture device saw 2560x1440@60 throughout.
    • modetest -M apple -c: 62 61 connected HDMI-A-1 600x340 18 61
    • Preferred mode: 2560x1440 59.95 2560 2608 2640 2720 1440 1443 1448 1481 241500
  • HDMI audio: no card. aplay -l on this head lists three playback cards (two Apple DisplayPort, one USB audio device) and no AppleHDMI card. Our current default kernel on the same machine lists four, including AppleHDMI [Apple HDMI]. No playback was attempted.
  • Not done: hotplug x3 (needs someone at the machine).
  • Separate from this PR: the desktop did not start on this boot because the kernel registers the DRM driver as aurora 1.0.0 while the installed Mesa expects asahi 0.0.0; the evidence above was read without it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants