diff --git a/device/akita/BRINGUP-M2.md b/device/akita/BRINGUP-M2.md index 555d430f7..4063d509e 100644 --- a/device/akita/BRINGUP-M2.md +++ b/device/akita/BRINGUP-M2.md @@ -1,7 +1,7 @@ # akita M2: storage (UFS behind the guard, then the Arch root) -**Status (2026-11-07):** M2.1-M2.6 are done; M2.7 waits for the signed package. M1 is complete and merged ([BRINGUP-M1](BRINGUP-M1.md)): +**Status (2026-11-08):** M2.1-M2.6 are done and merged (#456); M2.7 waits for the signed package. M1 is complete and merged ([BRINGUP-M1](BRINGUP-M1.md)): - derekross/linux-omarchy-mobile#192 was rebase-merged on 2026-11-05, so its three commits are on `omamobile` under new ids, with the same patches: `cb2cd5e4b` (binding), `c7eb44543` (first light) and `0e2739a92` (framebuffer). - #414 was squash-merged as `905aa91`. @@ -64,7 +64,7 @@ As in [BRINGUP-M1](BRINGUP-M1.md): `R/` is the private stock capture, `L/` our k 2. **The first UFS boot is read-only and stays in the initramfs.** A bring-up overlay, `device/akita/overlays/ufs-probe.dtso`, sets the board's `bootargs` plus `omamobile.ufs-probe omamobile.initramfs`. That gives the probe listing and no hand-over to Arch, so nothing runs on `userdata`. `DTB_OVERLAYS="ufs-probe"` goes in `device.conf` for that build only, and comes out again afterwards. 3. **Nothing writes before the guard.** UFS is built in, so the disks appear before PID 1. In M2.3 they attached at 0.26 s, and `/init` started at 0.28 s. The init's first job is the guard, which flagged every partition by 0.61 s and removed `/dev/sda`. In between, the kernel only reads the partition tables, and nothing is mounted. `UFS_RW` is unchanged since stage 0. 4. **The fresh backup comes from our kernel.** - - `NV_PARTS="efs efs_backup modem_userdata persist modem_a modem_b"` and `NV_BACKUP_EXTRA="devinfo"` go in the descriptor, cheetah's values. Then `tools/nv-backup -d akita` copies the radio and calibration partitions read-only over SSH, and its `--check` can later show that nothing on Linux changed them. + - `NV_PARTS="efs efs_backup modem_userdata persist modem_a modem_b"` (cheetah's) and `NV_BACKUP_EXTRA="devinfo trusty_persist trusty_userdata"` (husky's since #449) go in the descriptor. M2.4 ran with `devinfo` alone; Trusty's two partitions joined after #456's review. Then `tools/nv-backup -d akita` copies the radio and calibration partitions read-only over SSH. Its `--check` can later show that nothing on Linux changed them, and report when Android has written the extras. - The rest of the stage-0 set is copied the same way, with each partition hashed on the phone and on the laptop. 5. **The device package comes first, in its own PR.** `omamobile-device-akita` starts with husky's generic first set: - the storage rule; @@ -189,7 +189,9 @@ The install needs the human's go, since it erases `userdata` again. - the guard's flags hold; - `reboot-to bootloader` works; - `tools/phone-smoke`'s report goes to the pull request, naming what doesn't apply yet (no GPU or touch driver). -- **Watch for:** the clock. With no RTC driver and no network time, the clock starts early, and gpg can skip a new release key as "created in the future" (husky's U4 finding). Set it from the laptop over ssh before `pacman-key --populate`. +- **Watch for:** + - **The clock.** With no RTC driver and no network time, the clock starts early, and gpg can skip a new release key as "created in the future" (husky's U4 finding). Set it from the laptop over ssh before `pacman-key --populate`. + - **Suspend.** Don't use it in M2.7. The package's drop-in makes Suspend mean s2idle, and that has never run on Tensor G3. It waits for the Pixel 8 Pro's U6, so the session test doesn't turn into a suspend test. - **Risk:** low for the hardware. The trap is the fallback to stock after three boots (above). ## Risks @@ -272,7 +274,7 @@ The UFS change went out as linux-omarchy-mobile#206, signed off by the owner, an ### 2026-11-06: Arch on `userdata`, test image (M2.6, gate d) -- **Kernel:** `7.3.0-rc6-omamobile-push1-g31d8b229d0d0`: #206's head before it merged (`31d8b229d`), built clean with no overlay. Its DTS is blob `bfa8b6f54e0e`, as merged in `75b9c0b73`. +- **Kernel:** `7.3.0-rc6-omamobile-push1-g31d8b229d0d0`: linux-omarchy-mobile#206's head before it merged (`31d8b229d`), built clean with no overlay. Its DTS is blob `bfa8b6f54e0e`, as merged in `75b9c0b73`. - **The test root:** built by `device/akita/build-u3-root` from the Arch Linux ARM base (sha256 `42a4eeaa…`), `omamobile-device-akita` 0.1.0 and this kernel's modules. Its MANIFEST names repository commit `93de3d963c6d`. - **The install:** `tools/install-phone --device akita --rootfs … --bootloader-slots-match akita-17.0-15681527 --reinstall`, run by the owner after a dry run. @@ -283,6 +285,7 @@ The UFS change went out as linux-omarchy-mobile#206, signed off by the owner, an | 15 | The guard under Arch | 62 partitions, exactly `UFS_RW` writable; `sdb`-`sdd` `ro`; no `/dev/sda`. Only `sda34` is mounted (ext4, 107.9 G). The kernel log has no UFS or ext4 error | The guard's flags hold after `switch_root` | | 16 | `bin/omamobile fastboot` from Arch, 282 s into the first boot | `reboot-to bootloader` reached fastboot in 25 s. `getvar`: slot B `slot-successful:no` with 2 tries, slot A unchanged | The reboot mode works from Arch too. `reboot-to` syncs before it resets | | 17 | `fastboot --set-active=b` (B back to 3 tries), then `fastboot reboot` | SSH at 28 s, with systemd `running` 9 s into boot. `systemd-analyze`: 2.0 s kernel and initramfs plus 2.2 s userspace. As before: no failed units, 27 running, the guard's flags, `usb0`, the same four journal lines. ext4 mounted cleanly with no journal replay, and the root wasn't grown again | **Gate (d) passed:** a second boot comes up the same | +| 18 | `tools/phone-smoke` from the laptop, 42 h into that boot (2026-11-08; the report's own date is the phone's clock, July) | Required rows: boot, storage guard (62 partitions, only `UFS_RW` writable), root (ext4 on `userdata`), kernel health (no oops or BUG, 0 WARN), systemd units, USB gadget, all ok; session not ok. Evidence: the display ok (1080x2400 on simpledrm); GPU, lock and touch not ok; buttons, radios, battery, sound, sensors and cameras skip. Its "new dmesg errors" are the two `exynos-clkout` lines, which husky's log has too (H/), but which the tool's known list (the 7 Pro's) doesn't name | As expected for the test root: everything below the session works, and the session rows wait for M2.7's image | Findings: diff --git a/device/akita/NOTES.md b/device/akita/NOTES.md index 614fdbee4..80f355d1f 100644 --- a/device/akita/NOTES.md +++ b/device/akita/NOTES.md @@ -20,10 +20,10 @@ UFS with the storage guard (gate c) and Arch on `userdata` (gate d). The steps a - **The kernel's default sleep is `deep`** [V]: `/sys/power/mem_sleep` reads `s2idle [deep]` under Arch. Linux has no zuma SoC sleep sequence, so `omamobile-device-akita` makes Suspend use `s2idle`, as the Pixel 7 Pro's package does. - **`NV_PARTS` names the radio's partitions only** (the Pixel 7 Pro's list, all present on akita). Other per-phone partitions it doesn't name: - `mfg_data`: factory data, which the Pixel 7 Pro's fingerprint stack reads a copy of ([cheetah's FINGERPRINT-PLAN](../cheetah/FINGERPRINT-PLAN.md)); - - `trusty_persist`: Trusty's persistent storage ([tegu's FINGERPRINT-PLAN](../tegu/FINGERPRINT-PLAN.md)); + - `trusty_persist` and `trusty_userdata`: Trusty's persistent storage ([tegu's FINGERPRINT-PLAN](../tegu/FINGERPRINT-PLAN.md)); - `pinfo`, `fips` and `blenv`, whose contents haven't been read [I]. - None is on `UFS_RW`, so the guard keeps them read-only, and all are in M2.4's full backup. Since stage 0's clean backup, `mfg_data`, `pinfo`, `fips` and `blenv` are unchanged, and `trusty_persist` changed (stock ran) [V]. + None is on `UFS_RW`, so the guard keeps them read-only, and all are in M2.4's full backup. Since stage 0's clean backup, `mfg_data`, `pinfo`, `fips`, `blenv` and `trusty_userdata` are unchanged, and `trusty_persist` changed (stock ran) [V]. The two Trusty partitions are now in `NV_BACKUP_EXTRA`, as on the Pixel 8 Pro, so `tools/nv-backup --check` shows when Android has written Trusty's storage. - **A second retail 8a passed M2.3, M2.4 and M2.6** on the same branch, with the same link, partition map and guard results ([#456](https://github.com/derekross/omarchy-mobile/pull/456)). ## 2026-11-03: first light (M1.3) and the console (M1.4) @@ -126,7 +126,7 @@ The descriptor carries no comments; this table is its provenance. | `VENDOR_PAGESIZE` | 0x800 | [V] | F/ `vendor_boot` and `vendor_kernel_boot` headers | | `OS_VERSION`, `OS_PATCH_LEVEL` | 17.0.0, 2026-10 | [V] | F/ `init_boot` header; the build on both slots (R/) | | `BOOT_IMAGES`, `UFS_RW` | the five boot images; their `_b` names and `userdata` | [V] | R/ `/dev/block/by-name`; F/ | -| `NV_PARTS`, `NV_BACKUP_EXTRA` | `efs efs_backup modem_userdata persist modem_a modem_b`; `devinfo` | [V] | R/ `/dev/block/by-name` has all seven, none on `UFS_RW`. They are cheetah's values: the partitions of AGENTS.md §1's checksum check, plus `devinfo`, whose slot flags change with every flash. They let `tools/nv-backup` back them up read-only from our own kernel ([BRINGUP-M2](BRINGUP-M2.md), M2.4) | +| `NV_PARTS`, `NV_BACKUP_EXTRA` | `efs efs_backup modem_userdata persist modem_a modem_b`; `devinfo trusty_persist trusty_userdata` | [V] | R/ `/dev/block/by-name` has all nine, none on `UFS_RW`. `NV_PARTS` is cheetah's: the partitions of AGENTS.md §1's checksum check. `NV_BACKUP_EXTRA` is husky's (#449): `devinfo`, whose slot flags change with every flash, and Trusty's two partitions, which Android writes (`trusty_persist` changed while stock ran, M2.4). Together they let `tools/nv-backup` back them up read-only from our own kernel ([BRINGUP-M2](BRINGUP-M2.md), M2.4), and `--check` report the extras' changes | | `INITRAMFS_INIT` | the shared init | [V] | as husky | | `PANEL_SIZE` | 1080x2400 | [V] | R/ `dumpsys display`; G/ `zuma-akita-display.dtsi` | | `SIMPLEFB_TRIG_CON` | `0x19470030 0x3061` | [V] | DECON0 `TRIG_CON` read 0x3070 at handover on a booted 8a (2026-11-03, above); 0x3061 unmasks the trigger as on husky (H/), and with it the console reaches the panel (M1.4, above) | diff --git a/device/akita/device.conf b/device/akita/device.conf index 66aa7c5db..d672f94f9 100644 --- a/device/akita/device.conf +++ b/device/akita/device.conf @@ -20,7 +20,7 @@ OS_PATCH_LEVEL=2026-10 BOOT_IMAGES="boot init_boot vendor_boot vendor_kernel_boot dtbo" UFS_RW="boot_b init_boot_b vendor_boot_b vendor_kernel_boot_b dtbo_b userdata" NV_PARTS="efs efs_backup modem_userdata persist modem_a modem_b" -NV_BACKUP_EXTRA="devinfo" +NV_BACKUP_EXTRA="devinfo trusty_persist trusty_userdata" INITRAMFS_INIT=/initramfs/init SIMPLEFB_TRIG_CON="0x19470030 0x3061" PANEL_SIZE=1080x2400 diff --git a/device/akita/overlays/ufs-probe.dtso b/device/akita/overlays/ufs-probe.dtso index ef6a9614a..2b34d9817 100644 --- a/device/akita/overlays/ufs-probe.dtso +++ b/device/akita/overlays/ufs-probe.dtso @@ -9,8 +9,9 @@ * * An overlay replaces bootargs whole, so these are a copy: zuma-akita.dts's * bootargs as of linux-omarchy-mobile#206 (omamobile 75b9c0b73), unchanged - * since the first-light board file (#192). If the board file's change, - * copy them again before reusing this, or the overlay silently reverts them. + * since the first-light board file (#192). If the board file's bootargs + * change, copy them again before reusing this, or the overlay silently + * reverts them. */ /dts-v1/; /plugin/; diff --git a/packages/omamobile-device-akita/device.conf b/packages/omamobile-device-akita/device.conf index 66aa7c5db..d672f94f9 100644 --- a/packages/omamobile-device-akita/device.conf +++ b/packages/omamobile-device-akita/device.conf @@ -20,7 +20,7 @@ OS_PATCH_LEVEL=2026-10 BOOT_IMAGES="boot init_boot vendor_boot vendor_kernel_boot dtbo" UFS_RW="boot_b init_boot_b vendor_boot_b vendor_kernel_boot_b dtbo_b userdata" NV_PARTS="efs efs_backup modem_userdata persist modem_a modem_b" -NV_BACKUP_EXTRA="devinfo" +NV_BACKUP_EXTRA="devinfo trusty_persist trusty_userdata" INITRAMFS_INIT=/initramfs/init SIMPLEFB_TRIG_CON="0x19470030 0x3061" PANEL_SIZE=1080x2400 diff --git a/packages/omamobile-device-akita/version b/packages/omamobile-device-akita/version index 6e8bf73aa..17e51c385 100644 --- a/packages/omamobile-device-akita/version +++ b/packages/omamobile-device-akita/version @@ -1 +1 @@ -0.1.0 +0.1.1