Repository navigation
PCI: apple: suspend-to-idle on the J714s (adopted N1 link; stacks on #1647) - #2012
Merged
DjDeveloperr merged 3 commits intoNov 16, 2026
Conversation
… link The adopted link's suspend check admits only the J716c; the K116s is its OLED sibling with the same T6050 host and the N1 on port 0, and the first s2idle attempt there failed with -EBUSY from the noirq suspend. Let it through the same checks. Signed-off-by: Jens Axboe <axboe@kernel.dk> [thomas: rebased onto integration, where the check also admits the K114c] Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The adopted-link s2idle check walked the whole bus and refused to suspend when any device had left D0. With a kernel-trained second port (the SD reader on the K116s) the PCI core puts that root port into D3hot, and suspend failed with -EBUSY. Below a port Linux trained itself, only the devices that asked to stay awake need to remain in D0; the PCI core restores the rest. Below a port the boot loader trained, such as the N1's, every device must still be in D0, so the J716c and the K114c, whose only port is adopted, are checked as before. Signed-off-by: Jens Axboe <axboe@kernel.dk> [thomas: skip only devices below a port Linux trained (port->pwren), so adopted ports keep requiring D0 for every device] Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
Isaac-Duarte
force-pushed
the
j714s/s2idle-allowlist
branch
from
November 15, 2026 17:25
189fe1c to
3d3fb63
Compare
1 of 3 tasks
Isaac-Duarte
marked this pull request as ready for review
November 15, 2026 18:29
1 of 4 tasks
… link
The adopted-link check admits the J716c, the K114c and the K116s. The
J714s (MacBook Pro 14", M5 Pro) has the same T6050 host as the K116s,
with the N1 on port 0, and every s2idle there failed in the noirq
suspend:
pcie-apple 1cb0000000.pcie: PM: dpm_run_callback(): apple_pcie_suspend_noirq returns -16
pcie-apple 1cb0000000.pcie: PM: failed to suspend noirq: error -16
Like the K116s, the J714s has its SD card reader (a GL9755) on port 1,
which the boot loader leaves down and Linux trains itself. The previous
commit lets the devices below such a port leave D0 over s2idle, which
the check needs on this board too.
Add the J714s to the list. For a clean wake it also needs the PMP's
power domains kept on ("arm64: dts: apple: t6050: keep the PMP's power
domains on"), and for the Type-C ports to work after the wake, the ATC
usb-aon domains kept on ("arm64: dts: apple: t6050: keep the ATC usb-aon
power domains on").
Signed-off-by: Isaac Duarte <31712685+Isaac-Duarte@users.noreply.github.com>
Isaac-Duarte
force-pushed
the
j714s/s2idle-allowlist
branch
2 times, most recently
from
November 15, 2026 20:34
212a562 to
af590f0
Compare
Contributor
|
Test report from a second J714s (MacBook Pro 14", M5 Pro), for #1647 + #2012 + #2018 together.
Thank you all for this, it's the first time this machine has had a working lid sleep here. 🤖 Generated with Claude Code |
Isaac-Duarte
force-pushed
the
j714s/s2idle-allowlist
branch
from
November 15, 2026 23:08
af590f0 to
56b0205
Compare
DjDeveloperr
merged commit Nov 16, 2026
e2ec065
into
aurora-silicon:integration/aurora
1 check passed
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.
Stacks on #1647. This branch is #1647's head (
70bf8ed186) plus one commit. Only the last commit,56b02059cf"PCI: apple: qualify the J714s for suspend-to-idle over the adopted N1 link", is new here. Review #1647 first; I'll rebase this once it merges.Pairs with #1789 and #2018. Merge this only together with, or after, both:
What
One commit,
drivers/pci/controller/pcie-apple.c(+6/−4):apple,j714sjoins the J716c, K114c and K116s inapple_pcie_check_adopted_s2idle()'s allowlist. The comment above it now says what the four share (the T6050 host with the N1 adopted on port 0), and that the K116s and the J714s also have a kernel-trained SD reader port.Why
The J714s (MacBook Pro 14", M5 Pro) has the same T6050 host as the K116s, with the N1 adopted on port 0. Without this, every s2idle on it fails in the noirq suspend:
Like the K116s, the J714s has its SD card reader (GL9755) on port 1, which the boot loader leaves down and Linux trains (
port 1: trained by Linux, the boot loader left it down). #1647's second commit, which lets the devices below such a port leave D0 over s2idle, covers that here too. The allowlist line has now run on two J714s machines.Tested
J714s, the user's machine. Kernel 7.3.0-b248cfe, build #2 (08:23): integration/aurora b248cfe plus carried commits, including #1647's two commits, #1789, and this line. The line in that kernel is functionally the same as this commit; only the comment differs. Build #1 (08:01) lacked those commits, and it is the build of the 20-of-20 boot above. Every boot below is build #2, and every s2idle in them ran with the line. The table shows selected boots. Three more build-#2 boots also slept, with no PCIe refusal and no failure, and are left out: 12:03 (one 63.8 s lid sleep, the traced run of #2018); 12:59 (three: 22.4 s, the 45 s SD-card test, and about 66.6 min from 14:06:35 to 15:13:13, woken by an SMC HID event rather than the lid); 15:24 (one 41.7 s lid sleep). The PHY module was swapped between boots. In boots 3–5, "#2018" means its earlier PHY-hold version (then posted as #2008); boot 6 ran #2018's current DT version.
thunderbolt-apple-nhi(-16, by design); no real sleepthunderbolt-apple-nhi(-16), and the system stayed up.t6050-j714s.dtbplus the usb-aon patch, not build #2's own DTB; original PHY module, no holdapple_pcie_suspend_noirqfailures in these boots.thunderbolt-apple-nhi 381f00000.nhi: 1:9: PCIe tunnel activation failed, aborting, and the dock had to be re-plugged. This was seen in no other boot.energy_now): 85 % → 81 %, 52.13 → 50.28 Wh, so 1.85 Wh over 0.95 h = 1.95 W average./sys/class/power_supply/macsmc-battery/power_nowon battery, not an idle-controlled measurement;aurora-silicon/aurora-silicon.github.io,src/data/feature-reports.json).Build:
drivers/pci/controller/pcie-apple.oat this head, LLVM, W=1, the running kernel's config: no warnings. checkpatch: one line over 75 characters, a quoted log line in the commit message.Not tested:
pcie-apple.cis byte-identical to the tested file apart from the comment.A second J714s (TripleU613, report on #2018): integration/aurora c0a2a75 + #1647 + this commit (
af590f044ca2) + #2018's earlier PHY-hold version (ad7f44429aab) on the omarchy-m5 v272-12 series (with #1789),CONFIG_APPLE_SOC_SLEEPoff. Two lid s2idle cycles (about 3 s and 3 min 37 s),suspend_stats2/0. After the wakes the panel, Wi-Fi, Bluetooth, audio and speaker protection were back, and on the left-front and right ports a charger and a USB device worked. No dock, long sleep or repeated cycles were tried there.To run before merge