Skip to content

m1n1-aurora: forward the preboot UUID so the Secure Enclave gets its OS identity (Touch ID) - #1485

Closed
ludagoo wants to merge 1 commit into
omacom:masterfrom
ludagoo:m1n1-aurora/preboot-uuid
Closed

ludagoo wants to merge 1 commit into
omacom:masterfrom
ludagoo:m1n1-aurora/preboot-uuid

Conversation

@ludagoo

@ludagoo ludagoo commented Oct 22, 2026

Copy link
Copy Markdown

Summary

Backport aurora-silicon/m1n1 c6498e6e1a ("kboot: forward apfs-preboot-uuid from ADT to FDT /chosen", 33 lines in dt_set_chosen()) onto the pinned v1.6.1, as a second patch next to aurora-cio-aliases.patch. pkgrel 3 → 4; the pin, the alias patch and the logos are unchanged.

iBoot leaves the booted APFS volume group's UUID in the ADT as /chosen/apfs-preboot-uuid. linux-aurora's Secure Enclave driver reads it from the FDT (dt::preboot_uuid()) and answers the enclave's GET_OS_UUID with it; that UUID selects the install's anti-replay lane in the shared xART store. Without it the driver logs xART: /chosen/apfs-preboot-uuid is unavailable and answers "unavailable". The kernel team's release m1n1 (1.6.1.aurora13) carries the same commit, and their M2 Touch ID reports (omacom/linux-aurora#142, #145) show xART: using /chosen/apfs-preboot-uuid.

Why it matters

On a MacBook Air M1 (J313) with Omarchy's m1n1-aurora 1.6.1.aurora1-3, Touch ID enrolment through omarchy setup security fingerprint (omarchy-mac-pkgs#12 package, kernel with omacom/linux-aurora#180) captured the finger and then failed at the last step: SAVE_CATACOMB refused with status 0x6, "the fingerprint was enrolled but could not be recorded (driver status 6)". With the same stack and the identity supplied explicitly (apple_sep.os_uuid_hi/lo = that install's volume group, which is what this patch forwards), enrol, verify, sudo, hyprlock and s2idle all pass. omarchy-mac-pkgs#12 lists "m1n1 forwarding /chosen/apfs-preboot-uuid" as one of its blockers; this is that item.

Test

Built with this recipe (makepkg, clang 23 / lld, rustup 1.89.0) on a MacBook Air M1 (J313, OS firmware 13.5), installed over 1.6.1.aurora1-3; the asahi-scripts hook rebuilt boot.bin. Cold boot with the stage-2 version still v1.6.1-omarchy.aurora1:

  • /proc/device-tree/chosen/apfs-preboot-uuid = DE9C00BD-1A01-4E5C-A130-3208330EBF2F, which is the Omarchy stub's APFS volume group on this Mac (read from the volume superblocks of nvme0n1p3), so the forwarded identity is the install's own lane.
  • apple_sep: xART: using /chosen/apfs-preboot-uuid, then xarm: op 0x13 … reply_status 0x00 (GET_OS_UUID answered) with no os_uuid_hi/lo module parameters.
  • Touch ID: restored 1 enrolled identity/identities; enrolment survived reboot: the finger enrolled on the previous boot under the explicit, identical UUID restored, and sudo by fingerprint passed on this boot.
  • Internal display, keyboard, trackpad, Wi-Fi and the microphones unaffected (nothing else in kboot.c changed).

Not tested: other Macs, external displays, the M3 handoff paths (unchanged code). The README's qualification (M1 Pro and M2 Max cold boot, two external displays) is the maintainers'; a build here is not that acceptance.

🤖 Generated with Claude Code

…OS identity

Backport aurora-silicon/m1n1 c6498e6e1a ("kboot: forward apfs-preboot-uuid
from ADT to FDT /chosen") onto the pinned v1.6.1 as a second patch, and bump
pkgrel. linux-aurora's SEP driver answers the enclave's GET_OS_UUID from
/chosen/apfs-preboot-uuid; without it Touch ID enrolment completes but the
final SAVE_CATACOMB is refused (status 0x6). Tested on a MacBook Air M1
(J313): the FDT carries the install's volume group UUID, the driver logs
"xART: using /chosen/apfs-preboot-uuid", and an enrolment restores after
reboot with sudo by fingerprint working.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
@greptile-apps

greptile-apps Bot commented Oct 22, 2026 •

Copy link
Copy Markdown

RetriggerView in GreptileConfidence Score: 5/5

[Medium impact] The PR appears safe to merge; no actionable defects were established.

Summary

Backports the preboot UUID forwarding change into the pinned m1n1-aurora package so linux-aurora can use the install's OS identity for Touch ID.

  • m1n1 passes the booted APFS UUID to Linux.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart LR
  A["iBoot: ADT /chosen"] --> B["m1n1: read UUID"]
  B --> C["FDT /chosen/apfs-preboot-uuid"]
  C --> D["linux-aurora: GET_OS_UUID"]
  D --> E["Secure Enclave: install identity"]
Loading

Reviews (1) · Last reviewed commit: "m1n1-aurora: forward the preboot UUID so..." · Reviewed by Greptile

@maralcbr

Copy link
Copy Markdown
Member

Closing as superseded, thanks @ludagoo. Master's m1n1-aurora now builds omacom/m1n1 at 76194672cd873db0c32f98037d3b160874ea3863 (1.6.1.aurora20) with no local patches. That source already forwards /chosen/apfs-preboot-uuid into the FDT: see src/kboot.c:420-452. The added lines match this PR's aurora-preboot-uuid.patch, boot-uuid fallback included, so the conflict resolves to an empty diff.

omacom/omarchy-mac-pkgs#12's m1n1 prerequisite is met by master's package.

@maralcbr maralcbr closed this Oct 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants