Repository navigation
Merge train: J713 Touch ID (#457) rebased onto integration/aurora - #988
Merged
Merged
Conversation
The M4's SPI controllers are the T8103 design, as on T8140. Signed-off-by: Erik Bourget <erik@ebourget.net>
The Secure Enclave and its DART, as the ADT describes them: SEP at 0x3aa600000 with its ASC mailbox at +0x8000 (AIC 389-392), DART at 0x3a8c80000 (AIC 399) with the BIT(40) input alias the DART translates. The DART's register window is 0x20000: its stale-exception drain reads per-stream registers past 0x4000. SPI2 at 0x3ad108000 (AIC 1056) carries the Mesa fingerprint sensor. As on T8140 it runs from the 24 MHz reference clock; with a 200 MHz rate the divider for the sensor's 8 MHz gave about 1 MHz and frame reads timed out. The sensor node takes SPI mode 2, as the 0x3356 sensor does on J700. All disabled. The SEP driver enables the SEP and its DART itself; a board with a qualified sensor enables the mailbox and SPI2. Signed-off-by: Erik Bourget <erik@ebourget.net>
The J713 SoC side is J613's: a warm-attach enclave shared with macOS, the variant-5 key store and the BIT(40) DART alias. Its Mesa sensor is J700's generation (0x3356, "V3" in the ADT), not J613's (0x3352): the enclave refuses the R3 session (SESSION_SHARE status 0x16), and its factory calibration is an FSC2 image. So it takes J700's SPI mode 2 and nonce session. Its device tree names its own signed root key. Profile selection becomes a pure function of the root compatible list, so the tests can check that only J713 selects T8132 and that the other boards keep their profiles. J713 on 26.6.2 (25G83) provisions its keybag, enrols, matches, and restores the enrolment after a reboot, with xart_guard 1 and no record refused. Signed-off-by: Erik Bourget <erik@ebourget.net>
Enable the SEP mailbox and the Mesa sensor, which sits on spi2 with power on NUB GPIO 28 and data-ready on AP GPIO 199 (J713 ADT /arm-io/spi2/mesa). The SEP driver enables the SEP and its DART itself. The sensor node names this Mac's calibration and its signed root key. Signed-off-by: Erik Bourget <erik@ebourget.net>
Resolve drivers/soc/apple/profile.rs: integration/aurora added the T6041 (J616c) profile and extended the T6040 selection to the J614s, while this branch added the T8132 (J713) profile and moved selection into a pure select(). Keep both profiles, select through has() in the order T6040 (J616s, J614s), T6041 (J616c), T8132 (J713), and cover the J614s and J616c branches in the selection test and T6041 in the DART window test. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Contributor
Author
|
Merge train (MTL, 06/11). Gates passed on test tree 0412501d (integration/aurora 2661d71 + this batch):
|
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.
Carries erikwb's #457 (J713 Touch ID: SEP profile for the V3 sensor, the T8132 SEP/mailbox/DART/SPI2 nodes and the J713 board enable) unchanged, plus one merge commit that resolves its conflict with integration/aurora. Merging this also merges #457, with erikwb's commits and authorship intact.
The only conflict was
drivers/soc/apple/profile.rs: integration/aurora gained the T6041 (J616c) profile and the J614s in the T6040 selection, while #457 added the T8132 profile and moved selection into a pureselect(). The merge keeps both profiles and selects throughhas()in the order T6040 (J616s, J614s), T6041 (J616c), T8132 (J713). It also adds the J614s/J616c cases to the selection test and T6041 to the DART window test.J713 hardware evidence is erikwb's (enrol, match and restore after reboot on 26.6.2, per #457). We don't have a J713, so on our side this gets the usual gates plus regression boots on the M1 Pro, M2, J700 and J616s, checking that every existing board still picks its own profile.
🤖 Generated with Claude Code