Repository navigation
drm/asahi: g17: identify the M5 Max 27.3 (26C5035r) firmware (on #1173) - #1602
joshuaswarren wants to merge 11 commits into
Conversation
|
Thanks Joshua, the identification work here is solid. We're holding this one for now: the M5 boot path is targeting the stable 27.2 release (Stage 1 in CTXR mode, where every core comes up at EL2), so the G17C entry we want is the 27.2 build, not 26C5035r. Same direction as on aura#172. It also still sits on #1173, which has to merge first. When you have the 27.2 G17C identity, a rebase onto #1173 with that entry is what we'd merge. |
Codex Review Summary: ❌ FailedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
|
The account paying for this security review has reached its Codex usage limits. The payer can check the Codex usage dashboard. For personal accounts, using credits requires enabling “Use credits for security reviews” in Code review settings. If you do not manage the paying account, contact this repository's admins. |
|
[Joshua's agent] This PR has the same conflict as #1173 against |
|
[Joshua's agent] Dropped: the stacked port I promised here (with #1173) was not made and will not be opened from me. Nothing was built or booted for it, and it needs M5 Max boots I have no slot for. This PR still carries the ten commits of #1173 plus the one that identifies the 26C5035r firmware, so it is reviewable only after #1173 is rebased. |
|
[Joshua's agent] Back to draft: this no longer applies to integration/aurora. The base has since gained the common26 layout machinery this stack predates, so it needs a rework onto that, not a rebase. No review needed until it returns. |
|
Reworked onto the base's common26 layout machinery as the draft note asked; head e97b6fb. What changed: the M5 firmware InitData layouts (26B123 and 26C5035r profiles, policy and status-config relocation, the two new J714 boards) and the t6050 identification for the 27.2 and 27.3-beta1 builds, now expressed through the base's RootProfile scheme instead of the old stack's per-variant field. The 27.3-beta1 M5 Max has its own board record (J716C_26C5035: 4 clusters, 40 cores, the Max perf tables), so a real Max probes through instead of matching the Pro board. The drm module builds for arm64 with rustc 1.96.0 and bindgen 0.73.2; every ported table is byte-identical to the source stack. Two commits, one per file group, plus one review fixup commit that folds into them. |
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
|
The account paying for this security review has reached its Codex usage limits. The payer can check the Codex usage dashboard. For personal accounts, using credits requires enabling “Use credits for security reviews” in Code review settings. If you do not manage the paying account, contact this repository's admins. |
5588117 to
e97b6fb
Compare
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>
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>
…6B123, 26C5035r) The M5 Pro and Max firmware builds of macOS 27.2 (26B123) and 27.3 beta 1 (26C5035r) grow the power policy and the status config against 26A428, and the 26C5035r build inserts one HW data word. Carrying those layouts needs per-build InitData tables; the profile scheme had them only for 26A428. Port the M5Layout subsystem from the wAP rebase onto the current tip: - fw/variant.rs: the M5Layouts enum and the m5_layouts field, with the V26B123_M5 and V26C5035_M5 variants (V26C5035r acknowledged on a J716s under aura; 27.2 has not run on metal yet). - fw/m5/initdata.rs: the M5Layout and M5StatusConfigMap/M5PolicyMap subsystems with the two new profiles (J714G17S26B123, J714G17S26C5035); the encoders take the build's layout; the policy and status-config maps relocate the build's fields in place (relayout_m5_policy); the M5Graph consts for the two builds and the J714_26B123/J714_26C5035 boards. - initdata/m5.rs: the submission history reads through the status-config map; build_m5 lays the policy out for the build before the controller defaults run. Const-graph rule learned on the way: a per-build Config override must be a full literal, because a struct-update from the base would inherit the base's build list, whose 26C5035r entry names the override. Proof: drivers/gpu/drm/asahi/aurora.o builds for arm64 with the pinned bindgen (rustc 1.96.0); the const assert blocks of the ported tables evaluate during that build.
The 27.2 (26B123) and 27.3 beta 1 (26C5035r) builds of the M5 Pro and Max get their own per-build configurations, naming the boards whose graphs carry the builds' layouts (the previous commit's work). The 26C5035r entropy, boot-filled ranges and TEXT digests were measured on two J714s boots and one J716s boot under aura; the 27.2 records came from the 27.2 boots.
CONFIG_MAX_26C5035 named J714_26C5035, whose ..J714 base makes it the Pro board (2 clusters, 20 cores): a real M5 Max (J716C, 4 clusters, 40 cores) was refused at the probe after its firmware identified. Give the build its own board (J716C on the M5_GRAPH_26C5035 graph) and name it. Also from the review: drop the dead V26B123_M5/V26C5035_M5 variant consts and the unread Variant::m5_layouts field (layout flows config.m5 -> board.graph -> profile), and remove the comment artifacts in t6050.rs (the pasted single-build comments before the multi-build lists and the orphaned 26B123 doc above CONFIG_26C5035).
e97b6fb to
0d4abd4
Compare
On top of #1173. Only the last commit is new; the first ten are Rolando Trevino's from that PR.
The GPU of the 14-inch M5 Max MacBook Pro (K114c, T6050) loads the G17C build of the macOS 27.3 (26C5035r) firmware. The driver only accepts firmware builds it has identified, and this one was not in the table. This identifies it in
hw/t6050.rsnext to the 27.0 (26A428) G17C entry and points it at theV26C5035_M5variant from #1173.I measured the identity from the loaded G17C TEXT on the machine: size 0xa4000, entropy records at the same offsets as the G17S 27.3 build, and the normalized digest came out the same on three boots.
Tested on a 14-inch M5 Max MacBook Pro with #1601 and the K114c device tree handoff: the driver logs
GPU firmware: 27.3 (26C5035r), G17C, both initdata blocks are acknowledged and/dev/dri/card1andrenderD128appear. A Wayland triangle renders and fdinfo shows 42 ms vertex and 39 ms fragment time. Hyprland runs on the GPU with Mesa from the matching branch.It needs #1173 to merge first; only the last commit is for review here.
Validated on, and reach
Validated on: 14-inch M5 Max MacBook Pro (K114c, T6050) with #1601 and the K114c device-tree handoff: the driver logs
GPU firmware: 27.3 (26C5035r), G17C,/dev/dri/card1andrenderD128appear, a Wayland triangle renders, and Hyprland runs on the GPU.Applies beyond the M4: No. It identifies one firmware build in
hw/t6050.rs. It needs #1173 first; only the last commit is new here.m tester run (omarchy-m-testing.org): feature rows GPU. The tester needs the hardware; no tester run is linked to this change.