Repository navigation
drm/asahi: m3: run the M3 (T8122 G15G) GPU on the macOS 27.2 firmware - #2781
RyanTheTide wants to merge 22 commits into
Conversation
The J514S 14.7 boot chain can load a T6030 firmware build whose full TEXT digest is not in the admission table. Probe refuses it and no GPU render node is created. Desktop use with the explicit prefix override reaches firmware READY and reduces Hyprland CPU use from several cores to single-digit percentages. Pin the complete measured digest only for J514S, with its segment sizes and marker, rather than requiring a persistent bring-up override. Exercise the production firmware table and exact lookup with the override disabled. Reject other boards, altered digest suffixes, sizes and markers. Link: omacom/linux-aurora#247 Signed-off-by: Nikita Konkov <95355711+javanoo6@users.noreply.github.com> Signed-off-by: Scott Jones <scottajones@gmail.com>
The J514S cd05 FirmwareBuild row adds 15 lines to the T6030 firmware table, which changes the pinned hw.rs file and t6030 module digests. With that row removed both digests are their previous values, so the T6030 profile itself is unchanged. Refresh the two pins and record why. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Scott Jones <scottajones@gmail.com>
Some 16-inch M3 Pro (J516S) units on the 14.7 boot chain load a B0 GPU firmware image whose TEXT digest differs from the pinned J516S row: TEXT 0x5c000, DATA 0x114000, GKTS marker 0x58e88 and TEXT sha256 cd05af6a828b52e4c2fed20086d3d18a7db42e03a8fd6f8354f9f06e0a61363e. The build is refused with "loaded GFX TEXT identity mismatch", so there is no render node and the compositor falls back to llvmpipe. The GPU only starts with the g15_accept_text_prefix bring-up override. Add this build as a J516S-only row. Rows still pin on the machine they name; nothing changes on the J514S or on other machines. Extend the maintained-handoff host test to check the new row and refresh the zero-words golden pins for hw.rs and the T6030 module, which change by exactly this one row. Measured on a J516S (apple,j516s apple,t6030; os-fw 14.7, system-fw 15.5, iBoot2 iBoot-10151.140.19.700.2) with linux-aurora 7.2.11.aurora14-1 and the override: the admission line reports the identical sizes, marker and digest, and the GPU reaches READY with renderD128 present. Link: omacom/linux-aurora#247 Link: omacom/omarchy#17739 Signed-off-by: joel cristobal <joelcristobal97@gmail.com> Signed-off-by: Scott Jones <scottajones@gmail.com>
Some 14-inch (J514S) and 16-inch (J516S) M3 Pro units on the 14.7 boot chain load a third B0 GPU firmware image: TEXT 0x5c000, DATA 0x114000, GKTS marker 0x58e88 and TEXT sha256 411833a7ded773feeac4a181552e3ff5582eaf4435f2dd8f620c1ed0b31df1b0. No row pins it, so probe fails with "loaded GFX TEXT identity mismatch", there is no render node and the compositor falls back to llvmpipe. Three machines have reported it in issue omacom/linux-aurora#247, all on the 14.7 stub with system firmware 26.6.2: a J514S and a J516S (both iBoot-10151.140.19.700.2, mBoot-18000.161.10), which logged the identical sizes, marker and digest, and a second 14-inch M3 Pro. With g15_accept_text_prefix=0x411833a7ded773fe all three reached firmware READY with renderD128 present. The boot chain matches the J514S cd05 reports, so the chain alone does not select the image. Add one row per board, J514S then J516S, so each pin still names the machine it was measured on; nothing changes for other machines. Extend the maintained-handoff host test: both boards pin to their own row with the override disabled, other boards are refused, and an altered digest suffix, TEXT or DATA size or marker is refused. Refresh the zero-words golden pins for hw.rs and the T6030 module; with the two rows removed both are their previous values. Link: omacom/linux-aurora#247 Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Scott Jones <scottajones@gmail.com>
Before the module's final activate() step, the G15 probe returned -EPROBE_DEFER. That put the GPU on the driver core's deferred-probe list. activate() then runs the real probe through driver_attach(), but if that probe fails for good, for example because the firmware is rejected, the driver core does not take the device off the list. It stays in /sys/kernel/debug/devices_deferred until the deferred-probe work next runs, so anything that waits on that list keeps waiting. Return -ENODEV instead. activate() already reprobes every unbound device once MODULE_READY is set, and a device added later sees it set, so nothing needs the deferred list to retry. The display and PMP waits inside the real probe still return -EPROBE_DEFER. g15-probe-init-tests.py now checks that every probe before activation returns -ENODEV, and adds a mutant that defers again. Assisted-by: Claude:claude-opus-5-5 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Scott Jones <scottajones@gmail.com> (cherry picked from commit 6447458 on omacom/linux-aurora, omacom/linux-aurora#470) [7.3 base: the probe-init test also runs with the G16 registration here, so its pre-activation probe count follows the registration order; the new mutant is added to this base's expected-failure table.]
…e M3 runtime The 7.2 rebase replaced the T8122 14.x branch of apple_pmp_report_wait_supplier_ready() with a T6030-only one, so on an M3 MacBook Air every GPU power vote returns -ENODEV even with the PMP running. With the new hidden APPLE_T8122_GPU_PMP_LINK, which DRM_ASAHI_M3_T8122 selects (as DRM_ASAHI_G15 selects APPLE_T6030_GPU_PMP_LINK), wait for the unique T8122 report's display request (DISP, reg 7) to be ready and acknowledged before AGX, as on the 7.1.12 kernel the runtime was qualified with. The PMP graph and supplier host tests copy the dispatch, so they copy the T8122 wait too, built off there; their mutations still target the T6030 path. Generated-by: LLM Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Scott Jones <scottajones@gmail.com>
The supplier suite built apple_pmp_report_wait_t8122_14() only with APPLE_T8122_GPU_PMP_LINK off, so every case returned at its first check. Build it also as the M3 runtime does (T6030 and T8122 links on) and run the T8122 graph: the unique, available report linked to this PMP, with DISP (reg 7) acked, and its failures (machine, supplier and report compatibles, a duplicate or disabled report, the apple,pmp shape and identity, a missing, duplicate, disabled, incompatible or no-ack DISP entry, the managed start and its readiness). With the link off, a well-formed T8122 graph is refused. Mutants cover the wait's config scope, compatibles, report checks, readiness result and entry reference, and the dispatch's machine scope in both directions. Reported-by: Marcelo Alcantara <maralc@gmail.com> Generated-by: LLM Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Signed-off-by: Scott Jones <scottajones@gmail.com>
The 14" M3 MacBook Pro (J504) runs the same T8122 DCP image as the M3 MacBook Airs (90F849E1-..., named by the J504 ADT), so the 14.x IOMFB path can drive its panel once the boot loader hands the display over. Its panel is the J514S mini-LED panel: 3024x1964 with 74 notch rows, at 60 or 120 Hz. Add a J504 record with that geometry, ProMotion allowed, bring-up logging on, and this image's colour matrix methods. The panel level block is not qualified on this board, so brightness stays closed, and its swaps keep zero timestamps as on the Airs. Other T8122 Macs (the J433 and J434 iMacs) still have no record. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Scott Jones <scottajones@gmail.com>
The J504 (14" M3 MacBook Pro) loads the same 14.8.3 G15G firmware image as the M3 MacBook Airs (UUID DF697F05-..., TEXT 0x64000, from its ADT). Move the T8122 board list into t8122_admission as T8122_BOARDS, add the J504, and test the exact list on the host. Firmware identity, resource admission, the performance-state cap and the thermal limit are unchanged; the J504 starts at the same conservative cap (state 2) as the Airs. The J433 and J434 iMacs stay unlisted. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Scott Jones <scottajones@gmail.com>
Give the J504 DCP its panel node (the J514S 14" mini-LED panel: 302 x 196 mm, 189 mm below the notch, 500 nits) and point the boot framebuffer at it, as on the J613, so simpledrm and the DCP driver use the same physical size. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Scott Jones <scottajones@gmail.com>
The J504 runs the J613's DCP image, whose panel level block (brightness in nits) is qualified on the J613. Mark the J504 record panel_nits and admit the J504 machine for it, with the KUnit and host tests. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Scott Jones <scottajones@gmail.com>
On 7.3 the M3 MacBook Air runtime adopts the firmware's UAT through Uat::new_adopted_with_user_upper(), which always asks for a write-combined mapping of the handoff and TTBAT regions. On these Macs the boot loader leaves both regions in the kernel's memory map as reserved RAM, and memremap() refuses a write-combined mapping of RAM: memremap attempted on ram 0x00000103fff70000 size: 0x4000 aurora 292400000.gpu: probe with driver aurora failed with error -12 On 7.2 the same helper chose the mapping per region: write-back for reserved RAM, write-combined for a carveout. Uat::new_adopted() still does that on 7.3. Add Uat::new_adopted_ram_with_user_upper(), which makes the same per-region choice and keeps the caller's choice of user upper half, and use it for the M3 runtime. The M4 caller keeps the write-combined constructor; no other backend calls either. Seen on a J613 with a 7.3 kernel on the m1n1 1.6.1.aurora23 handoff. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com> Signed-off-by: Scott Jones <scottajones@gmail.com>
DRM_ASAHI_M3_T8122 depended on DRM_ASAHI_G15 only because the T8122
runtime adopts the firmware's UAT with the G15 backend's handoff
helpers (g15::uat::Window and g15::memory_mode). Turning the M3 Air on
therefore also turned the G15 backend on for M3 Pro/Max.
Split the adoption out behind a hidden DRM_ASAHI_UAT_ADOPTION, selected
by both options:
- without G15, g15/adopt.rs builds only g15/{uat,regs,hw}.rs (no probe,
no driver registration); what in them needs G15's Config or ADT
(adopt(), Window::new, Regs::identity and the T6030/T6031 tables) stays
under G15;
- the RAM helpers memory_mode needs move from g15/glue.c to
g15/uat_glue.c, so the runtime doesn't take glue.c's display helpers;
- M3_T8122 now states its own dependency on APPLE_PMP, whose PMP votes
the runtime calls directly (before, it was implied by nothing);
- the mmu and pgtable items the runtime uses (the adopted
Uat, with_tracked_status, read_user and point-of-coherency cleaning)
are built with UAT_ADOPTION instead of G15.
G15 selects UAT_ADOPTION, so every configuration that builds today is
unchanged: off, G15 only and G15 with T8122 give the same warnings as
before, and M3_T8122 alone now builds without warnings. The asahi-g15
selftest reads the helpers from their new file, and the g15-zero-words
test pins the new hw.rs (its separate T6030 table pin is unchanged).
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Signed-off-by: Scott Jones <scottajones@gmail.com>
(ported from commit 9dff537 on omacom/linux-aurora)
[7.3 base: G15 keeps this base's "default y" and selects the new option. The
base builds what the runtime shares with G15 under "G15 or G16" and keeps
the point-of-coherency cleaning unconditional, so the mmu and pgtable gates
become "UAT_ADOPTION or G16" and gain no new #[cfg] on clean_poc. The
module is aurora.ko here. g15-zero-words-tests pins hw.rs after the test's
own normalisation. Built with G15 and T8122 (same warnings as before) and
with T8122 alone: that builds, and none of its dead-code warnings is in
g15/, m3/, mmu.rs or pgtable.rs. Not run on hardware.]
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
The board record no longer has a base_edid member on integration/aurora, so the J504 case from the T8122 runtime series stopped building once both met. The remaining J504 checks are unchanged. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
On macOS 27.2 iBoot loads the M3's G15G firmware as __TEXT, __DATA and a 32 KiB __DATA_SHARED_RO right after __DATA. The boot loader describes that as apple,m3-handoff-version 2: three segment VAs, flags <1 0x10 0>, and fw-data covering __DATA and the read-only tail. Accept that description in the resource reader and record the size of the read-only tail. Version 1 is unchanged. Nothing downstream admits a version-2 image yet: no known firmware layout matches it, so the probe still stops at the layout check, before any mapping. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
The M3 (T8122 G15G) firmware that macOS 27.2 boots speaks the Extended interface of 26.6.2 with the 26B123 InitData family: bigger objects, moved words, a 60-slot register map, a different start and wider work records. Add it as Profile::Extended27 next to Extended (26.6.2), taken from the admitted image only (the next commit admits it): no module parameter, no global, no board check. Every Extended path keeps running for it through Profile::extended(); what differs is keyed on Profile::v26b123(): - InitData objects: main configuration 0x2788, Globals 0xe4c, power 0x698, firmware-data control 0xedd0 and performance 0x6c48 bytes; the runtime's performance-object pointer at +0x479 (16 bytes later); the firmware-control words 0x1e0 later; the consumed-generation word stays the last u64 of the control object; the root's InitData version. - Power images: the 26.6.2 images moved by the 26B123 runs (the same InitData family as G16 26B123, see its V26B123 layout); the register map at its 26B123 positions (slots 0-7, 9-20, 22-24 keep their numbers, 26-43 move up five, the others have no position and are not mapped); main +0xfa0 empty and +0xfa8 the host crash-copy buffer size, with the retention table at runtime +0x2c8; the four power-up words at the performance object +0x9c (as G16 26B123); two performance-object words this family adds, +0x2f34 and +0x6ac8, 1 as the G14 27.2 path sets them in the same object; the words the 26.6.2 build writes in the power-control image (+0x10..+0x14c: average power, FastDie, PPM, SE enable) at the same positions (with them zero the GPU stays at its lowest clock; carried, it reaches its top states); real per-state values. - Machine values: the crash-copy buffer size (apple,coredump-copy-buffer) and the FastDie target (apple,fast-die0-target) come from the boot loader, which copies them from this Mac's ADT; the FastDie release is the existing apple,fast-die0-release-temp. Without them the 27.2 GPU is not started. - The performance object's shared3 block (HwDataShared3, at +0x62ac; the G14 27.2 path fills its table at +0x62b8): its state word (shared3_unk, a performance-state index) is set above every state, to the DT state count. With the block all zero the firmware never takes the first device-control records. T8122 has no shared3 table (shared3_tab is empty, as upstream), so the table stays as the 26.6.2 build leaves it. - Start: the host block at SGX+0xd60000 zeroed in the G16 26B123 order and its ready word raised before the endpoints start; nothing staged on device control before the root; the host log buffer (crash-copy size) on the crash-log endpoint; the root; the device-control doorbell; then IMPORT_GLOBALS (0x35) and START (0x0a) behind one write-index update with the SGX generation word, retired by the firmware, then READY. No Register or Idle controls follow. This is the order the J615 runs passed with; it differs from G16 26B123, which stages a NOP and posts the pair separately. - No PMP link or vote on the 27.2 start (as on G16 27.2); the 26.6.2 start keeps requiring its PMP supplier. - RTKit: the 27.2 firmware places its own buffers; an operations type with COPROC_PLACES_BUFFERS serves only that profile, so 14.8.3 and 26.6.2 keep today's RTKit behaviour. - PPL: the 27.2 firmware exchanges PPL magic version 3. - Work records: the binding generation of TA, fragment and compute commands is a u64 (completion, auxiliary and target fields +7), the compute command caches 0x8e0 bytes, and the queue-info header is 0x80 with the scheduling context at 0x78 - the G16 25G83 -> 26B123 record deltas, which apply one for one since the G15 26.6.2 records equal the G16 25G83 ones. Host tests: the 26B123 power images (moves, positions, machine values, state word, refusals) in test-m3-power.py, and the 26B123 record encodings in the m3 runtime tests. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Admit the T8122 C0 image the macOS 27.2 boot chain loads, on the 27.2 interface of the previous commit: its TEXT/DATA layout as the version-2 (three-segment) handoff gives it (TEXT 0x64000, DATA 0xb4000 plus DATA_SHARED_RO 0x8000), its GKTS/ECAP-normalized TEXT hash, boot table and RTKit version (measured on the J615, stable over three boots), and the InitData version it accepts. That version was measured too: with it the image comes up; with the G16 26B123 version, with 0x0391, 0x0393 or 0x0395 in the field where the two differ, or with the 26.6.2 version, the firmware faults right after the root is sent and never reports ready. apple,firmware-compat <27 2 0> from the boot loader selects the candidate; admission is still the measured hash, the handoff and the identity checks. There is no board check: every T8122 Mac that boots this image gets it. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
The 27.2 interface adds the PPL magic version 3 constant to g15/hw.rs and a third interface profile, Extended27. Pin the new hw.rs bytes in the G15 zero-words test (the T6030/T6031 tables are unchanged) and give the queue-priority test's stand-in Profile the new variant and its extended() helper, so both tests build the production code again. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
…patible
apple_pmp_report_wait_supplier_ready() chose the T8122 14.x wait with
of_machine_is_compatible("apple,t8122"), and the wait repeated that
machine check next to the supplier check. The supplier's compatible is
what identifies this PMP, so dispatch on it instead: a supplier that is
an "apple,t8122-pmp-v2" takes the T8122 wait, every other supplier the
T6030 one, which keeps its own checks. The wait no longer looks at the
machine at all.
The host test follows: a T8122 PMP graph is now accepted whatever the
root compatible says, a T6031 supplier on a T6030 machine is still
refused, and the identity mutant keeps the supplier in use so it builds.
Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
…e GPU over The T8122 runtime started by default, and registered its render node, only on a fixed list of boards (T8122_BOARDS: J613, J615, J504). The list stood for "a Mac on which the boot loader runs the G15G firmware for Linux". The device tree already says that: the boot loader puts its description of the firmware it loaded (apple,m3-handoff-version and the apple,firmware-segment-* properties) on the GPU node, and only when it hands the GPU over. Resource admission already refuses a GPU node without it. Select the default from that description instead of the board list: m3_board::handed_over() checks the GPU node for it, and the render-node default (asahi.m3_expose=auto), the backend choice and the start default (asahi.t8122_start omitted) use it. A T8122 Mac whose boot loader does not hand the GPU over gets no render node and no start, as an unlisted board did before; one whose boot loader does is admitted by the same resource and firmware checks as the Airs. Drop T8122_BOARDS, Soc::validated_boards and the test that pinned the list. The 26.6.2 interface choice (profile_for) is unchanged. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
Still needed: fix the host-tests failure (the Profile::extended() fixture), post the J615 rows on this head, and add J613 and J504 rows. It also carries #2147, which has to land first with its board list (T8122_BOARDS, t8122_admission.rs:11) replaced and its commits re-committed with a human Signed-off-by only, since several carry Co-Authored-By or Assisted-by trailers. |
|
Adversarial review of
Next steps: (4), the crash-log page-count bound and the PMP-link message are local fixes. (3) needs the 27.2 positions of that block, from a public layout or a contained A/B on the J615 before it lands. (1) and (2) need machine-sourced values, or a firmware path that runs without them. Until then this stays draft, and the J615 keeps its current default. Full findings (blockers, should-fix, what passed)Blockers as above, with file:line: Should-fix:
Passed: no new machine-compatible checks, board compares or board tables (the PR removes one Assisted-by: LLM (Claude:Opus 5.5) |
DjDeveloperr
left a comment
There was a problem hiding this comment.
Adversarial §1–§6 review at d1eb3e07413fc0fddc5b5b5af8e76e67287eb715: REQUEST_CHANGES (PR is Draft and not ready for MERGETRAIN-LINUX4).
What Passed Audit
- CI: 8/8 checks green (
dt-checks,host-tests,SEP source checks). - PMP wait dispatch (
91f3950f,drivers/pmdomain/apple/pmp-report.c:703-751): Replacingof_machine_is_compatible("apple,t8122")withof_device_is_compatible(supplier->of_node, "apple,t8122-pmp-v2")removes a SoC gate cleanly. Ref-counting (of_node_get/of_node_put), unique-report checks,CONFIG_APPLE_T8122_GPU_PMP_LINKscoping (and KconfigAPPLE_PMP->select APPLE_PMP_REPORT), and timeout/error propagation viaapple_pmp_report_wait_ready()are sound. Non-T8122 SoCs (native25 / T6030 / T6031 / T8132 / T8140) keep their exact existing paths. - Bootloader handoff gating (
d1eb3e07,m3_board::handed_over()): DroppingT8122_BOARDS/Soc::validated_boardsin favor ofSEGMENT_PROPSon the GPU node is the right §1 direction. Boards without a bootloader GPU handoff fail closed cleanly (expose_render_node= false,t8122_backend= false,start_for_board=Start::Off, andadmit()refuses with-ENODEV). No regression on non-T8122 SoCs. - Ryan's 8 commits after
Merge #2147: Human author/committer + humanSigned-off-by:only, zero AI trailers; J615 default-cmdline hardware row passes cleanly.
Hard Blockers (§1–§5)
- §4 Clean-room & attribution — 11 carried
#2147commits contain forbidden AI trailers/co-authors:- Because
#2147is still OPEN (not merged intointegration/aurora),Merge #2147(22da1711) carries 11 commits withCo-Authored-By: Claude ...,Assisted-by: Claude:..., and/orGenerated-by: LLMtrailers (daec11fd,35bf7a18,147001c3,24e790b1,66f845e1,3749fdbe,1cb77d66,4e742a9f,de895c58,15c5d4d0,98897fac). Under §4, commits must carry human identity and humanSigned-off-by:only.#2147must be cleaned up and landed separately first (or rebased cleanly without AI trailers in commits).
- Because
- §3 Safety — Hardcoded/guessed FastDie thermal limits & PPM power budget on the new 27.2 path:
- FastDie (
m3_power_26.rs:331, 337, 462, 502-503;hw/mod.rs:617):relocate_26b123()writes the ADTapple,fast-die0-targetonly intopower +0xc8. The performance object still carries hardcoded8_000(80°C) and11_000(110°C) literals (relocated to+0x2280/+0x22d4), andpwr.fast_die0_release_tempfalls back to a hardcoded kernel default of80inhw/mod.rs:617whenapple,fast-die0-release-tempis absent from DT (check_boot_loader_powerdoes not require it). §3 forbids guessed thermal constants and fallback defaults. - PPM power budget (
m3_power_26.rs:128, 235, 258, 290, 292, 297, 359):let budget = 22_044u32is carried verbatim onto the new 27.2 path. WithT8122_BOARDSremoved, any T8122 Mac (fanless J613/J615 Air, fanned J504 MBP, or desktop J433/J434 iMac) whose bootloader hands over 27.2 firmware receives this hardcoded budget.
- FastDie (
- §2 Correctness — Silent dropped ranges in
relocate_26b123()(m3_power_26.rs:229, 400-409, 471-482):mainrelocation skips0x25b4..0x2600, silently zeroing the0xffblock written atmain.0[0x25b4..0x25e4](line 229).performancerelocation skips0x2d08..0x2f08, silently zeroing the 10-word controller block written at0x2e2c..0x2e78(lines 400–409). Neither gap is checked bytest-m3-power.py.
- §2 Production-ready — Magic sleep, silent timeout, and bitfield overflow in
boot_26b123()(m3_runtime.rs:1344-1365):- Crash-log page-count overflow (
m3_runtime.rs:1345-1346,m3_power_26.rs:465):relocate_26b123()admitscrash_copy_bytes <= 0x10_0000(256 × 4 KiB pages =0x100), but(0x9u64 << 52) | (pages << 44)only has an 8-bitpagesfield (bits 44..51). Because bit 52 is already1in0x9,pages = 0x100silently wraps the encoded page count to 0 while preserving type0x9! Boundcrash_copy_bytesto the field width (<= 0xff000, or verify page-size unit). - Magic delay & silent timeout (
m3_runtime.rs:1348, 1358-1364): Unconditionalfsleep(Delta::from_millis(2))over a race violates §2; the 20 msudelay(5)busy-spin loop silentlybreaks on timeout and continues sending0x0083_0000_0000_0010instead of failing cleanly or sleeping/polling properly.
- Crash-log page-count overflow (
- §2 / §3 Refusal order (
m3_runtime.rs:1064-1104,m3_config.rs:635-643):- Missing
apple,coredump-copy-bufferorapple,fast-die0-targetis only checked inExtendedStorage::new()(Config::newatm3_runtime.rs:1098) — afterFIRMWARE_STARTis permanently latched (claim_startat 1064), ASC is started (1081), RTKit endpoints are opened (1088–1091), and UAT/PPL v3 is adopted (1097). Validate these DT properties before latching or touching ASC (e.g., inContents::extended()/admit()).
- Missing
- §1 Model gating in carried
#2147commits & §5 Hardware evidence:- Carried
#2147commits add new board-gated entries not yet onintegration/aurora(machine_is(ctx, "apple,j504")iniomfb_v14_7.c:1723, and per-board duplicatecd05/4118rows ing15/hw.rs:177-240). - §5 hardware coverage is incomplete across affected boards: J615 (27.2) passes on default cmdline, but J613 (14.8.3/26.6.2/27.2), J504 (newly enabled by carried
#2147+d1eb3e07), and T6030 regression rows for the carried#2147changes are still unrun. PR also remains a Draft.
- Carried
Should-Fix / Non-blocking Items
m3_config.rs:483-502(post_boot_pair_26b123): does not check that the ring is idle orw < SLOTSbefore writing ((w + 2) % SLOTScan also overflowu32ifw >= u32::MAX - 1).agx_resources.rs:629/m3_firmware.rs:Resources::shared_ro_sizeis parsed and stored for handoff v2 but never validated inFirmware::matching_layout()(so a v1 handoff withdata_size == 0xbc000andshared_ro_size == 0, or a wrong DATA/RO split, is not distinguished).m3_device.rs:62-78: on 27.2 when the DT does carryapple,pmp,let pmp = has_pmp_link(pdev) && !v26b123;logs"M3: no apple,pmp link; GPU power is left to its power domain"— misleading when anapple,pmpproperty is present and intentionally bypassed.tools/asahi/t6030-pmp-supplier-tests.py:49-50:CONFIGStests(0,0),(1,0),(1,1)with a stale comment sayingDRM_ASAHI_M3_T8122depends onDRM_ASAHI_G15; commit98897facremoved that dependency, so(0, 1)(T8122withoutG15) should also be covered.m3_runtime.rs:1323-1334: 12 consecutive stray blank lines aboveboot_26b123().- Bisectability:
db72f0defixeshost-teststwo commits after92f63b4c; fold into92f63b4cwhen preparing the non-draft series. - §6 Naming: carried
#2147commit15c5d4d0mentionsm1n1in its commit message (historical; Ryan's 27.2 commits properly useauraandBorealis).
Assisted-by: LLM (Gemini 4 Neon)
Problem
On an M3 MacBook Air booted from a macOS 27.2 volume, the boot chain loads the 27.2 GPU firmware (InitData family 26B123). The m3 runtime only knows 14.8.3 and 26.6.2, so it refuses the GPU. There is no render node, and GNOME falls back to software rendering, which makes the desktop very slow.
Change
T8122_BOARDSandSoc::validated_boardsare gone.of_machine_is_compatible("apple,t8122").It carries #2147 unchanged, merged in as the first commit, because without its RAM-adoption fix the probe fails with -12. The three review points raised on #2147 are fixed here in separate commits: the J504
base_edidKUnit check (commit 2), the board list (commit 9) and the machine-compatible PMP wait (commit 8). So this PR can land on its own, with #2147's commits and authorship kept. The GPU node is enabled on 27.2 by aurora-silicon/aura#448, which also exports the two ADT values. Without that aura change, the GPU stays disabled as it is today.Testing
On a J615 (M3 Air 15", 10-core G15G C0, macOS 27.2 firmware), with the default fleet command line and no module parameters:
d1eb3e07on the fleet79-derived J615 test kernel (7.3.0-aurora-g15g272c, sourceb329fce53908a2ba6384f8326de8a3963b117741; the last two commits have the same stable patch IDs as here), with the saved Stage 2: GPU firmware ready at 1.562 s, renderD128, GNOME on the GPU, all six firstlight stages passed (10-minute soak, GPU die peak 69.8 C, 0 GPU crashes), glmark2 terrain 47 FPS, vkmark 1997. The boot had 0 SELinux AVCs, 0 failed units, 0 oops, and exactly the same set of error-level kernel messages as the saved J615 default.c1e39c94c63a9df90e2d4e61811320cbfe000807) passed all six firstlight stages and ran at 47 FPS in glmark2 terrain. A boot of that kernel with Stage 2f413294d96b76fbbad4dfc9445cfaf87e5de4592started the GPU at 1.548 s and created renderD128. That boot had 0 SELinux AVCs, 0 failed units, 0 oops and 0 new kernel errors against the saved J615 default.d1eb3e07: full bounded host suite 458/459. The one failure is the existing PMP-floorclass-twicemutation fixture: GCC 16.1.1 under -Werror rejects the injected variable, and the fixture is unchanged by this PR. The queue-priority test that failed CI at13cfe7a5, the G15 zero-word tests, the PMP supplier tests (34/34 variants) and the m3 tests pass. Earlier head: m3 runtime 89/89, m3 firmware 23/23, batching 12/12, stamp 3/3, test-m3-power 5/5 (two 26B123 tests: moves, positions, machine values, state word, refusals), m3 uapi/mailbox/stamp-admission pass.Still to run
dEQP-VK.spirv_assembly.instruction.graphics.float16.logical.opfordequal_vector_geom(VK-GL-CTS 1.4.7.1, first run, one process) and a 500-case KHR-GL46 sequence ending atKHR-GL46.shader_storage_buffer_object.basic-operations-case2-cs(that case alone passes). Both end in a failed job, and the M3 backend then fails every later job until reboot. Recovery after a job fault is not part of this series; the fault cases need a root cause.Follow-up: drm/asahi: m3: let queued compute submissions share a firmware batch #2849 lets queued compute submissions share a firmware batch. On this J615 that takes compute.light at depth 8 from 395 to 174 us per submit, with 0 firmware errors and CTS compute unchanged. The completion-poll backoff and the firmware idle-off standby were measured and ruled out.
Per-job latency numbers (J615, gpubench ae90a40, fleet kernel carrying this head)
Where each 27.2 value comes from
V26B123): G15 26.6.2 and G16 25G83 share the same records, and G15 27.2 and G16 26B123 share the same InitData family0xedd0 - 8)HwDataShared3(unk_8=HwConfig::shared3_unk, a performance-state index). The G14 27.2 path (#2544) fills the table of the same block at +0x62b8 in the same 0x6c48 object. T8122 has no shared3 table, so only the state word is set, above every state. If the whole block is left at zero, the firmware never takes the first device-control recordsgpu-fast-die0-target88 C andcoredump-copy-buffer0x8000 on this J615), through auraPer-commit notes
drm/apple: v14-board-test: drop the J504 base_edid check: drm/asahi: T8122: run the M3 runtime as on 7.2, and admit the J504 #2147 removes the field this test read.drm/asahi: m3: read the three-segment (version 2) firmware handoff.drm/asahi: m3: test the Extended interface through Profile::extended(): mechanical, no behaviour change.drm/asahi: m3: add the 27.2 (26B123) firmware interface:Profile::Extended27, keyed onProfile::v26b123(). Everything that is the same as 26.6.2 runs throughProfile::extended().drm/asahi: m3: admit the T8122 C0 27.2 firmware.tools/asahi: follow the 27.2 interface in two host tests: pins the new hw.rs bytes and gives the queue-priority stand-inProfilethe new variant (the CI failure at13cfe7a5).pmdomain: apple: pmp-report: pick the T8122 GPU wait by the PMP's compatible.drm/asahi: m3: start the T8122 runtime where the boot loader hands the GPU over.Assisted-by: LLM (Claude:Opus 5.5)