From 707de646393db2c0ce8b56c809301134fd126c56 Mon Sep 17 00:00:00 2001 From: DarekM <149845949+aninmucek@users.noreply.github.com> Date: Tue, 3 Nov 2026 20:39:05 +0000 Subject: [PATCH 1/2] device/akita: first light and the boot console (M1) The Pixel 8a boots our kernel from slot B, with USB networking, SSH and the framebuffer console. - BRINGUP-M1.md: the M1 runbook and its results (tests 1-5). - kernel.config: the lockup detectors the board file's bootargs need, as in husky's. - device.conf: SIMPLEFB_TRIG_CON="0x19470030 0x3061", after TRIG_CON read 0x3070 (masked) at handover on a booted 8a. - NOTES.md: the booted tree, the kernel command line (this bootloader keeps VENDOR_CMDLINE), the three display registers and the panel's command mode. - DEVICES.md: the 8a's clause in the zuma Wanted row. Co-Authored-By: Claude Opus 5.5 --- device/akita/BRINGUP-M1.md | 177 +++++++++++++++++++++++++++++++++++++ device/akita/NOTES.md | 39 +++++++- device/akita/device.conf | 1 + device/akita/kernel.config | 12 +++ docs/DEVICES.md | 2 +- 5 files changed, 226 insertions(+), 5 deletions(-) create mode 100644 device/akita/BRINGUP-M1.md create mode 100644 device/akita/kernel.config diff --git a/device/akita/BRINGUP-M1.md b/device/akita/BRINGUP-M1.md new file mode 100644 index 000000000..37fbdb194 --- /dev/null +++ b/device/akita/BRINGUP-M1.md @@ -0,0 +1,177 @@ + +# akita M1: first light on zuma + +**Status (2026-11-03):** stage 0 done ([NOTES.md](NOTES.md), #308). Kernel branch `omamobile-zuma-akita-dts` (the binding, then the first-light DTS; not yet pushed): `zuma-akita.dtb` builds with `W=1`, `dtbs_check` reports only the two eUSB2-PHY supply warnings husky's board has, `dt_binding_check` passes, `checkpatch --strict` finds no errors, and `tools/kernel-pr-check` passes. M1.1 and M1.2 are done: the images are built and checked, and the phone's slots are as stage 0 left them. **M1 is complete (2026-11-03).** M1.3 passed gate (a): our kernel boots from slot B, with the USB gadget and SSH up 0.38 s into boot, and the bootloader's framebuffer and DECON0's trigger read exactly as on husky. M1.4 passed gate (b): `simple-framebuffer` and the trigger write put Omarchy's splash, and then console text, on the panel ([Results](#results)). The framebuffer change is tested but not yet committed. + +## Goal + +1. Our kernel starts from slot B and is **visible**: a USB gadget on the laptop, then `ssh root@172.16.42.1` (CONTRIBUTING §5.4 stage 1). +2. Read the bootloader framebuffer's address and DECON0's trigger register on the running phone, then add `simple-framebuffer` (gate b), as husky did. +3. Slot A stays stock throughout. Only `*_b` boot images are written, and only by `bin/omamobile flash`. + +## What akita inherits from husky's M1 + +Husky's first light found and fixed what a zuma phone needs, and all of it is in today's tree, so akita's M1 starts where [husky's](../husky/BRINGUP-M1.md) ended: + +- AVB hash footers on `boot` and `init_boot` (husky tests 6-8): `AVB_FOOTERS` in the descriptor, written by `bin/omamobile images`. +- The eUSB2 PHY and USB DRD PHY drivers (tests 16-18), built in (`CONFIG_PHY_SNPS_EUSB2=y` in `kernel/configs/omamobile.config`), with their nodes in `zuma.dtsi`. +- The zuma watchdog driver (tests 18-19). Without it, ABL's cluster watchdogs reset the phone about 80 s into each boot. +- `syscon-reboot-mode` and `reboot=warm` (test 22): `reboot-to bootloader` reaches fastboot. +- The PHY exit fix (linux-omarchy-mobile#42, tests 23-29) and the PMU tables (#49, test 30). + +## Path abbreviations + +`R/` = `~/android/reference/akita-stock-cp3a.261005.005` (the clean stock capture) and `F/` = `~/android/reference/akita-factory-facts-cp3a.261005.005` (the factory image's facts), both private. `G/` and `S/` = Google's GPL akita and zuma device trees at `android-16.0.0_r0.10` ([NOTES.md](NOTES.md)). `L/` = our kernel tree, `~/omamobile-kernel/wt-zuma-akita-dts`. + +## Facts behind the DTS + +| Item | Value | Evidence | +| --- | --- | --- | +| Base DTB match | `/soc_compatible` children `B0_IPOP` and `B1_IPOP` (`product_id` 0x9865, `pkg_mode` 1); husky's are FOPLP | R/live.dts, F/ base DTB 3, S/`zuma-b0-ipop.dts` [V] | +| Memory | ABL adds the DRAM banks to the base DTB's first (`zuma.dtsi`'s `memory@80000000`): 4 × 2 GiB on akita | R/live.dts [V] | +| Reservations | `zuma.dtsi`'s 15 fixed regions contain every fixed DRAM region of akita's live tree, at husky's addresses, except the four ABL inserts itself (`pkvm_guest_firmware`, `sec_dram`, `sec_pt`, `debug_kinfo_reserved`); three more lie outside DRAM (`cp_aoc_rmem` and two xHCI buffers) | R/live.dts against L/`zuma.dtsi` [V] | +| USB | DWC3 0x11210000, USB DRD PHY 0x11100000 (the eUSB2 PHY at 0x11110000 inside it), at `zuma.dtsi`'s addresses | R/live.dts [V] | +| PMU, reboot | `system-controller@15460000`, `reboot-cmd-offset` 0x810 | R/live.dts [V] | +| Watchdogs | `watchdog_cl0@10060000`, `watchdog_cl1@10070000`, the two `google,zuma-wdt` nodes in `zuma.dtsi` | R/live.dts [V] | +| Console | `uart@10870000`; stock's `earlycon=exynos4210,0x10870000` | R/live.dts, F/ `vendor_boot` [V] | +| Type-C | the MAX77759 on `hsi2c_11` (TCPC 0x25, fuel gauge 0x36, PMIC 0x66, charger 0x69), as on husky | R/ buses [V] | +| Panel | 1080x2400, `google,ak3b`, on the DSIM at 0x19440000; DECON0 0x19470000, DPP0 0x19900000 | R/ kernel log, R/live.dts, G/ [V] | +| Framebuffer | **0xfac00000** (DPP0 `RDMA_BASEADDR_P0` on the booted phone), as on husky (test 20) and gs201; the booted tree names no splash carve-out | M1.3 [V] | +| Trigger | DECON0 `TRIG_CON` 0x19470030 reads **0x3070** at handover (masked), as on husky. The ak3b panel is DSI command mode: no mode in Google's driver sets `MIPI_DSI_MODE_VIDEO` | M1.3, G/'s repository `display/panel-google-ak3b.c` [V] | + +## Design + +- **Husky's first-light tree with akita's identity:** the model, the compatible, the IPOP `/soc_compatible` children, husky's `bootargs`, and USB (`usb_dwc3`, `usb_hsphy`, `usbdrd_phy`) switched on. No UFS, buttons, PMIC, touch, MAX77759 or EEPROM nodes: each comes later, one per boot, once it has run here. +- **No guessed framebuffer** (husky's rule): the first boot has none. The address and the trigger are read on the running phone first (M1.3), and `simple-framebuffer` with its carve-out comes in a separate commit (M1.4). +- **No register write from the initramfs:** the descriptor has no `SIMPLEFB_TRIG_CON` until M1.3's read (the review of #308). +- **Kernel options:** `kernel/configs/omamobile.config` plus [kernel.config](kernel.config), the lockup detectors the `bootargs` rely on, as husky's. + +## Risks + +- **A black screen with no USB tells us little:** zuma's ABL keeps no ramoops (husky test 11). The bootloader's splash stays frozen on the panel while our kernel runs, since there's no framebuffer driver yet, so the panel shows nothing new either way. The laptop's USB log is the evidence. +- **Slot B falls back by itself:** `bin/omamobile flash` makes B active with three tries. Each failed boot uses one, and then ABL boots stock slot A, which is untouched and marked successful. Don't mark slot B successful during M1. `userdata` holds stock's (empty) Android data, and M1 doesn't touch it. +- **Unplugging the cable loses USB until a reboot:** the MAX77759 opens its USB2 data switch on unplug, and nothing closes it while no Type-C driver owns the chip (AGENTS.md, USB). Keep the cable in during M1; if USB drops, reboot. +- **Buttons:** on husky, Power + Volume Up held 15-30 s resets the phone under our kernel, Power alone does nothing (test 23), and Volume Down + Power then reaches fastboot. Akita has the same PMIC family [I]. + +## Runbook + +Ask the human before every flash and reboot (AGENTS.md §1). + +### M1.1 Build (laptop only) + +`DEVICE=akita KERNEL_DIR=~/omamobile-kernel/wt-zuma-akita-dts KERNEL_OUT=~/omamobile-kernel/out-zuma-akita-dts bin/omamobile kernel`, then `modules`, `initramfs` and `images` the same way. + +- **Pass:** `zuma-akita.dtb` builds; `dtbs_check` reports only the two eUSB2-PHY supply warnings husky's board has; `images` builds all five, with AVB footers on `boot` and `init_boot`, and accepts the DTB's `/soc_compatible` against `SOC_COMPATIBLE`; the initramfs packs akita's `UFS_RW` and "Pixel 8a", and no register write. +- **Risk:** none. + +### M1.2 Before the flash (laptop, and a read-only look at the phone) + +1. The phone's two backups (`akita-backup-prewipe-20261101`, `akita-backup-clean-20261102`) have a second copy offline (CONTRIBUTING §3.3). +2. The laptop's side of the USB network, once: the `omamobile-phone` NetworkManager profile from [INSTALL](../../docs/INSTALL.md) §5 (172.16.42.2/24 on the `cdc_ncm` link). +3. The SSH key in an agent, since `tools/phone-ssh` can't ask for its passphrase: for example `systemctl --user enable --now ssh-agent.socket`, then `SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket ssh-add`. +4. `adb reboot bootloader`, then `~/android/akita/bin/akita-state`: `current-slot:b`, both slots `slot-successful:yes`, `unlocked:yes`, `version-bootloader:akita-17.0-15681527`. + +- **Stop if:** there's no offline copy, or slot A isn't `slot-successful:yes`. +- **Risk:** none (one reboot to fastboot). + +### M1.3 First boot, slot B (gate a: USB) + +`DEVICE=akita bin/omamobile flash` with the M1.1 images: the five `*_b` images, `--set-active=b`, reboot. Slot B's Magisk-patched `init_boot_b` is replaced, as planned; slot A isn't written. + +- **Expect:** the orange-state warning, the Google logo frozen on the panel, then a USB gadget on the laptop (`lsusb`, and a new `cdc_ncm` interface) within about 30 s. +- **Pass:** `ping 172.16.42.1`, then `ssh root@172.16.42.1`. Save `dmesg` to a private file under `~/android/reference/`. Then, with the logo still on the panel and from the ssh shell, **once each, read only, one register per call**: DPP0 `RDMA_BASEADDR_P0` (`/usr/local/bin/devmem 0x19900040`), DECON0 `GLOBAL_CON` (`/usr/local/bin/devmem 0x19470020`) and `TRIG_CON` (`/usr/local/bin/devmem 0x19470030`). `devmem` takes no width: a second argument is a value to **write**, so a read never has one. Record the three values here and in [NOTES.md](NOTES.md). +- **Stop if:** nothing is on USB after 2 minutes. Let slot B's three tries run out until ABL boots stock slot A, or reset with the buttons (Power + Volume Up for 15-30 s on husky). Don't send more commands to a phone that has stopped answering. Skip the reads if the logo is gone before them (the display block may be off), and stop if a read hangs or panics. +- **Rollback:** `fastboot --set-active=a`; slot A is untouched. +- **Risk:** medium (unknown hangs), with writes only to `*_b`; low for the reads (a powered, clocked block, read once). + +### M1.4 A console on the panel (gate b) + +With M1.3's address: a kernel commit that adds `simple-framebuffer` (1080x2400 `a8r8g8b8`) and its `no-map` carve-out at that address, as `zuma-husky.dts` has them; and `SIMPLEFB_TRIG_CON="0x19470030 "` in the descriptor if `TRIG_CON` shows the trigger masked (husky reads 0x3070 and writes 0x3061). Rebuild (M1.1), then `bin/omamobile flash` again. + +- **Expect / Pass:** the init's lines (`first light`, `USB gadget up`, `ssh`, `ready`) on the panel. With `splash` on the kernel command line, as on akita, you see Omarchy's splash instead, and the lines go only to the kernel log. +- **Stop if:** the panel stays frozen on the logo with USB up (the trigger), or USB doesn't come back (then as M1.3's stop). +- **Rollback:** the change is in slot B's images only; `fastboot --set-active=a` returns to stock. +- **Risk:** low (one register write, as on husky and cheetah, undone by any reset). + +## Results + +### 2026-11-03: images built, not flashed (M1.1) + +- Kernel `7.3.0-rc6-omamobile-push1-gce160abd9ffc`, from `omamobile-zuma-akita-dts` at its DTS commit (no `-dirty`), built by `bin/omamobile kernel` in the container: `kernel/configs/omamobile.config` plus [kernel.config](kernel.config). `SOFTLOCKUP_DETECTOR`, `HARDLOCKUP_DETECTOR` (the buddy detector), `PHY_SNPS_EUSB2` and `USB_DWC3` are built in, and there are 1815 modules [V]. The only compiler warnings are two `-Wformat` ones in the base branch's AoC sound driver (`aoc_alsa_compr.c`), outside akita's commits. +- `tools/kernel-pr-check` on the two commits: 8 ok, 0 not ok. The 10 Google device trees build with `W=1` and `dtbs_check` with no new warnings, and `dt_binding_check` passes [V]. +- The DTB in `vendor_kernel_boot` (one copy, 24.5 KiB) is the build's `zuma-akita.dtb` [V]: + - model "Google Pixel 8a", compatible `google,zuma-akita`, `google,zuma`; + - `/soc_compatible` `B0_IPOP` and `B1_IPOP` (0x9865, `pkg_mode` 1), which `bin/omamobile images` accepted against `SOC_COMPATIBLE`; + - the DTS's `bootargs`, and the ECT at 0x90000000 (0x53000); + - `__symbols__` kept; `usb_dwc3`, `usb_hsphy` and `usbdrd_phy` okay; + - no `simple-framebuffer`. +- Headers (`unpack_bootimg`) [V]: + - Both vendor images are header v4 with page size 0x800. + - `vendor_boot` carries `VENDOR_CMDLINE` and no DTB. + - `vendor_kernel_boot` carries the DTB and our initramfs (6.3 MiB). + - `init_boot` carries 17.0.0 / 2026-10 with an empty ramdisk. + - `boot.img` holds an 18 MiB kernel (partition 64 MiB). +- AVB hash footers on `boot` and `init_boot` (`avbtool info_image`) [V]: + - padded to 64 MiB and 8 MiB; + - SHA256_RSA4096, rollback index 1791158400; + - `os_version` 17 and `security_patch` 2026-10-05 props, as on stock's footers. Stock's also carry the build fingerprint. +- `dtbo`: one entry, the empty overlay, with board id 0x40406 and rev 0x10000 [V]. +- The initramfs packs akita's `UFS_RW` (`boot_b init_boot_b vendor_boot_b vendor_kernel_boot_b dtbo_b userdata`), the USB product string "Pixel 8a" and the laptop's SSH key for root. It has no `SIMPLEFB_TRIG_CON`, compatible or probe marker, so it writes no display register [V]. +- sha256: + + | Image | sha256 | + | --- | --- | + | `boot` | `c1075d688638f9219ed21dcbd1826d6158bd22429404c3d8908736577f3b3e31` | + | `init_boot` | `51a29b2a0d48efd6412f47e818f62b7c69416c5f9e175c2a7400bb8b0686d474` | + | `vendor_boot` | `1b6e52c10fdb22c6a3c172b6b873e75d07a642bf4abe30fe2a59cab5fb74a53e` | + | `vendor_kernel_boot` | `1f49f9d4b4a6f9c4d8128e29ca1c353b585927c52c6543bc5b9c5bc68940d2d8` | + | `dtbo` | `53685bafbdfbb5fde12c0248e2dc6b79043fb9312783c16530e397a75661bc58` | + +### 2026-11-03: the phone before the first flash (M1.2) + +- Both backups have an offline copy. The laptop has the `omamobile-phone` profile (with `dnsmasq` for its shared mode), and the SSH key is in an agent. +- `fastboot getvar all` [V]: + - `current-slot:b`; + - slots A and B both `slot-successful:yes` and `slot-unbootable:no`, with `slot-retry-count` 2, unchanged since stage 0 ended; + - `unlocked:yes`, `version-bootloader:akita-17.0-15681527`; + - the four anti-rollback counters still at 3. + +### 2026-11-03: first boot on slot B (M1.3) + +All writes went to `*_b` only, through `bin/omamobile flash`. Slot A wasn't written. + +| # | Test | Seen | Meaning | +| --- | --- | --- | --- | +| 1 | `bin/omamobile flash` with the M1.1 images: the five `*_b` images, `--set-active=b`, reboot | Five `OKAY`s. SSH answered 27 s after the flash started, at 4.96 s of kernel uptime. The init's log: storage guard (akita's allowlist), `first light`, `USB gadget up on 11210000.usb` (0.37 s), `ssh` (0.38 s), `ready`, then `arch: no userdata partition`. The UDC reads `configured` | **gate (a) passed:** ABL boots our five images, and USB and SSH come up | +| 2 | With the Google logo still on the panel (seen by eye), from the SSH shell, once each: DPP0 `RDMA_BASEADDR_P0` (0x19900040), DECON0 `GLOBAL_CON` (0x19470020), `TRIG_CON` (0x19470030) | `0xfac00000`, `0x00000133`, `0x00003070`. The phone stayed up: USB `configured`, no new kernel messages | husky's three values (test 20): ABL's splash is at 0xfac00000 and the trigger is masked | + +Findings: + +- **The boot is quiet.** All nine CPUs come up, `MemTotal` is 7.3 GiB, and both cluster watchdogs are stopped at 0.13 s (`watchdog inactive, reset disabled`). Three lines stand out: + - the eUSB2 PHY's two missing supplies, which get dummy regulators (the same as `dtbs_check`'s two warnings); + - `exynos-clkout … failed with error -22`, which husky's log has too (H/); + - `unable to open an initial console`, likely because ABL replaces every `console=` with `console=null` (NOTES.md) [I]. +- **The kernel command line is our `bootargs`, then `VENDOR_CMDLINE`, then ABL's arguments** (NOTES.md). The booted tree adds only ABL's usual nodes: the RAM banks, the four reservations, `kaslr-seed` and the initrd range. +- **The phone stays up with the cable in.** After 10 minutes it is idle (load 0.00) with USB still `configured`, and slot B is not marked successful. +- These images are kept as akita's known-good set (`~/omamobile-kernel/known-good/akita-m1.3-gce160abd9ffc`). + +### 2026-11-03: the console on the panel (M1.4) + +Kernel: the first-light commit plus the framebuffer change, still uncommitted, so the release ends in `-dirty`. The change adds `simple-framebuffer` at 0xfac00000 (1080x2400, `a8r8g8b8`, stride 1080 × 4) with a `no-map` carve-out, `cont_splash_mem`. It follows husky's board file and the 1080x2400 gs201 boards (lynx, panther), and passes `W=1`, `dtbs_check` (the two eUSB2 warnings only) and `checkpatch --strict` (0 errors, 0 warnings). Descriptor: `SIMPLEFB_TRIG_CON="0x19470030 0x3061"`. The incremental rebuild took 3 minutes. + +| # | Test | Seen | Meaning | +| --- | --- | --- | --- | +| 3 | `bin/omamobile fastboot` from our running kernel | `reboot-to bootloader` reached fastboot in 25 s. `getvar`: slot B `slot-successful:no` with 2 tries left; slot A unchanged | The reboot mode works as on husky (test 22). Our first boot used one of slot B's tries, as designed | +| 4 | `bin/omamobile flash` with the M1.4 images | Five `OKAY`s; SSH at 4.92 s of uptime. Kernel log: the splash carve-out reserved, `simpledrm` on `chosen:framebuffer`, fbcon at 67x75, `fb0` 1080x2400 with stride 4320, and no trigger error from the init. Panel (seen by eye): Omarchy's splash, the green logo centred on dark blue | **Gate (b) passed:** frames reach the panel with the right address, size, stride and colours | +| 5 | From SSH, the init's log lines written to `/dev/tty0` | The text appears at the top of the panel, over the splash | fbcon draws on the panel, and the panel keeps following later writes | + +Findings: + +- **A splash instead of the init's lines.** `VENDOR_CMDLINE` carries `splash`, and akita's ABL keeps the vendor command line (NOTES.md). So the init sends its status lines to `/dev/null` and draws Omarchy's splash on `fb0` (`#1a1b26`, logo centred), the screen Plymouth shows when Arch starts. The colours on the panel match the image, so `a8r8g8b8` is the right byte order. +- These images are kept as `~/omamobile-kernel/known-good/akita-m1.4-gce160abd9ffc-dirty`, with their DTS. + +## Open questions + +- B0 or B1: which `/soc_compatible` child ABL matches. Our kernel has no `/sys/devices/soc0` yet (no chip-id driver for zuma), and the booted tree keeps both children. +- The panel's physical size for `width-mm` and `height-mm`: Google's ak3b driver gives 70 × 149 mm, the source of stock's reported DPI (391.9 × 409.1). That is too large for a 6.1-inch panel, so no value is used yet. +- Akita's reset and fastboot button combinations under our kernel. diff --git a/device/akita/NOTES.md b/device/akita/NOTES.md index 63ae11a9f..829d22427 100644 --- a/device/akita/NOTES.md +++ b/device/akita/NOTES.md @@ -11,6 +11,36 @@ Sources: - `S/`: Google's GPL zuma SoC device tree, [kernel/devices/google/zuma](https://android.googlesource.com/kernel/devices/google/zuma/+/refs/tags/android-16.0.0_r0.10/dts/) at the same tag. - `H/`: [husky's notes](../husky/NOTES.md) and [descriptor](../husky/device.conf), for what the two zuma phones share. +## 2026-11-03: first light (M1.3) and the console (M1.4) + +Our kernel booted from slot B with the first-light board file, which has USB and no framebuffer. A second boot added the framebuffer. The steps and the builds are in [BRINGUP-M1](BRINGUP-M1.md). + +- **The boot console reaches the panel** [V] (M1.4). This uses `simple-framebuffer` at 0xfac00000 (1080x2400, `a8r8g8b8`, stride 1080 × 4, `no-map` carve-out) and `SIMPLEFB_TRIG_CON="0x19470030 0x3061"`. simpledrm binds and fbcon runs at 67x75. Because `splash` reaches the command line, the init draws Omarchy's splash, and the panel shows it with the right geometry and colours. Text written to `/dev/tty0` afterwards shows over it. + +- **ABL boots our five slot B images, and the initramfs runs** [V]. In kernel time, the init brings the USB gadget up at 0.37 s and SSH (`root@172.16.42.1`) at 0.38 s. All nine CPUs come online, and `MemTotal` is 7.3 GiB. +- **The booted tree is our DTB plus ABL's usual additions** [V] (`/sys/firmware/fdt`): + - the RAM banks; + - the four reservations it inserts itself (`pkvm_guest_firmware`, `sec_dram`, `sec_pt`, `debug_kinfo_reserved`); + - `kaslr-seed` and the initrd range. + + It keeps both `/soc_compatible` children and names no splash carve-out. +- **The kernel command line is our DTB `bootargs`, then our `VENDOR_CMDLINE`, then ABL's own arguments** [V] (`/proc/cmdline`). + - ABL replaces each `console=` with one `console=null`, as on husky (H/). + - Its own arguments include `exynos_drm.panel_name=google-ak3b.80801e`, `tcpci_max77759.conf_sbu=0`, `arm64.nomte` and `id_aa64mmfr1.vh=0`. + - Unlike cheetah's ABL (gs201, [its notes](../cheetah/NOTES.md)), this one keeps the vendor command line (`splash`, `plymouth.*`, `printk.devkmsg=on`, `bootconfig`). +- **Three display registers, read once each** from the SSH shell with the Google logo still on the panel [V]: + + | Register | Value | + | --- | --- | + | DPP0 `RDMA_BASEADDR_P0` (0x19900040) | `0xfac00000` | + | DECON0 `GLOBAL_CON` (0x19470020) | `0x00000133` | + | DECON0 `TRIG_CON` (0x19470030) | `0x00003070` | + + All three are husky's values (H/, [BRINGUP-M1](../husky/BRINGUP-M1.md) test 20). ABL's splash is at 0xfac00000, and the trigger is masked: `HW_TRIG_MASK_DECON` (bit 4) is set and `HW_TRIG_EN` (bit 0) clear. +- **The panel runs in DSI command mode** [V]. No mode in Google's driver (`display/panel-google-ak3b.c`, in the same repository as G/) sets `MIPI_DSI_MODE_VIDEO`; its modes set only `MIPI_DSI_CLOCK_NON_CONTINUOUS`. So, as on husky, frames reach the panel only once DECON0's trigger is unmasked. 0x3061 clears bit 4 and sets bit 0, hence `SIMPLEFB_TRIG_CON="0x19470030 0x3061"`. +- **The same driver gives the panel as 70 × 149 mm** (`width_mm`, `height_mm`) [V], which is where stock's reported DPI comes from. That is larger than a 6.1-inch 20:9 panel (about 64 × 141 mm), so no size goes into the board file yet. +- **There is no `/sys/devices/soc0`** [V]: our kernel has no chip-id driver for zuma, so the silicon revision (B0 or B1) is still open. + ## 2026-11-02: stage 0: a retail Pixel 8a (stock, rooted, bootloader unlocked) ### Identity @@ -83,11 +113,12 @@ The descriptor carries no comments; this table is its provenance. | `BOOT_IMAGES`, `UFS_RW` | the five boot images; their `_b` names and `userdata` | [V] | R/ `/dev/block/by-name`; F/ | | `INITRAMFS_INIT` | the shared init | [V] | as husky | | `PANEL_SIZE` | 1080x2400 | [V] | R/ `dumpsys display`; G/ `zuma-akita-display.dtsi` | -| `SIMPLEFB_TRIG_CON`, `BRINGUP_PROBE` | unset | | DECON0's `TRIG_CON` at handover is read on a booted 8a before it is written anywhere; `BRINGUP_PROBE`'s addresses are gs201's | +| `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) | +| `BRINGUP_PROBE` | unset | | its addresses are gs201's | ### Still needs the kernel or a phone -1. The board DTS, `zuma-akita.dts` on our `zuma.dtsi`, aimed at M1 (USB and SSH, then the simplefb console) as in [husky's BRINGUP-M1](../husky/BRINGUP-M1.md): the IPOP `/soc_compatible` children, `/chosen/bootargs`, the 1080x2400 framebuffer and the fixed `reserved-memory` regions from R/, with a binding entry for `google,zuma-akita`. -2. DECON0's `TRIG_CON` at handover on an 8a, before `SIMPLEFB_TRIG_CON` goes in. -3. The silicon revision (B0 or B1). +1. The board DTS, `zuma-akita.dts` on our `zuma.dtsi`, aimed at M1 (USB and SSH, then the simplefb console) as in [husky's BRINGUP-M1](../husky/BRINGUP-M1.md): the IPOP `/soc_compatible` children, `/chosen/bootargs`, the 1080x2400 framebuffer and the fixed `reserved-memory` regions from R/, with a binding entry for `google,zuma-akita`. USB and SSH work, and so does the framebuffer console (2026-11-03, above). +2. ~~DECON0's `TRIG_CON` at handover on an 8a, before `SIMPLEFB_TRIG_CON` goes in.~~ 0x3070, read 2026-11-03 (above). +3. The silicon revision (B0 or B1). `/sys/devices/soc0` doesn't exist under our kernel yet. 4. `omamobile-device-akita`. diff --git a/device/akita/device.conf b/device/akita/device.conf index 8f0ffa04e..9dd84a83d 100644 --- a/device/akita/device.conf +++ b/device/akita/device.conf @@ -20,4 +20,5 @@ 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" INITRAMFS_INIT=/initramfs/init +SIMPLEFB_TRIG_CON="0x19470030 0x3061" PANEL_SIZE=1080x2400 diff --git a/device/akita/kernel.config b/device/akita/kernel.config new file mode 100644 index 000000000..a44736265 --- /dev/null +++ b/device/akita/kernel.config @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: MIT +# akita's kernel options, merged by bin/omamobile kernel on top of +# kernel/configs/omamobile.config. + +# The watchdog driver stops the bootloader's watchdogs, so a hang that never +# panics lasts until someone resets the phone with its buttons. For the phone +# to reset by itself, a hang has to end in a panic and panic=10's reset. +# zuma-akita.dts's bootargs ask for panics on lockups and RCU stalls; these +# build the detectors (the buddy hard-lockup detector on arm64 without pseudo +# NMIs), as husky's kernel.config does. +CONFIG_SOFTLOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR=y diff --git a/docs/DEVICES.md b/docs/DEVICES.md index bf8ed50ab..ce661f039 100644 --- a/docs/DEVICES.md +++ b/docs/DEVICES.md @@ -70,7 +70,7 @@ Devices we'd like to support, with the closest starting point. Open an issue to | Pixel 6 | oriole | gs101 | **WIP, community port: [#2](https://github.com/derekross/omarchy-mobile/issues/2)**; our preferred second device. Upstream mainline `gs101-oriole.dts` | | Pixel 6 Pro | raven | gs101 | upstream mainline `gs101-raven.dts`; shares oriole's port ([#2](https://github.com/derekross/omarchy-mobile/issues/2)). Boots our kernel from slot B to Omarchy's Hyprland on the Mali-G78 ([kernel #2](https://github.com/derekross/linux-omarchy-mobile/pull/2), [#3](https://github.com/derekross/linux-omarchy-mobile/pull/3)); its device package and plans ([#41](https://github.com/derekross/omarchy-mobile/pull/41)) and provisioning tools ([#22](https://github.com/derekross/omarchy-mobile/pull/22)) are merged | | Pixel 6a | bluejay | gs101 | **WIP, community port: [#2](https://github.com/derekross/omarchy-mobile/issues/2)**; stage 0 facts from Google's GPL bluejay tree, no phone yet ([notes](../device/bluejay/NOTES.md)); its first-light board DTS (`gs101-bluejay.dts`, [kernel #179](https://github.com/derekross/linux-omarchy-mobile/pull/179)) is merged into the published kernel but not yet booted on a 6a; shares oriole's port | -| Pixel 8, 8 Pro, 8a | shiba, husky, akita | zuma (Tensor G3) | **WIP, community port: [#1](https://github.com/derekross/omarchy-mobile/issues/1)**. 8 Pro (husky): WIP, in the matrix above; its device package and UFS plan are merged ([#42](https://github.com/derekross/omarchy-mobile/pull/42)), and its bootloader picks the base DTB by `/soc_compatible`, not `/soc_id`. 8a (akita): stage 0 stock facts and a descriptor from a retail phone ([notes](../device/akita/NOTES.md)); this phone's bootloader picks the IPOP base DTB where husky's picks FOPLP, and its board DTS isn't written yet | +| Pixel 8, 8 Pro, 8a | shiba, husky, akita | zuma (Tensor G3) | **WIP, community port: [#1](https://github.com/derekross/omarchy-mobile/issues/1)**. 8 Pro (husky): WIP, in the matrix above; its device package and UFS plan are merged ([#42](https://github.com/derekross/omarchy-mobile/pull/42)), and its bootloader picks the base DTB by `/soc_compatible`, not `/soc_id`. 8a (akita): stage 0 stock facts and a descriptor from a retail phone ([notes](../device/akita/NOTES.md)); this phone's bootloader picks the IPOP base DTB where husky's picks FOPLP. First light: a board DTS, not yet merged, boots from slot B with USB networking, SSH and the framebuffer console ([BRINGUP-M1](../device/akita/BRINGUP-M1.md)) | | Pixel 9 family | tokay, caiman, komodo, comet, tegu | zumapro (Tensor G4) | 9a (tegu): WIP, in the matrix above; SoC patches are merging into linux-omarchy-mobile, the board DTS isn't public yet; tracking [#28](https://github.com/derekross/omarchy-mobile/issues/28) | | Pixel 10 family | mustang (10 Pro XL) | laguna (Tensor G5) | 10 Pro XL (mustang): stage 0 stock facts ([notes](../device/mustang/NOTES.md)), contributors welcome ([#18](https://github.com/derekross/omarchy-mobile/issues/18)) | | Pixel 11 Pro, 11 Pro XL, 11 Pro Fold | grizzly, kodiak, yogi | malibu (Tensor G6) | stock facts, contributors welcome: 11 Pro ([#26](https://github.com/derekross/omarchy-mobile/issues/26)), 11 Pro XL ([#199](https://github.com/derekross/omarchy-mobile/issues/199), [notes](../device/kodiak/NOTES.md)), 11 Pro Fold ([#40](https://github.com/derekross/omarchy-mobile/issues/40)) | From 676eaba9b76b225d80d2e49ee19285b3419a8330 Mon Sep 17 00:00:00 2001 From: DarekM <149845949+aninmucek@users.noreply.github.com> Date: Tue, 3 Nov 2026 21:29:22 +0000 Subject: [PATCH 2/2] device/akita: BRINGUP-M1 names #192 and ties both boots to it From the review of #414: - The status line names derekross/linux-omarchy-mobile#192 and its commits. M1.3's kernel commit, ce160abd9, is #192's 1253914a9 with the same files. M1.4's -dirty run is #192's 6a2999804: the kept DTS is blob 381ad1e0 and the flashed DTB has sha256 9a5d92a5, as #192's. - Risks: every unmarked boot uses one of slot B's tries. If stock boots, decline any factory reset and take a fresh backup. - M1.2 lists the fastboot getvar values instead of a local helper, and the two rollbacks pin the serial. - NOTES.md: the COMPATIBLE and DTB rows point at #192. Co-Authored-By: Claude Opus 5.5 --- device/akita/BRINGUP-M1.md | 38 +++++++++++++++++++++++++++++++------- device/akita/NOTES.md | 4 ++-- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/device/akita/BRINGUP-M1.md b/device/akita/BRINGUP-M1.md index 37fbdb194..d8b1094d8 100644 --- a/device/akita/BRINGUP-M1.md +++ b/device/akita/BRINGUP-M1.md @@ -1,7 +1,18 @@ # akita M1: first light on zuma -**Status (2026-11-03):** stage 0 done ([NOTES.md](NOTES.md), #308). Kernel branch `omamobile-zuma-akita-dts` (the binding, then the first-light DTS; not yet pushed): `zuma-akita.dtb` builds with `W=1`, `dtbs_check` reports only the two eUSB2-PHY supply warnings husky's board has, `dt_binding_check` passes, `checkpatch --strict` finds no errors, and `tools/kernel-pr-check` passes. M1.1 and M1.2 are done: the images are built and checked, and the phone's slots are as stage 0 left them. **M1 is complete (2026-11-03).** M1.3 passed gate (a): our kernel boots from slot B, with the USB gadget and SSH up 0.38 s into boot, and the bootloader's framebuffer and DECON0's trigger read exactly as on husky. M1.4 passed gate (b): `simple-framebuffer` and the trigger write put Omarchy's splash, and then console text, on the panel ([Results](#results)). The framebuffer change is tested but not yet committed. +**Status (2026-11-03):** stage 0 done ([NOTES.md](NOTES.md), #308). **M1 is complete.** + +The kernel side is [derekross/linux-omarchy-mobile#192](https://github.com/derekross/linux-omarchy-mobile/pull/192), on `omamobile` `fe9627c00`: +- the binding, `7385cab4b`; +- the first-light DTS, `1253914a9`; +- the framebuffer, `6a2999804`. + +Its gate passes: a clean merge, `W=1` and `dtbs_check` with only the two eUSB2-PHY supply warnings husky's board has, `dt_binding_check`, and `checkpatch --strict` with no errors. + +- M1.1 and M1.2: the images were built and checked, and the phone's slots were as stage 0 left them. +- M1.3 passed gate (a): our kernel boots from slot B, with the USB gadget and SSH up 0.38 s into boot. The bootloader's framebuffer and DECON0's trigger read exactly as on husky. +- M1.4 passed gate (b): `simple-framebuffer` and the trigger write put Omarchy's splash, and then console text, on the panel ([Results](#results)). ## Goal @@ -49,7 +60,10 @@ Husky's first light found and fixed what a zuma phone needs, and all of it is in ## Risks - **A black screen with no USB tells us little:** zuma's ABL keeps no ramoops (husky test 11). The bootloader's splash stays frozen on the panel while our kernel runs, since there's no framebuffer driver yet, so the panel shows nothing new either way. The laptop's USB log is the evidence. -- **Slot B falls back by itself:** `bin/omamobile flash` makes B active with three tries. Each failed boot uses one, and then ABL boots stock slot A, which is untouched and marked successful. Don't mark slot B successful during M1. `userdata` holds stock's (empty) Android data, and M1 doesn't touch it. +- **Slot B falls back by itself:** `bin/omamobile flash` makes B active with three tries. Every boot that doesn't mark slot B successful uses one, a working boot of ours included. At zero, ABL boots stock slot A, which is untouched and marked successful. Don't mark slot B successful during M1. `userdata` holds stock's (empty) Android data, and M1 doesn't touch it. +- **If stock boots from slot A:** + - Decline any factory reset that stock or recovery offers. Volume Down + Power reaches fastboot instead. + - Afterwards, take a fresh read-only backup. Stock rewrites `efs`, `persist` and `modem_userdata` when it boots (CONTRIBUTING §3.3). - **Unplugging the cable loses USB until a reboot:** the MAX77759 opens its USB2 data switch on unplug, and nothing closes it while no Type-C driver owns the chip (AGENTS.md, USB). Keep the cable in during M1; if USB drops, reboot. - **Buttons:** on husky, Power + Volume Up held 15-30 s resets the phone under our kernel, Power alone does nothing (test 23), and Volume Down + Power then reaches fastboot. Akita has the same PMIC family [I]. @@ -69,7 +83,11 @@ Ask the human before every flash and reboot (AGENTS.md §1). 1. The phone's two backups (`akita-backup-prewipe-20261101`, `akita-backup-clean-20261102`) have a second copy offline (CONTRIBUTING §3.3). 2. The laptop's side of the USB network, once: the `omamobile-phone` NetworkManager profile from [INSTALL](../../docs/INSTALL.md) §5 (172.16.42.2/24 on the `cdc_ncm` link). 3. The SSH key in an agent, since `tools/phone-ssh` can't ask for its passphrase: for example `systemctl --user enable --now ssh-agent.socket`, then `SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket ssh-add`. -4. `adb reboot bootloader`, then `~/android/akita/bin/akita-state`: `current-slot:b`, both slots `slot-successful:yes`, `unlocked:yes`, `version-bootloader:akita-17.0-15681527`. +4. `adb reboot bootloader`. Then run `fastboot -s getvar ` for each of these (`getvar all` prints them all) and check the values: + - `current-slot`: `b` + - `slot-successful:a` and `slot-successful:b`: `yes` + - `unlocked`: `yes` + - `version-bootloader`: `akita-17.0-15681527` - **Stop if:** there's no offline copy, or slot A isn't `slot-successful:yes`. - **Risk:** none (one reboot to fastboot). @@ -81,7 +99,7 @@ Ask the human before every flash and reboot (AGENTS.md §1). - **Expect:** the orange-state warning, the Google logo frozen on the panel, then a USB gadget on the laptop (`lsusb`, and a new `cdc_ncm` interface) within about 30 s. - **Pass:** `ping 172.16.42.1`, then `ssh root@172.16.42.1`. Save `dmesg` to a private file under `~/android/reference/`. Then, with the logo still on the panel and from the ssh shell, **once each, read only, one register per call**: DPP0 `RDMA_BASEADDR_P0` (`/usr/local/bin/devmem 0x19900040`), DECON0 `GLOBAL_CON` (`/usr/local/bin/devmem 0x19470020`) and `TRIG_CON` (`/usr/local/bin/devmem 0x19470030`). `devmem` takes no width: a second argument is a value to **write**, so a read never has one. Record the three values here and in [NOTES.md](NOTES.md). - **Stop if:** nothing is on USB after 2 minutes. Let slot B's three tries run out until ABL boots stock slot A, or reset with the buttons (Power + Volume Up for 15-30 s on husky). Don't send more commands to a phone that has stopped answering. Skip the reads if the logo is gone before them (the display block may be off), and stop if a read hangs or panics. -- **Rollback:** `fastboot --set-active=a`; slot A is untouched. +- **Rollback:** `fastboot -s --set-active=a`; slot A is untouched. - **Risk:** medium (unknown hangs), with writes only to `*_b`; low for the reads (a powered, clocked block, read once). ### M1.4 A console on the panel (gate b) @@ -90,14 +108,14 @@ With M1.3's address: a kernel commit that adds `simple-framebuffer` (1080x2400 ` - **Expect / Pass:** the init's lines (`first light`, `USB gadget up`, `ssh`, `ready`) on the panel. With `splash` on the kernel command line, as on akita, you see Omarchy's splash instead, and the lines go only to the kernel log. - **Stop if:** the panel stays frozen on the logo with USB up (the trigger), or USB doesn't come back (then as M1.3's stop). -- **Rollback:** the change is in slot B's images only; `fastboot --set-active=a` returns to stock. +- **Rollback:** the change is in slot B's images only; `fastboot -s --set-active=a` returns to stock. - **Risk:** low (one register write, as on husky and cheetah, undone by any reset). ## Results ### 2026-11-03: images built, not flashed (M1.1) -- Kernel `7.3.0-rc6-omamobile-push1-gce160abd9ffc`, from `omamobile-zuma-akita-dts` at its DTS commit (no `-dirty`), built by `bin/omamobile kernel` in the container: `kernel/configs/omamobile.config` plus [kernel.config](kernel.config). `SOFTLOCKUP_DETECTOR`, `HARDLOCKUP_DETECTOR` (the buddy detector), `PHY_SNPS_EUSB2` and `USB_DWC3` are built in, and there are 1815 modules [V]. The only compiler warnings are two `-Wformat` ones in the base branch's AoC sound driver (`aoc_alsa_compr.c`), outside akita's commits. +- Kernel `7.3.0-rc6-omamobile-push1-gce160abd9ffc`, from `omamobile-zuma-akita-dts` at its DTS commit `ce160abd9` (no `-dirty`). That commit later became #192's `1253914a9`: its message gained the test result and it moved onto `fe9627c00`, but its DTS, the Makefile, the binding and `zuma.dtsi` are identical. It was built by `bin/omamobile kernel` in the container: `kernel/configs/omamobile.config` plus [kernel.config](kernel.config). `SOFTLOCKUP_DETECTOR`, `HARDLOCKUP_DETECTOR` (the buddy detector), `PHY_SNPS_EUSB2` and `USB_DWC3` are built in, and there are 1815 modules [V]. The only compiler warnings are two `-Wformat` ones in the base branch's AoC sound driver (`aoc_alsa_compr.c`), outside akita's commits. - `tools/kernel-pr-check` on the two commits: 8 ok, 0 not ok. The 10 Google device trees build with `W=1` and `dtbs_check` with no new warnings, and `dt_binding_check` passes [V]. - The DTB in `vendor_kernel_boot` (one copy, 24.5 KiB) is the build's `zuma-akita.dtb` [V]: - model "Google Pixel 8a", compatible `google,zuma-akita`, `google,zuma`; @@ -157,7 +175,13 @@ Findings: ### 2026-11-03: the console on the panel (M1.4) -Kernel: the first-light commit plus the framebuffer change, still uncommitted, so the release ends in `-dirty`. The change adds `simple-framebuffer` at 0xfac00000 (1080x2400, `a8r8g8b8`, stride 1080 × 4) with a `no-map` carve-out, `cont_splash_mem`. It follows husky's board file and the 1080x2400 gs201 boards (lynx, panther), and passes `W=1`, `dtbs_check` (the two eUSB2 warnings only) and `checkpatch --strict` (0 errors, 0 warnings). Descriptor: `SIMPLEFB_TRIG_CON="0x19470030 0x3061"`. The incremental rebuild took 3 minutes. +Kernel: the first-light commit plus the framebuffer change, which wasn't committed yet, so the release ends in `-dirty`. The change is now #192's `6a2999804`. + +**It is the same source as #192:** +- `git hash-object` on the DTS kept with this run's images gives `381ad1e0e7cbf00a74a8d59f1cf48af97046adcb`, #192's `zuma-akita.dts` blob. +- The DTB in the `vendor_kernel_boot` that was flashed has sha256 `9a5d92a580a8275d39a67b3a13571532374c85d37c8030111d026257d91a123d`, the same as the review's build of #192 on `omamobile` `fe9627c00`. + +The change adds `simple-framebuffer` at 0xfac00000 (1080x2400, `a8r8g8b8`, stride 1080 × 4) with a `no-map` carve-out, `cont_splash_mem`. It follows husky's board file and the 1080x2400 gs201 boards (lynx, panther), and passes `W=1`, `dtbs_check` (the two eUSB2 warnings only) and `checkpatch --strict` (0 errors, 0 warnings). Descriptor: `SIMPLEFB_TRIG_CON="0x19470030 0x3061"`. The incremental rebuild took 3 minutes. | # | Test | Seen | Meaning | | --- | --- | --- | --- | diff --git a/device/akita/NOTES.md b/device/akita/NOTES.md index 829d22427..8b73fb7f6 100644 --- a/device/akita/NOTES.md +++ b/device/akita/NOTES.md @@ -101,9 +101,9 @@ The descriptor carries no comments; this table is its provenance. | Key | Value | Mark | Source | | --- | --- | --- | --- | | `CODENAME`, `NAME`, `SOC` | akita, Pixel 8a, zuma | [V] | R/ `ro.product.device`, `ro.product.model`, `ro.boot.hardware.platform` | -| `COMPATIBLE` | `google,zuma-akita` | [I] | husky's upstream style (H/); the binding entry comes with the board DTS | +| `COMPATIBLE` | `google,zuma-akita` | [V] | husky's upstream style (H/); the board DTS's first compatible, with its binding entry, in [linux-omarchy-mobile#192](https://github.com/derekross/linux-omarchy-mobile/pull/192) | | `PACKAGE` | `omamobile-device-akita` | | the package doesn't exist yet; `bin/omamobile initramfs` builds the freestanding helpers when a package has no `omamobile-bootctl.c`, as for husky | -| `DTB` | `exynos/google/zuma-akita.dtb` | | the board DTS isn't written yet, so `DEVICE=akita bin/omamobile images` waits for it | +| `DTB` | `exynos/google/zuma-akita.dtb` | [V] | built from the board DTS in [linux-omarchy-mobile#192](https://github.com/derekross/linux-omarchy-mobile/pull/192); `bin/omamobile images` packs it ([BRINGUP-M1](BRINGUP-M1.md) M1.1) | | `SOC_COMPATIBLE` | `b0-ipop:0x9865:1:0:1 b1-ipop:0x9865:1:1:1` | [V] | R/ live DT `/soc_compatible`; S/ `zuma-b0-ipop.dts` | | `AVB_FOOTERS`, `AVB_ROLLBACK_INDEX`, `AVB_SECURITY_PATCH` | `boot:0x4000000 init_boot:0x800000`, 1791158400, 2026-10-05 | [V] | F/ `vbmeta.img` chain descriptors and the stock footers; R/ `getvar partition-size` | | `DTBO_SOURCE`, `DTBO_BOARD_ID`, `DTBO_BOARD_REV` | the empty overlay, 0x40406, 0x10000 | [V] | F/ `dtbo.img` entry 18; R/ `androidboot.dtbo_idx`; G/ `zuma-akita-mp.dts` |