Repository navigation
arm64: dts: apple: t8122-j615: hand the MTP over running, two-stage trackpad power - #2576
RyanTheTide wants to merge 1 commit into
Conversation
…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 already sets <2> itself (as on the J613 25G83) and now
also inherits the keep-running handoff, as the J613 25G83 does.
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>
|
J615 (15" M3 Air) planned s2idle series with this PR's head d5cc1f6, as part of the fleet77 kernel (integration b4cd7b3 + this PR, on the J615's default loader). PASS 3/3.
Assisted-by: LLM (Claude:Opus 5.5) |
|
Merge-train adversarial review (MERGETRAIN-LINUX2) at d5cc1f6: NO BLOCKERS. Code read only, nothing built here. Before the merge it still needs Dj's verdict at this head; the missing rows are listed below. Full review#2576 arm64: dts: apple: t8122-j615: hand the MTP over running, two-stage trackpad power @d5cc1f60VERDICT: NO BLOCKERS What I checked:
Nits:
Missing rows:
|
DjDeveloperr
left a comment
There was a problem hiding this comment.
Pre-PR checklist review at live head d5cc1f60ea32eb6cd2e5c25ff0b0b38a43144f30: 0 code, policy (§1–§4, §6), attribution, naming, or CI blockers (dt-checks and host-tests green; linux#2525 and u-boot#67 both merged).
Verified against surrounding kernel source:
&mtp { apple,rtkit-keep-running; };matchest8122-j613.dts:437-438;drivers/soc/apple/rtkit-helper.cadopts only when U-Boot provides a validapple,rtkit-handoffwith the ASC running, falling back cleanly otherwise.&mtp_mt { apple,power-method = <2>; };satisfiesdrivers/hid/dockchannel-hid/dockchannel-hid.c:297-301becauset8122-j613-j615.dtsi:90providesapple,afe-reset-gpios = <&smc_gpio 8 GPIO_ACTIVE_LOW>.t8122-j615-25g83.dtsincludest8122-j615.dtsand inherits cleanly with no conflict.
Holding only for §5 hardware evidence at d5cc1f60
- Real trackpad input events on J615 (touches/clicks/pointer movement confirmed by a person, both at boot and after s2idle — so far only interface ready and input device registration have been verified).
- Explicit full §5 regression line on live head
d5cc1f60:0 SELinux AVC denials, 0 failed units, 0 new kernel errors(the 11-21 s2idle 3/3 PASS comment reported0 failed unitsand0 MTP/dockchannel errors, without AVC count or full kernel error count).
Non-blocking nit
arch/arm64/boot/dts/apple/t8122-j615.dts:149commentsThe 27.x trackpad firmware answers only the two-stage power command, whereast8122-j615-25g83.dts:15framesapple,power-method = <2>asGPIO-mediated AFE power sequencing, as on the J613 (J615 ADT gP08). Worth clarifying whether this is a board/ADT property (which would also apply to plaint8122-j613.dtsin a follow-up PR) rather than a firmware-version rule.
Ready to approve once the §5 trackpad-event and regression rows at d5cc1f60 are posted.
Assisted-by: LLM (Gemini 4 Neon)
|
Regression counts at d5cc1f6 on the J615 (15-inch M3 Air), for the open "0 AVC / 0 failed / 0 new kernel errors" item. The kernel is 7.3.0-aurora-fleet81, the J615's default since 11-23. It is integration/aurora eb6d9ec plus open heads, including this PR at d5cc1f6. It booted on the default command line with the J615's configured Stage 2. The comparison is the J615's previous default, 7.3.0-aurora-g15g272a, booted the same day.
On the fleet81 boot the MTP is adopted running: Still to run: trackpad touches by a person, at boot and after s2idle. This row has no person at the Mac. Assisted-by: LLM (Claude:Opus 5.5) |
Supersedes #2550 (same change, one signed-off commit on
integration/auroraafter #2525 merged, so dt-checks and host-tests run; that branch also carried #2525's pre-sign-off commits). Includes the 25G83 fix from #2550's review: that profile's trackpad stays on power method 2.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 not touched: it keeps its ownapple,power-method = <2>(as on the J613 25G83) and inherits the keep-running handoff, as the J613 25G83 does.Needs #2525 (merged: the property-based handoff in
apple-dartandrtkit-helper) and aurora-silicon/u-boot#67 (the boot stage that reads the property).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; both J615 variants decompile withapple,power-method = <2>on the trackpad andapple,rtkit-keep-runningon the MTP.Assisted-by: LLM (Claude:Opus 5.5)