Repository navigation
J514s: SEP and Touch ID (T6030) - #2633
RyanTheTide wants to merge 4 commits into
Conversation
…ouch ID sensor The SEP, its DART and mailbox, and spi2 are already described (disabled) in t6030-coprocessors.dtsi and t6030-peripheral-buses.dtsi. Touch ID needs two things more, as the J514s ADT (system firmware 27.0) records them: - The SEP DART only accepts IOVAs in the window iBoot programmed: vm-base 0x10000004000, vm-size 0xffff0000, the same BIT(40) aperture as on T8122. Describe it with apple,dma-range and apple,dma-offset. - The Mesa sensor sits on spi2, chip select 0, at 8 MHz with CPHA. Add it as spi2's child. Everything stays disabled: apple_sep enables the SEP and its DART when it loads, and boards enable the mailbox, the bus and the sensor. Assisted-by: LLM Signed-off-by: Adam Harris <amh421@icloud.com> Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Enable the SEP mailbox, spi2 and the Mesa sensor (0x3352) on the 14" M3 Pro. Per the J514s ADT, the sensor is powered from NUB GPIO 33, active high. As on J613, its data-ready line (AP GPIO 200) is left out and the driver polls. The calibration comes from this Mac's own iBoot system container as apple/mesacal-j514s.bin. J516s shares the SoC, but its sensor wiring is unchecked, so it stays off. Assisted-by: LLM Signed-off-by: Adam Harris <amh421@icloud.com> Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
The J514s SEP is pre-booted by iBoot and speaks the variant-5 key store, and its sensor is the same 0x3352 part T8122 carries, in SPI mode 1. So J514s takes the T8122 profile with its own spi2 base, including the wide DMA mask and xART guard level 1 from the first boot. Only J514s is matched; the other T6030 Mac (J516s) has not had its ADT read. Add a test that checks the J514s device tree against the ADT values and that J516s leaves the SEP and the sensor off. Tested on J514s, system firmware 27.0, with macOS on the same disk: - the SEP attaches warm and advertises 12 endpoints - the keybag is provisioned; the guard protects all 10 existing macOS session records and has refused nothing - the sensor answers 18 ms after power-on and registers its serial - enrolment and a match work, and a match still works after a reboot and after suspend - macOS Touch ID still works afterwards Assisted-by: LLM Signed-off-by: Adam Harris <amh421@icloud.com> Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
The T6030 profile was picked only when the root compatible also named the J514s, so the 16-inch M3 Pro (J516s) and any other T6030 Mac had no profile at all. The SEP, its DART and spi2 are SoC blocks at the same addresses on every T6030 Mac, so the SoC compatible selects the profile. Whether a board actually has the sensor wired is described by its device tree: only the J514s enables sep_mbox, spi2 and the mesa node today, so nothing binds on the J516s until its board file enables them. Signed-off-by: Ryan <ryan@aurorasilicon.org>
|
Blockers: 1.
The first three commits carry HW row: J514s on this head (fleet kernel, default cmdline): SEP attaches, Assisted-by: LLM (Claude:Opus 5.5) |
|
On the two points:
Assisted-by: LLM (Claude:Opus 5.5) |
|
Merge-train adversarial review (MERGETRAIN-LINUX2) at 610b968: BLOCKERS. Not merging until the blockers below are fixed or answered; the details give file:line and a failure case. Full review#2633 J514s: SEP and Touch ID (T6030) @610b9683VERDICT: BLOCKERS Blockers
Nits
Missing rows
|
|
Clarification to my merge-train review above: the commit-trailer point is a nit, not a blocker (already-pushed history stays as it is, no force push). The other blockers listed there still stand. |
DjDeveloperr
left a comment
There was a problem hiding this comment.
Pre-PR checklist review (§1–§6) at 610b9683bbeb: REQUEST_CHANGES (2 blockers + missing §5 hardware rows).
Blockers
-
Code / safety blocker — J516s probes SEP DART and binds
apple,sepat this head (§1/§3):drivers/soc/apple/profile.rs:728(commit610b9683) now returns&T6030(Bootstrap::WarmRegister) for everyapple,t6030root compatible, includingarch/arm64/boot/dts/apple/t6030-j516s.dts(which leavessep_mbox,spi2, andmesadisabled).- At
610b9683,drivers/soc/apple/sep.rs:3647-3651callsdt::enable_sep_and_dart(p.dart_window)for everyWarmRegisterprofile, anddrivers/soc/apple/dt.rs:188-260has nosep_mboxavailability check (#2631 is still open and is neither in base024cec8c9347nor in this PR's history). - Failure mode: Loading
apple_sepon a J516s applies the OF changeset to setstatus = "okay"onsep_dart(probing Linux's DART driver over the DART iBoot left live for the pre-booted SEP, with an aperture taken only from the J514s ADT) and setsstatus = "okay"onsep, creating the platform device with a disabled mailbox. Commit610b9683's message ("nothing binds on the J516s until its board file enables them") is inaccurate at this head, andtools/aurora-sep/tests/test_t6030_sep.py:113-118only inspects the static DTB. - Fix: Land #2631 first and rebase this PR onto it (or carry the mailbox check here), and add a test covering the disabled-mailbox init path.
-
§4 Attribution — AI trailers in commit messages:
- Commits
b710d8c7f27a,b9e39ab31d07, and0571993ee239carryAssisted-by: LLMtrailers in the commit messages. Perpre-pr-checklist.md§4, commits must carry human identity and humanSigned-off-by:only (noAssisted-by:or AI trailers in commits; disclosure belongs at the end of the PR body, where it already appears). - Since these commits were already rebased onto this branch with an added
Signed-off-by:, please drop theAssisted-by: LLMcommit trailers (with Adam's consent or via Adam) while preserving Adam's authorship andSigned-off-by:.
- Commits
Missing §5 Evidence (at the live head)
- J514s on the rebased head (default cmdline, noting which DTB booted): SEP warm attach,
fprintd-verifyafter reboot and after s2idle, 0 SELinux denials (AVC), 0 failed units, 0 new kernel errors. (Prior Adam Harris / c4software rows predate the rebase and610b9683.) - J516s after rebasing onto #2631: boot confirming
apple_sepleavessep_dartandsepdisabled (no"SEP DART changeset applied"line) and 0 new DART errors.
Nits
- Commit
610b9683usesSigned-off-by: Ryan <ryan@aurorasilicon.org>whereas the other commits useRyan Murray <ryan@aurorasilicon.org>. drivers/soc/apple/profile.rs:433-443doc comment onT6030states the hardware verification results; worth clarifying they are J514s results rather than T6030-wide.
CI: 8/8 checks green (dt-checks, host-tests, source, rust-build, kunit, 3x DWC3/ATC).
Assisted-by: LLM (Gemini 4 Neon)
Replaces #1691, rebased onto current integration/aurora (conflicts in drivers/soc/apple/profile.rs: the Touch ID Mac list in every_touch_id_mac_gets_a_sensor_the_shared_path_decodes grew on the base, so its length is now 19 with J514s added; all base entries kept).
Touch ID on the 14" M3 Pro MacBook Pro (J514s, T6030), rebased onto integration/aurora at 78ea426.
This is Adam Harris's series from #581, taken from the latest revision on his branch (
adammharris/linux-aurora:feat/t6030-j514s-touchid@ fd840c9). Authorship and his sign-offs are unchanged. The code is his; the rebase applied without conflicts.Changes
t6030-coprocessors.dtsi,t6030-peripheral-buses.dtsi: integration already describes the SEP, its DART and mailbox, and spi2 (all disabled). This adds the SEP DART's DMA window from the J514s ADT (vm-base0x10000004000,vm-size0xffff0000, the same BIT(40) aperture as T8122) and the Mesa sensor as spi2's child (CS 0, 8 MHz, CPHA). Everything stays disabled.t6030-j514s.dts: enables the mailbox, spi2 and the sensor. Power is NUB GPIO 33, active high; the data-ready line (AP GPIO 200) is left out and the driver polls, as on J613. Calibration isapple/mesacal-j514s.binfrom the Mac's own iBoot system container.soc: apple: sep: aT6030profile, which isT8122with J514s's spi2 base (sensor 0x3352, SPI mode 1, variant-5 key store, xART guard level 1, wide DMA mask). 610b968 selects it by theapple,t6030SoC compatible, and the board DT decides whether the SEP attaches. The J514s enablessep_mbox. The J516s keeps it disabled (its sensor wiring is unchecked), so with the mailbox check from soc: apple: sep: select the platform profile by SoC #2631 its SEP and SEP DART stay disabled.tools/aurora-sep/tests/test_t6030_sep.py: checks the J514s tree against the ADT values, that J516s leaves the SEP and sensor off, and the profile match.Testing
On this branch (no hardware):
test_t6030_sep.py4/4 andtest_t8122_sep.py4/4; KUnitapple_sep*on arm64 QEMU (drivers/soc/apple/sep.kunitconfig) 306/306 passed;drivers/soc/apple/builds withW=1, no warnings inprofile.rsorxart_guard.rs;t6030-j514s.dtbandt6030-j516s.dtbwithCHECK_DTBS=y W=1(dtschema 2026.9): 129 warning lines on base and head, 0 new;run-host-tests.py --only t6030-pmp-dt1/1,--only sep-suspend-errors22/22.test_t6030_sep.py4/4 andtest_t8122_sep.py4/4 pass with the kernel'sdtc.t6030-j514s.dtbandt6030-j516s.dtbbuild withW=1and add no warnings over integration (34 before, 34 after, identical).drivers/soc/apple/builds withW=1on the Fedora-base +asahi.configrelease config (CONFIG_APPLE_SEP=m); no warnings inprofile.rsorxart_guard.rs.Hardware results on the same code before the rebase:
fprintdenrol and match, a match after reboot and after suspend, and macOS Touch ID still working afterwards.@adammharris, could you boot this branch on your J514s and confirm the SEP attaches and a match works (after a reboot and, if you can, a suspend)? A short result row here is enough. @c4software, a row from your J514s would be welcome too.
Thanks to Adam Harris for the bring-up, to c4software for the second-machine test, and to malik-na for the review on the earlier PR.
The T6030 profile is selected by the SoC compatible; each board device tree decides whether the SEP and the sensor are enabled.
Assisted-by: LLM (Claude:Opus 5.5)