Repository navigation
Conversation
Suspend-to-idle with links the boot loader trained ("adopted") left
running was admitted by a list of board compatibles. Admit it instead on
the host's apple,s2idle-retain-adopted-links property, and set that
property in the device trees of the four boards on the list (J716c,
K114c, K116s, J714s). A board whose s2idle is qualified later then needs
only its own device tree, not a driver change.
Behaviour on those four boards is unchanged; every other board still gets
-EBUSY, as before.
Signed-off-by: Satya Benson <satya@benson.earth>
|
Thanks for moving this out of the compatible list; that is the right direction. One thing we would still change: we select behaviour by a hardware property, not by the list of machines it was tested on, and The hardware fact here is "this port's link was trained by the boot loader", which the driver already knows per port. Could We can run s2idle rows on our M1 Pro, M2, M4 Pro and A18 Pro if you make it the default. |
apple,s2idle-retain-adopted-links named the boards where s2idle had been tried; it did not describe the hardware. What the driver has to know is whether the boot loader trained the host's links, and hw->adopt_link already says that: apple_pcie_check_adopted_s2idle() is called only for such hosts. Drop the property, its binding and its four board lines, and admit s2idle on every adopted host. The existing checks remain the guard: the root complex must run, every port's link must be up and not busy, and each device below a boot-trained port must answer in D0, before the sleep and again after it. A host that cannot keep its link still refuses s2idle there, or reports the lost link on resume. Signed-off-by: Satya Benson <satya@benson.earth>
|
Claude Opus 5.5 on @satchlj's behalf: thanks, done in
I've retitled the PR and updated the description, including the behaviour change: the other T6050 boards now attempt s2idle instead of getting 🤖 Generated with Claude Code |
#2488 no longer adds this property: pcie-apple keeps adopted links across s2idle on every host whose links the boot loader trains (hw->adopt_link), so J775c needs no line for it. Without the binding, the property would also fail dt-validate. Signed-off-by: Satya Benson <satya@benson.earth> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Thanks for 11fa3df. Admitting s2idle on every host with adopted links, with the existing RUN/READY, link and D0 checks as the guard, is the selection we hoped for, and the PR is much smaller for it. As you note, our machines have no adopted links, so the J775c row on this head is the one that matters. |
|
Claude Opus 5.5 on @satchlj's behalf: J775c (Mac Studio, M5 Max) row on this PR's head, Kernel: lobata's cand-4, Method:
The kernel log, the same in every cycle: What this shows:
The RTC alarm wake (#1743 + #2495) could not be tested by a real freeze, because none happened. 🤖 Generated with Claude Code |
|
Claude Opus 5.5 on @satchlj's behalf: cause of the J775c refusal, from a diagnostic print in the D0 check (local, not part of this PR). Kernel: lobata's cand-5, Six What it shows:
Fix to test next (a new commit here, selected the way this PR already is): keep the devices on an adopted link, from the root port down, out of D3, so that the existing D0 check holds what it requires (for example 🤖 Generated with Claude Code |
|
Thanks for the two J775c runs and the diagnostic print. They show the PR's own change working: J775c reaches the |
|
Claude Opus 5.5 on @satchlj's behalf: agreed. This PR's code stays as it is. The D0-rule fix will be a separate PR against The remaining J775c row will run on this PR's head plus that PR: a completed 🤖 Generated with Claude Code |
|
Claude Opus 5.5 on @satchlj's behalf: the D0 fix is now its own draft PR, #2557. It's based on The first run on this head plus #2557 doesn't count as the row yet. That was cand-7, 🤖 Generated with Claude Code |
|
Claude Opus 5.5 on @satchlj's behalf: progress on this PR's last row. On cand-8 ( A completed RTC-woken freeze on J775c still waits on that resume hang, so this PR's row stays open. 🤖 Generated with Claude Code |
|
Claude Opus 5.5 on @satchlj's behalf: J775c row: completed RTC-woken freezes on this PR's head, 3/3. This is the row you said this PR still needed. Kernel: lobata's cand-10,
The J775c DT is #2102's board file plus #2592's change. Entered by an ordinary reboot as a one-shot, 2026-11-20 17:45Z. Method:
Not covered: idle power during sleep, and a USB-C/Thunderbolt device in use across the cycle. 🤖 Generated with Claude Code |
|
Thanks, 3/3 completed RTC-woken freezes on J775c with the wake IRQ logged is the row this PR needed. The other two changes in that kernel are tracked in their own PRs: #2557 for the D0 rule, keyed on the port's state, and #2592 for the ATC USB domains, documented in the SoC tree. From our side this PR is done. It should land together with #2557 and #2592, since J775c s2idle needs all three. |
11fa3df to
7012343
Compare
DjDeveloperr
left a comment
There was a problem hiding this comment.
Pre-PR checklist review of 70123439e95fe207beb96dac2ea59eb1990990d9 (§1–§6): 0 code/policy/attribution/naming/CI blockers; holding on §5 hardware evidence recorded on this PR.
Checklist Summary
- §1 No model gating — PASS: Removes the 4-board compatible allowlist (
apple,j716c,apple,k114c,apple,k116s,apple,j714s) fromapple_pcie_check_adopted_s2idle()(drivers/pci/controller/pcie-apple.c:6765-6795). Selection is now strictly onhw->adopt_link(currentlyt6050_hw) plus live hardware checks. - §2 Production-ready, no hacks — PASS: No new cmdline/module parameters, delays, or lab-only paths.
- §3 Safety — PASS: Keeps all pre-sleep (
apple_pcie_suspend_noirq(),:6840-6858) and post-sleep (apple_pcie_resume_noirq(),:7354-7387) hardware guards: root-complexCORE_RC_CTL_RUN/CORE_RC_STAT_READY, per-portPORT_STATUS_READY/PORT_LINKSTS_UP/!PORT_LINKSTS_BUSY/!PORT_INT_LINK_DOWN, andapple_pcie_check_d0()vendor-ID + PMCSR D0 verification, withport->link_failed = trueif a retained link drops during s2idle. - §4 Clean-room & attribution — PASS: Both commits (
845424c7fb10,70123439e95f) have human author/committer (Satya Benson <satya@benson.earth>) and a single humanSigned-off-by:with noCo-Authored-By:or AI trailers. PR body carriesAssisted-by:. - §5 Evidence — HOLD (incomplete on this PR):
- The last row recorded on #2488 (
cand-10on11fa3dfc12, tree-identical pre-rewrite) was combined with the now-closed #2592 and omitted the §5 regression counts (SELinux denials, failed units, new kernel errors). - The newer default-cmdline J775c row (
5a2b7d50oncacf35543b4d+ #2488 + #2557 + #2664, 3/3rtcwake -m freeze -s 10, 0 SELinux denials, 0 failed units) was posted on #2664 rather than recorded here and does not explicitly confirm 0 new kernel errors. Please copy/link that row here with the full regression triple. - None of the four previously allowlisted
adopt_linkMacBook Pro boards (J714s,J716c,K114c,K116s) have a regression row on this head (as noted in the PR body). Asking for at least one MacBook Pro T6050 row before approval/merge.
- The last row recorded on #2488 (
- §6 Naming — PASS.
- CI — PASS:
host-testsandkunitboth green on70123439e95f.
Non-blocking notes
- Landing order: Keep coordinated with #2557 and #2664, since J775c s2idle hangs on real freeze without #2664 once it gets past
apple_pcie_check_adopted_s2idle(). - History / PR body hygiene: Commit 1 (
845424c7fb10) introducesapple,s2idle-retain-adopted-linksand four DTS edits that commit 2 (70123439e95f) completely removes; squashing into a single commit keeps bisect history clean. The PR body's## Testingsection is also stale (still says commit 2 is uncompiled and J775c refused 3/3 oncand-2d).
Assisted-by: LLM (Gemini 4 Neon)
Claude Opus 5.5 on @satchlj's behalf.
pcie-appleadmitted suspend-to-idle with boot-loader-trained ("adopted") links left running only on a list of board compatibles: J716c, K114c, K116s, J714s. That list records where s2idle was tried, not anything about the hardware. This PR removes it.apple_pcie_check_adopted_s2idle()is only reached for hosts whose links the boot loader trains (hw->adopt_link, todayt6050_hw). On those hosts it now admits s2idle on every board. The existing hardware checks stay as the guard, before the sleep and again after it:A host that cannot keep its link still refuses at these checks, or reports the lost link on resume.
Commits:
apple,s2idle-retain-adopted-links.integration/aurora, the PR now changes onlypcie-apple.c.Behaviour change: every other board on a T6050 PCIe host (
t6050_hw), J775c among them, now attempts s2idle with its adopted links kept, instead of getting-EBUSY.Testing
drivers/pci/controller/pcie-apple.obuilt without warnings on26294e82(gcc 16.1.1, arm64). Commit 2 is not yet compiled on its own; lobata's next candidate builds it.Assisted-by: LLM (Anthropic:Claude Opus 5.5)