Repository navigation
drm/asahi: g16: Admit the 25G83 B0 image with iBoot's ranges zeroed - #2232
DjDeveloperr wants to merge 1 commit into
Conversation
1e9eb0c to
6dfa2ac
Compare
|
No blockers. I checked the matching path.
HW row: on 8-core and 10-core J713 with 25G83, this head. The driver log names which entry matched, or prints the refused identity with "boot-filled ranges zeroed". On J773g, 0 GPU faults and timeouts in a glmark2 run, 0 AVC, 0 failed units. Assisted-by: LLM (Claude:Opus 5.5) |
iBoot writes into the 25G83 GPU TEXT it loads, and part of what it writes depends on the machine. Compared with build b000 (G16G B0) of armfw_g16g.im4p in 25G83, a Mac mini (J773g, 24 GB) loads a TEXT that differs in: - the header word at 0x224, which changes from boot to boot, and the DATA address at 0x23c; - the value of each of the 39 boot parameter records the header at 0x22c places from 0x5c8df to 0x5cb10 (a tag, a 32-bit length and the value): carveout addresses just below the top of DRAM, which follow the memory size, a per-boot slide and the entropy; - two iBoot-filled tables (count byte and body) at 0x5cb10 and 0x5ce60, which the shipped image leaves empty. The T8132 entries hash a loaded image with only the entropy or one record zeroed, so each fits the machines it was measured on, and G16 refuses this Mac mini's image with EINVAL. Add an entry that zeroes all of those ranges. Its digest is that of the shipped build b000 TEXT with the same ranges zeroed, and two boots of the Mac mini give the same digest, so it pins the 25G83 B0 code as Apple ships it rather than one machine's memory map, slide or per-machine tables. Every other byte, including the record tags and lengths and the table headers, is compared as loaded. The existing entries are unchanged. A test checks the ranges' layout and that the digest selects the entry. Signed-off-by: Diljit Singh <hey@djdev.me>
6dfa2ac to
8344870
Compare
|
Addressed points 1 and 3 in
Verified Assisted-by: LLM (Gemini:4 Neon) |
|
Thanks, points 1 and 3 are done: the comment at g16/hw.rs:99-105, the commit message and the PR body no longer give the table headers or what the tables hold. The code is otherwise unchanged from the head I reviewed, so the earlier check still holds.
Still open: a J713 row (8-core and 10-core GPU, 25G83) on this head. The driver log should name the entry that matched, or print the refused identity with "boot-filled ranges zeroed", which is the input for collapsing the per-board J713 entries later. Assisted-by: LLM (Claude:Opus 5.5) |
Summary
G16 refuses the 25G83 GPU firmware on a 24 GB Mac mini (J773g) with
loaded GFX TEXT identity mismatch: EINVAL.I compared the TEXT loaded on two boots with Apple's file: build
b000(G16G B0) ofarmfw_g16g.im4p, taken from the macOS 26.6.2 stub's Preboot (Restore/Firmware/agx/). iBoot writes into these ranges:SLIDslide (per boot), GKTS/ECAP entropy, SoC id/revision, …Every other byte matches Apple's file. This adds a T8132 entry that zeroes exactly those ranges. Its digest
b9ea7e6b2aca…equals the shipped b000 TEXT with the same ranges zeroed, so the entry pins Apple's 25G83 B0 code rather than one machine's memory map, slide or per-machine tables. Record tags/lengths, table headers and the rest of TEXT are still compared exactly. Existing entries are unchanged.#1718's J773g entry zeroes only 0x224 and the slide, so it fits one machine: on this mini that normalization gives
9b100498…, not9154c7f8….Test (Mac mini M4 J773g, 24 GB, macOS 26.6.2 stub, aura 1.0.0b13 + boot-HDMI Stage 2)
Kernel: the linux-aurora 7.3.0-40 pin (9125b31) + #1898 + #1191 (with #1718) + this commit + the T8132 cluster fix for apple-pmp-thermal. Distribution config, release
7.3.0-ARCH-m4gpu1, Arch Linux ARM, Mesa 26.3.0-devel d4ad4a4dce, KWin 6.8.2.b9ea7e6b….GPU firmware build: Apple GFX 25G83 (build b000, iBoot-filled ranges zeroed),M4: firmware identity accepted,firmware at READY,[drm] Initialized aurora 1.0.0 … on minor 1.Apple M4 (G16G B0)(GL 4.6, ES 3.2).glmark2-es2-drm --off-screen(build/texture/shading/refract, 10 s each, 1920x1080): rc 0, score 453. No GPU errors, faults or timeouts in the kernel log.d0d2a026…) also admitted the image on this machine. It was replaced because the per-machine tables could differ between chips.The GPU still needs #1191's J773g PMP/DVFS commits. This PR replaces only #1718's firmware-identity part.
Assisted-by: LLM (Gemini:4 Neon)