Repository navigation
arm64: dts: apple: t6050-k114c: add the deep-sleep controller node - #2089
joshuaswarren wants to merge 10 commits into
Conversation
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. |
|
CHANGES on 21d241e Claude review, exact head. One finding, message only. The tree is clean. Finding: neither commit has a Signed-off-by. What I checked (sparse checkout of this head, gcc preprocessor plus
Notes, not findings:
I will re-review and post GREEN when the Signed-off-by lines are in. |
21d241e to
8f72413
Compare
|
w7X: Signed-off-by added to both commits via rebase --signoff (original author kept; new head 8f72413). Tree unchanged. |
|
GREEN on 8f72413 Claude review, exact head. This closes my CHANGES on
Not covered: |
8f72413 to
218d09f
Compare
|
GREEN on 218d09f Independent review at the rebased head by a second model family, posted by [Joshua's agent] on the reviewer's behalf. |
|
Thanks Joshua, moving the T6050 sleep match off the J714s is the right direction. Three points on the code:
Row still needed on the K114c: boot with the node and the sleep driver probes without "unsupported board/CPU inventory". Once the boot loader's SoC data is in the node: Since |
|
[Joshua's agent] Thanks, Ryan. Three points on #2089 at head 1. Duplicate Agree. At this head the K114c file is 233 lines and differs from 2. Max profile: J716c sleep data vs J714s copy I have no K114c sleep boot receipts yet: no probe line, no Static facts checked in the tree (not boot):
Position: J716c Max soc plus J716c sleep device files is plausible for a K114c Max without PMP, but it is unproven here until the boot row runs. I will not widen the DTS to J716c shapes without a measured pass that shows the sleep driver probes and suspends cleanly. If the first boot fails inventory or region setup, that is the fork to document. 3. Understood on I have not re-run the compile-only inventory proof on I will not remove Row still owed (K114c, unbooted on this PR today): probe without "unsupported board/CPU inventory"; then Skipped: dtbs_check on latest integration tip; J716c sleep DTS swap without boot. |
|
Thanks Joshua. Yes, please go ahead with the code change on this PR:
The K114c row is unchanged: probe without "unsupported board/CPU inventory", then |
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>
Copy the J714s's sleep controller node and what it needs from the rest of the tree (the cluster power gates, the AOP2 and SIO mailboxes, the port controllers' sleep state) into the K114c. The register banks are the T6050 pmgr, cluster, watchdog, SPMI, PMC, PTD, clock generator and memory controller pages the two boards share. The SoC data the boot loader adds is not in the node yet, so the driver has no commit schedule and does no deep sleep. Not booted on the hardware. Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
The T6050 profile bound to the J714s alone: its match data named that machine, and so did the display-power hand-off. The node and its data are per board (the dtsi gives them), and the CPU inventory check (18 CPUs, boot MPIDR 0x40000) still refuses a board whose cores differ, so the machine name added nothing. Match the SoC, which the K114c (M5 Max) shares. Not booted on the M5 Max. Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
218d09f to
ae610ba
Compare
|
Thanks Joshua. The latest push seems to have come from the wrong base. The PR now has 10 commits: besides your two, it carries eight from the J775c compatibility work (acio routers, DROM placeholders, PCI Clock PM, the J775c board consolidation, the G17C binding), about 7k lines that belong to #1619 and #1618. Your two commits are unchanged: Could you reset the branch onto
The K114c row is unchanged. |
Summary
Ports the T6050 (K114c / M5 Max) deep-sleep controller node and SoC-match
fix from our k40u series:
8dddc6162b57—arm64: dts: apple: t6050-k114c: add the deep-sleep controller node(newt6050-k114c-sleep.dtsi, 233 lines, plus theinclude in
t6050-k114c.dts)c166fc4296c49—soc: apple: sleep: T6050: match the board by the SoC, not the J714s(sleep-t6050.h+sleep.cdisplay-powerhand-off compatible)
The node copies the J714s sleep controller shape: cluster power gates,
AOP2/SIO mailboxes, port-controller sleep state. Register banks are the
T6050 pmgr/cluster/watchdog/SPMI/PMC/PTD/clockgen/memory-controller
pages shared with J714s. Per the source commit message, the boot
loader's SoC data is not in the node yet, so the driver has no commit
schedule and does no deep sleep — this lands the DT/driver plumbing,
not an active sleep path.
Port notes
Cherry-picked onto
integration/aurora@bf423bf0. The original saton a k40u file layout that also carried
t6050-k114c-display.dtsiandthe qspi/nvram block (separate, not-yet-upstreamed work); upstream has
neither, so the include lands at end of file. The sleep.dtsi itself is
unchanged.
Verification
t6050-k114c.dtbcompiles clean via the kernel dtc path(
gcc -E -D__DTS__+scripts/dtc/dtc -b 0): only pre-existingwarnings in
t6050-k114c-gpu.dtsi/t6050-peripherals.dtsi, nonefrom the new file.
M5 Max deep-sleep enablement is future work; this is DT plumbing only.
Generated with Devin