Repository navigation
arm64: dts: apple: t8122-j615: hand the MTP over running, two-stage trackpad power (stacked on #2525) - #2550
Closed
RyanTheTide wants to merge 6 commits into
Closed
RyanTheTide wants to merge 6 commits into
RyanTheTide wants to merge 6 commits into
Conversation
…y its properties, not by board A boot stage that leaves the MTP running hands it over with apple,rtkit-handoff on the MTP and apple,bypass-handoff-streams on its DART. Two checks still named the J613: the DART probe accepted the bypass stream only on the J613's T8122 DART at 0x2fa808000, and the helper kept the adopted session's ASC awake over s2idle only on the J613. The 27.2 MTP firmware on the MacBook Air M2 (J413) cannot be restarted either, and U-Boot hands it over the same way through the T8112 DART at 0x24e808000. - apple-dart: inherit the stream when the DART supports bypass, the stream is 1, and its TCR reads back as bypass. The register is the hardware's own record of the handoff, so it replaces the board and address match. - rtkit-helper: keep an adopted session's ASC awake over s2idle on every board. A session is adopted only through apple,rtkit-handoff, which says it cannot be restarted. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Add apple,rtkit-keep-running to the rtk-helper binding: the helper's firmware cannot be restarted once quiesced, so a boot stage that starts it hands its first epoch to the OS running instead of stopping it. U-Boot used to pick these by board (J613) and by SoC plus OS firmware version (T8112 on 27.x); it now reads this property. - t8122-j613: set it, as U-Boot's J613 check did. - t8112-j413-fw27 (new): J413 with macOS 27 system firmware. It sets the property and the trackpad's two-stage power command (apple,power-method = <2>), which U-Boot used to patch in, following t8122-j613-25g83. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The helper no longer checks the board, so the harness's of_machine_is_compatible() stub was unused and failed -Werror. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…its base board A firmware-profile variant such as t8122-j613-25g83 or t8112-j413-fw27 includes its board's .dts, so a new variant repeats every existing warning of that board under a new DTB name and fails the check. Report a variant's warnings under the base board's name instead. A warning only the variant has still shows up as new. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…rackpad power
The J615's MTP firmware cannot be restarted once quiesced, as on the
J613. After U-Boot used it for the boot keyboard and stopped it, Linux
restarted it, the coprocessor crashed (data abort in its first epoch),
the helper failed with -ETIME and the internal keyboard and trackpad
never appeared. Mark the MTP apple,rtkit-keep-running so a boot stage
hands its first epoch over running and Linux adopts it.
On the 27.2 firmware the trackpad answers the one-stage power command
with 0xe00002c2 and never becomes ready ("multi-touch start timed out").
It accepts the two-stage command, so set apple,power-method = <2>. The
25G83 variant keeps the one-stage command.
Tested on a J615 on the 27.2 stub, Stage 2 aura 1.0.0b13.1 with this
DTB and U-Boot with the keep-running handoff: the session is adopted
(4 retained buffers), keyboard, trackpad, STM and actuator interfaces
report ready, no dockchannel-hid errors.
Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
7 tasks
DjDeveloperr
requested changes
Nov 20, 2026
DjDeveloperr
left a comment
Contributor
There was a problem hiding this comment.
Thanks, the J615 rows look great, and the &mtp property matches the #2525 / u-boot#67 contract exactly. There's one real problem and two process items.
t8122-j615-25g83.dts:25-28changes the 25G83 trackpad power method from 2 to 1.- The same file already sets
apple,power-method = <2>at lines 15-18 ("GPIO-mediated AFE power sequencing, as on the J613 (J615 ADT gP08)"), and the J613 25G83 profile uses 2 as well. - In dtc the later block wins, so this PR flips the profile to 1. The description says the file "keeps" 1, but before this PR it was 2.
- Please drop the new block. The 25G83 profile already gets 2 from both
t8122-j615.dtsand its own lines 15-18. - If you have evidence that the 25G83 J615 trackpad needs method 1, change lines 15-18 and cite that evidence there, rather than adding a second override.
- The same file already sets
- The 25G83 profile now hands its MTP over running too. It inherits
apple,rtkit-keep-runningfromt8122-j615.dts, so U-Boot will hand that MTP over running. That matches the crash its comment describes, and the J613 25G83 profile does the same, so I think it's right. It is untested, though: please add a 25G83 boot to the rows if you have that firmware. - CI and the base branch:
- No CI ran on 2148416, because dt-checks and host-tests only trigger for PRs into
integration/auroraoraurora-wip. - #2525 also needs re-signing (no
Signed-off-by:), which rewrites the commits this branch sits on. - Once #2525 lands I'll retarget this to
integration/aurora. Please then rebase onto it with the fix, so the push runs CI on the retargeted PR.
- No CI ran on 2148416, because dt-checks and host-tests only trigger for PRs into
The previous commit appended a second &mtp_mt block to the 25G83 variant that set apple,power-method = <1>. dtc applies the later block, so it overrode the file's own <2> (GPIO-mediated AFE power sequencing, as on the J613 25G83) and changed that profile's trackpad power command. Drop the block. The 25G83 profile gets <2> from both t8122-j615.dts and its own override again, as before this series; only the 27.x profile was meant to change. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Contributor
Author
|
Thanks for the review.
Assisted-by: LLM (Claude:Opus 5.5) |
satchlj
force-pushed
the
satchlj/mtp-live-handoff-by-property
branch
from
November 20, 2026 12:27
94ed951 to
45a78bf
Compare
Contributor
Author
|
Superseded by #2576: the same change as one signed-off commit on Assisted-by: LLM (Claude:Opus 5.5) |
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.
Problem
On the 15" MacBook Air M3 (J615) the internal keyboard and trackpad never appear. U-Boot uses the MTP for the boot keyboard and then stops it; Linux restarts it and the MTP firmware crashes in its first epoch (data abort in the crash log), the helper fails with
-ETIME, anddockchannel-hidstays deferred. The J613 (same SoC) already avoids this by handing the running session to Linux; the J615 had no such marking.Once that is fixed, the trackpad on the 27.2 firmware rejects the one-stage interface power command (
output report 0x40 ... failed with err 0xe00002c2, theniface multi-touch start timed out).Change
t8122-j615.dts:&mtp { apple,rtkit-keep-running; }: the boot stage hands the MTP over running (property from iommu/apple-dart, soc: apple: rtkit-helper: take a live MTP handoff by its properties, not by board #2525 / u-boot#67).&mtp_mt { apple,power-method = <2>; }: the two-stage power command, ast8112-j413-fw27.dtsdoes for the J413 on 27.x.t8122-j615-25g83.dtsis unchanged: it keeps its ownapple,power-method = <2>(as on the J613 25G83). The first commit wrongly appended a<1>override there; the second commit removes it.Stacked on #2525 (needs its property-based handoff in
apple-dartandrtkit-helper). Retarget tointegration/auroraonce #2525 lands.Testing
J615, 27.2 stub, aura tip-dev Stage 1, one-shot Stage 2 = aura 1.0.0b13.1 + the DTB from this tree + U-Boot from u-boot#67 (unmodified), kernel = lab tree + #2525 + this commit:
rtkit-helper 2fa400000.mtp: adopted the running RTKit session (4 retained buffers)now ready; nodockchannel-hiderrorsBefore (same machine, stock path):
RTKit: co-processor has crashed,Failed to wake up coprocessor, probe-62, no MTP input devices.Still to run
apple,power-method = <2>as well; not tested here (no J613).t8122-j615-25g83): it now hands the MTP over running too (inheritedapple,rtkit-keep-running, as the J613 25G83 does). Untested: this J615 runs only the 27.2 stub.Evidence and DT checks
t8122-j615,t8122-j615-25g83) andt8122-j613compile from this branch with cpp + dtc; after the second commit both J615 variants decompile withapple,power-method = <2>on the trackpad andapple,rtkit-keep-runningon the MTP; the 27.2t8122-j615DTB is byte-for-byte what the first commit produced.Assisted-by: LLM (Claude:Opus 5.5)