Repository navigation
mfd: macsmc: the T6050 saved-context path on the J716c - #2133
Merged
Merged
Conversation
This was referenced Nov 17, 2026
erikwb
marked this pull request as draft
November 17, 2026 15:06
The SMC's saved context for the T6050 firmware sleep was set up on the J714s only. The J716c has the same T6050 SMC: enable it there too, on a machine that is both apple,t6050 and apple,j716c. The J714s's wake reason table stays J714s only. Developed with Claude Code. Signed-off-by: Erik Bourget <erik@ebourget.net>
erikwb
force-pushed
the
j716c/macsmc-sleep
branch
from
November 17, 2026 15:09
aa59a20 to
30f95ff
Compare
…aved lane at resume
A wake by something the SMC itself reports, such as a Type-C port's unplug,
brings a notification right behind the wake. Its handler's ordinary command
can be in flight when the noirq resume runs: posted, with its reply waiting
in the mailbox while the interrupt is still off. The resume took the pending
flag for an unresolved saved command and refused with -EBUSY. The SMC then
never got its AP ON notice, and ANS, waiting for its topology from the SMC,
asserted 10 s into the wake:
macsmc 28c600000.smc: PM: failed to resume noirq: error -16
nvme-apple 45dcc0000.nvme: RTKit: Message (id=1): assert failed:
[21370]:timed out waiting for topology from SMC
Poll the mailbox until the reply is in, bounded at 200 ms, before judging
the lane. A recovery or a fault still refuses as before.
Seen on the K116s: a USB stick pulled during a deep sleep.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit 2f579ba)
Align the mocked DCP state and helpers with the production dcp_poweron() used by the fixture. This also covers its negative-control build paths. Signed-off-by: Diljit Singh <hey@djdev.me>
Retain the tested production changes and use the ext26 cold-boot fixture revision that landed in integration. Signed-off-by: Diljit Singh <hey@djdev.me>
Keep the J716c profile change and the independently tested ordinary pending-reply polling. This allows CI to exercise the combined SMC source while the prerequisite PR is under review. Signed-off-by: Diljit Singh <hey@djdev.me>
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.
What this does
The SMC's saved context for the T6050 firmware sleep is enabled on the J716c too (on a machine
that is both
apple,t6050andapple,j716c). The J714s's wake reason table stays J714s only.Tested
j716c/macsmc-sleep) builds on its own base (Image.gz, modules and dtbs, arm64, LLVM).integration/aurorawere built as one kernel and run on a J716c (16" M5 Max): one suspend-to-RAM with a USB4 dock attached, about 30 s asleep, woken by the RTC alarm (wake source 76). After the wake all 18 CPUs were online, the dock's router came back in place with its Ethernet up, and the SEP answered RNG reads. The sleep's log showed "secondary clusters down first: cores 6+6, cluster 1 0x1a in 353 us, cluster 2 0x1c01a in 448 us". The PMP was not running in that build.Dependencies
Branch #2133 (
j716c/macsmc-sleep). Based onintegration/aurora; no dependencies at build time. At run time the J716c deep sleep needs #2119 (j716c/sleep-j716c-profile) and #2123 (j716c/dts-deep-sleep).Part of the J716c deep sleep set: #2118 (
j716c/spin-table-release-cpus), #2119 (j716c/sleep-j716c-profile), #2120 (j716c/sleep-wake-source-names), #2121 (j716c/sleep-sep-auto-wake), #2122 (j716c/sep-t6050-profile), #2123 (j716c/dts-deep-sleep), #2124 (j716c/drm-apple-sleep), #2125 (j716c/dart-sleep), #2126 (j716c/thunderbolt-sleep), #2127 (j716c/usb-sleep), #2128 (j716c/phy-sleep), #2129 (j716c/pcie-sleep), #2130 (j716c/aic-sleep), #2131 (j716c/asahi-sleep), #2132 (j716c/spmi-sleep), #2133 (j716c/macsmc-sleep), #2134 (j716c/nvme-sleep).🤖 Generated with Claude Code