Repository navigation
Rebase onto Asahi 7.2.10: one kernel carrying integration/aurora and aurora-wip - #139
Conversation
The user-subpage pool, owner and retired-mapping frees, the BPF pin release and the VFIO ioctl test worker are queued on system_unbound_wq, which is deprecated in 7.2: the first item queued on it logs a warning once per boot and hides any later user. Queue them on system_dfl_wq, the same unbound queue under its current name. Ordering, references and teardown are unchanged. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
…command encoders) Carry only the M3 TA and 3D command encoders, m3_tiler_command.rs and m3_fragment_command.rs, and the render geometry and state helpers they use, agx_render.rs and agx_render_state.rs. The encoders were held out of the earlier M3-only splits because they share files with the held G15G register-list change; they are carried now so that it can follow. The backend is compile-only: nothing constructs a command, and no G13/G14/G17 path or UAPI is changed. [ryan: adapted to 7.2.10 — minimal, pending DJ review: isolate these modules under m3 (crate:: becomes super::). The encoders are as of the second source commit below, which also holds their origin in the first, without the depth-compression bindings that Eryk Wieliczko added before it; those are carried next under their own authorship. The state helpers are as of the third source commit. No runtime integration is claimed by this split.] Source: commit bbefc95 ("drm/asahi: add the M3 (G15S) GPU runtime") Source: commit 91fd07a ("drm/asahi: excise unbound G16 and G17 runtimes") Source: commit 65c2a80 ("drm/asahi: remove unused backend helpers and narrow layout visibility") Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Populate native ZLS metadata registers and spill mirrors from the existing GPUVM-validated UAPI. Retain rejection of stencil compression and compressed multisample/layered jobs. Native 26A428 register snapshots identify the field locations; the opt-in single-layer D32 Minecraft replay renders pixel-identical frames on M3. All nine serializer tests pass, including the sixteen unchanged whole-command fixtures. Broader Mesa compression qualification remains separate. [ryan: adapted to 7.2.10 — carry only the 3D command encoder hunk, now under m3/; the GPUVM/UAPI side of these bindings stays with the M3 runtime port] (cherry picked from commit a8b0d26998992c1db4f3bb8092c7bd405fbf2c1d on Eryk Wieliczko's eryk_m3_gpu branch; driver changes only, lab tooling omitted) (cherry picked from commit 217822c) Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
modpost warns that scan_timeout_test.o has no MODULE_DESCRIPTION() when the brcmfmac KUnit tests are built as a module. Add one. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
modpost warns that dcp-fabric-test.o has no MODULE_DESCRIPTION() when the fabric tests are built as a module. Describe it like the other DCP test modules. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
[ryan: adapted to 7.2.10 — the M3 probe arm refuses before resources; replace its pending-provenance T8122 refusal with this read-only identity gate in m3::refuse_probe() and keep -ENODEV; Core gains its 7.2 lifetime; of_node_put() is called only with CONFIG_OF_DYNAMIC, as in kernel::of::Node] (cherry picked from commit 5b89559a4f424bf2ce5dcdd71ea572e86e770ec0 in iconidentify/m3-linux air/t8122-g15g-admission) [Adapted to aurora-linux: driver.rs has no T8140 path here, so the T8122 gate is the first check in refuse_agx3_probe().] Signed-off-by: Chris Kearney <303316+iconidentify@users.noreply.github.com> Claude-Session: https://claude.ai/code/session_01FwdG63dRaMrRbYrUBkSa1i (cherry picked from commit 8b20dce) Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Take register windows, IO mappings, UAT geometry, runtime HwDataB words and optional userspace features from the admitted SoC. Preserve the T6030 mapping tables and configuration words. Reserved UAT tables require the registered 42-bit hardware configuration. Describe the T8122 C0 firmware layout and check its OPP table using voltage-sorted primary and secondary frequencies. Leave missing T8122 hardware, IO and setup values unset so startup remains disabled. Require the SMC die thermal zone for every T8122 board without widening board admission. Validate IO ownership, range bounds and firmware entropy-tag bounds before mutation. Add host tests for admission, OPP shape, IO ownership, firmware layouts and thermal-zone requirements. [ryan: adapted to 7.2.10 — the rest of this change is carried as an M3-only split; carry the held-file remainder: the operating-point shape check of t8122_admission.rs, the compile-only subset of the per-SoC table (SoC names and HwDataB words, with G15RuntimeHwDataB kept M3-local instead of in the shared initdata.rs), and the host-test entry limited to the carried modules] Signed-off-by: Chris Kearney <303316+iconidentify@users.noreply.github.com> (cherry picked from commit 88e5636) (cherry picked from commit b2a9b8f) Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
The G15G firmware takes G15S's compute register list without its last two entries (0xa599, 0xd411): the same 20 registers in the same order, the same 12-byte entries at +0x20, count and length at +0x728 and the same control word. Add a per-SoC RegisterSet and send the G15G list on T8122. The T6030 list is unchanged. [ryan: adapted to 7.2.10 — carry the compute command register lists and the per-SoC register set into the compile-only m3 modules; the Compute job and runtime call sites (m3_compute.rs, m3_runtime.rs) stay with the M3 runtime port] (cherry picked from commit 42f5431f326dd25ccb4185593f2dc934386ab077) Signed-off-by: Chris Kearney <303316+iconidentify@users.noreply.github.com> Claude-Session: https://claude.ai/code/session_01GWRhUgND1qhew6aEd6vsj8 (cherry picked from commit 84e3461) Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
The G15G firmware takes G15S's TA register list without 14 of its registers and the 3D list without 4; the rest keep the G15S order and entry layout, and the TA/3D command and microsequence layouts are G15S's. Encode the G15G lists on T8122, from the SoC's RegisterSet. The T6030 lists are unchanged. [ryan: adapted to 7.2.10 — carry the TA and 3D command register lists into the compile-only m3 encoders; the Render job and runtime call sites (m3_render.rs, m3_runtime.rs) stay with the M3 runtime port] (cherry picked from commit a1ba5a7da2abcb516987ebb9cafc7f957abb66b8) Signed-off-by: Chris Kearney <303316+iconidentify@users.noreply.github.com> Claude-Session: https://claude.ai/code/session_01GWRhUgND1qhew6aEd6vsj8 (cherry picked from commit 8231fa3) Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
The G15G firmware takes T6030's runtime HwDataB configuration words and unit masks except for four words: +0xa2c is 2 (the chip revision's major number), +0xb20 is 0x0a (ten core slots, where T6030 has twenty), +0x17b8 is 4 and +0x1818 is 0xffffffff. Give the T8122 table those words, and the T6030 unit masks, 0x700000003 and 0x7. The T8122 start experiment now uses the table's words. Its unit-mask defaults become the table's masks; before, the knobs refused mask A's second bit, which the G15G firmware runs with. The T6030 words are unchanged. [ryan: adapted to 7.2.10 — carry the T8122 HwDataB words into the compile-only per-SoC table; the start experiment and its unit-mask defaults (t8122_start.rs, t8122_knobs.rs) stay with the M3 runtime port and still need this table change] (cherry picked from commit 562b15fac35243fc15b3d66e3cfc36b1b47dd9af) Signed-off-by: Chris Kearney <303316+iconidentify@users.noreply.github.com> Claude-Session: https://claude.ai/code/session_01GWRhUgND1qhew6aEd6vsj8 (cherry picked from commit 330a560) Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
A word-by-word comparison of the T8122 InitData that the runtime builds from a J613's device tree against a J613's working InitData shows the same voltage, frequency, IO-mapping and controller words, and a short list of configuration words where the G15G firmware runs with other values than the shared builder writes: - HwDataB +0xa30 and +0xa34: 0 and 4 (the builder writes 1 and 0); - HwDataB +0x17e0..+0x1860: the G15G flag words (the builder writes the T6030 ones, 1 at +0x17e8, +0x1804, +0x1814 and +0x1860 and all-ones at +0x1848); - HwDataA +0x11e0, a shader-engine controller word: 30 (40); - HwDataA +0x1290: 125, and HwDataA +0x424c: 24000000, the 24 MHz reference clock (both 0); - Globals +0x9bc: the CDM backoff timeout 4 with the next three bytes 0 (the builder writes a 1 after it); - the Globals smart idle-off curve and count, which the T8122 hardware configuration left empty: the T6030 values. Give the SoC table per-object word lists and the T8122 values. The words are SoC configuration, not per-Mac values. T6030 has empty lists and its hardware configuration is unchanged. [ryan: adapted to 7.2.10 — carry the T8122 HwData and Globals word lists into the compile-only per-SoC table; the InitData builder writes (m3_adt_config.rs) and the smart idle-off curve of the T8122 hardware configuration (hw/t8122.rs) stay with the M3 runtime port] Signed-off-by: Chris Kearney <303316+iconidentify@users.noreply.github.com> Claude-Session: https://claude.ai/code/session_01GWRhUgND1qhew6aEd6vsj8 (cherry picked from commit a0fe58a) Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
[ryan: adapted to 7.2.10 — the rest of this change is carried as an M3-only split; carry its held-file remainder, the named flush-stamp offsets of the TA and 3D command encoders] Signed-off-by: Chris Kearney <303316+iconidentify@users.noreply.github.com> (cherry picked from commit 179d09e) Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Write the tiler sequence length at 0x778 and the fragment sequence length at 0x1c. Share those offsets with the command encoders so optional measurement packets preserve both command pointers and all other descriptor fields. [ryan: adapted to 7.2.10 — the rest of this change is carried as an M3-only split; carry its held-file remainder, the stage-specific sequence-length offsets of the TA and 3D command encoders] Signed-off-by: Chris Kearney <303316+iconidentify@users.noreply.github.com> (cherry picked from commit 6ea5927) Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
On an M3 MacBook Air (T8122) with the G15 14.8.3 GPU firmware, the GPU start stalls at the first device control: the 0x13 acknowledgement times out and the probe fails with -110. It did so in every boot reported in omacom/linux-aurora#26. The start succeeds when the 20-word block at HwDataA +0x418c..+0x41db holds these little-endian u32 values, with nothing else changed: 1, 500, 5, 12500 x5, 3000 x3, 12500 x8, 1 The values are not in the device tree. The range is covered by the G13-era core_leak_coef[4..8], sram_leak_coef and aux_leak_coef fields, which the G15 builder leaves at zero on T8122; the values are integers, not floats. Compile-time asserts tie the block to exactly that range. Write the block when the runtime backend builds the InitData on T8122 with the 14.8.3 firmware. Add asahi.t8122_hwdata_418c (0 or 1, default 1, read-only in sysfs): 0 leaves the range at zero for an A/B comparison; any other value is rejected and the default stays. One kernel log line says which applied. Other SoCs, the T8122 26.x (G16) path and T8122 boots without asahi.t8122_start=1 are unchanged. Tested on hardware (omacom/linux-aurora#26), with local builds that set the same 20 words at the same offset: - J613, 10 GPU cores, GPU firmware 14.8.3: the GPU starts, the first compute and render jobs complete, and OpenGL and Vulkan readback pass. The same kernel with the block off stalls at 0x13 again. - J613, 8 GPU cores, same firmware: the GPU starts, OpenGL and Vulkan readback pass, and Hyprland renders on the GPU. This commit itself has not been booted yet. J615 on the 14.8.3 firmware has not been tested. Add host tests (tools/asahi/m3-runtime-tests.rs) for the values, their exact placement with every other byte unchanged, a short buffer, and the parameter parsing. [Chris Kearney: rebased onto integration/aurora; comments, a test name and the log line reworded to describe what the code does] [ryan: adapted to 7.2.10 — carry the HwDataA +0x418c block (t8122_hwdata.rs) and its host tests into the compile-only m3 modules; the InitData write, its layout asserts (m3_adt_config.rs) and the asahi.t8122_hwdata_418c parameter (m3_params.rs) stay with the M3 runtime port, so no module parameter is added for other GPUs] Signed-off-by: Satya Benson <satya@benson.earth> Signed-off-by: Chris Kearney <303316+iconidentify@users.noreply.github.com> (cherry picked from commit 0d51a40) Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
…e driver PHY_APPLE_ATC_KUNIT_TEST is a bool that builds the tests "into the driver", and it allows KUNIT=m when the driver is a module. The Makefile, however, adds atc-tunnel-test.o and atc-t8122-dp-test.o as objects of their own under that bool. They are therefore built into vmlinux while KUnit is a module, and the link fails with undefined kunit_binary_ptr_assert_format and __kunit_abort, as with the Fedora configuration (KUNIT=m, PHY_APPLE_ATC=m). Include both files from atc.c next to atc-test.c instead, so that they are built wherever the driver is, as the option says. Drop their own module metadata, which the driver already provides. The tests came with commit 2421d71 ("phy: apple: atc: add KUnit tests for the T8122 DisplayPort helpers") and commit c30adcc ("thunderbolt: apple: Qualify display tunnels by connector wiring"). Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
The integrated RTKit receiver dispatches the debug endpoint and acknowledges admitted channel-zero OSLog counters outside the Neo/M5 and synchronous-log policies. The host fixtures still describe the older opaque-only receiver, so oslog-events and ordered-rx fail before exercising their controls. Extract the current OSLog constants and observe counter acknowledgements, channel admission and the platform no-ACK policies. Add the debug endpoint, policy field and receiver stub to the ordered-RX fixture. Keep its threaded reply-progress and deferred-dimensions assertions intact, and retain support for the legacy receiver used by the 7.2.10 topics. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
DEBUG_WW_MUTEX_SLOWPATH can make an atomic state lookup return -EDEADLK. The resume fixture asserts on that expected retry result while holding modeset locks. KUnit then aborts the test thread with those locks held, and teardown cannot make progress. The lockdep lane reaches this in the fourth resume test even though the ordinary lane passes. Build both the initial scanout and the DPMS-off transition through one helper that releases each partial atomic state, backs off and retries. Always finish the acquire context before returning to a KUnit assertion. Keep all four resume controls and their framebuffer ownership checks. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
A dock can detach and reattach while userspace is still processing the old connector loss. On M1/M2, that stale CRTC disable released the already-starting replacement DPTX session. Firmware then dropped the sink while the CRTC-off gate suppressed relink recovery, leaving only USB2 and the dock billboard device. Apply the existing replacement-session ownership check to every Type-C output, and refresh the CRTC token after a successful modeset so later intentional DPMS still releases the current link. Cover the stale-disable and ordinary-DPMS sequences with a source-extracted host fixture. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
cd321x-pm.h now carries cd321x_dp_send(), which takes u32 arguments and which the probe units do not call. The host units drop <linux/types.h> and build with -Werror, so typec-probe and probe-mux-pm-dispatch stopped compiling once the header gained it. Give the host copy of the header a u32 typedef and mark cd321x_dp_send() unused there. The header and the units' checks are unchanged. [ryan: integration fix for the unified assembly: the header change comes from 170-usb, the host units live here] Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Fifteen call sites queue DCP work on system_wq or system_unbound_wq: the backlight fade, the swap watchdog, the external stop retry, the IOMFB command timeout and backlight retry, the DCPEXT scanout, repattern and desktop work, the iBoot endpoint query, and the link idle work of the v14.7 and v26.6 interfaces. Both queues are deprecated in 7.2. The first item queued on either logs a warning once per boot, as dcp_backlight_fade_work does on J700, and hides any later user. None of these workers needs the CPU that queued it: each takes the DCP or link state through its own locks and references. Queue them all on system_dfl_wq. For the work that was on system_unbound_wq this is the same unbound queue under its current name. The host selftest shim that compiles dcp_external_stop_retry() declares the queue it names, so rename it there too. Keep the delays, coalescing, cancellation and teardown unchanged. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
On one J700 boot in 29 (0ab402d0) Touch ID came up without its sensor. The first attach-time attempt had REGISTER_SERIAL accepted and then found the sensor silent when it read the session nonce. The second and third attempts power-cycled the sensor, identified it, cleared the enclave and were refused at REGISTER_SERIAL with status 0x16, and the driver gave up: "authenticated attach incomplete; capture unavailable". The Catacomb restore had worked, but nothing brought the sensor up again until a verify, which the login screen never makes. Seven other boots that day needed a second attempt. A J314s was refused the same way after a failed sequence counter init, as reported in commit 01dd28c ("soc: apple: sep: retry a failed sensor bring-up from a fresh registration") CLEAR_STATE does not end a serial registration whose session never opened, and while the enclave holds one it refuses another with 0x16. Re-registration after a completed session has not failed on an idle machine. So: - Read both sensor inputs, the serial and the nonce, before the enclave hears of the serial. A sensor that falls silent then leaves the enclave as it was. The bus sees the same commands in the same order. - When the enclave may still hold an unfinished serial registration, because a later step failed or its reply was lost, a 0x16 refusal of the new one is the enclave saying so: open the session on the one it holds instead of giving up. Only a registration this boot submitted is resumed. If the enclave refuses SENSOR_NONCE too, the attempt fails as before. - Space attach-time attempts 0.5, 1, 2 and 4 s apart, five at most and none starting more than 10 s after the first, instead of three back to back. A verify, which someone waits on, keeps three immediate ones. - If the attach still falls short, try one more round 10 s after activation, once the boot-time bring-up is over, holding the Catacomb writer lock and the capture count as a verify does, so that it never overlaps an enrol, a verify, a deletion or a suspend. It runs at most once, is put off at most three times and is cancelled at unbind. - Report the outcome in diag (ABI 2): sensor_attach (unknown, attached, retrying, not-ready) and restore (unknown, restored, empty, unproven). restore reads "restored" exactly when the driver logs "Touch ID: restored N", so userspace can wait for it rather than for the open. The retry decisions are plain functions in registration.rs. KUnit runs them against a model of the enclave that holds a serial registration across CLEAR_STATE: a silent first attempt then success, repeated 0x16 refusals then success, a 0x16 refusal of an unfinished registration resumed, and every attempt failing in both rounds, which ends in "not-ready" within the budget. tools/aurora-sep/tests/test_verify_bringup.py runs the real attach and verify methods with the new spacing. The test-only sensor_test_fault parameter stops the first authentication of a boot after REGISTER_SERIAL, so the recovery from an unfinished registration can be exercised on purpose rather than once in 29 boots. Nothing here logs SEP data: statuses, sensor states, step names and timings only. The xART store and its anti-replay writes are untouched. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
aurora-sep-ready logged "Touch ID is ready after 0 s" on a boot whose sensor attach had failed: the open of /dev/sep-bio succeeds as soon as activation is done, however far the sensor got. Decide from the driver's diag attributes instead. Ready means touchid "ready", sensor_attach "attached" and restore "restored" (or "empty", with nothing enrolled), the state in which the kernel logs "Touch ID: restored N". While the driver retries the attach, wait for it, up to 50 s from the start. Otherwise log "Touch ID is NOT ready" with the reason (the attach fell short, the fingerprints were not restored, activation failed or the keybag did not load) and fail the unit; units that only want it still start. A machine with no keybag provisioned is reported as not set up, not as a failure, and a kernel without diag ABI 2 is still handled. tests/test_sep_ready.py runs the script against synthetic diag states, including the one of boot 0ab402d0. Update the package checksums and releases. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
…session On an M1 Pro, 2 of 4 plain boots came up without the sensor: the attach-time patch failed at the sequence counter init, with the sensor silent about 1.3 s after power-on, and the driver logged "the sensor did not wake at attach; the next verify retries the bring-up". The enrolled fingerprints were never restored that boot, because nothing brought the sensor up again before a verify, and the login screen makes none. The next boots worked. The attach of these profiles made one attempt, and the spaced and late retries added for nonce-session profiles did not cover it. Give every profile the same attach: up to five attempts, 0.5, 1, 2 and 4 s apart, and the late round 10 s after activation when they all fall short, with diag's sensor_attach reporting it. An attach attempt on a profile without a nonce session stays what it was: wake and patch the sensor, without calibrating it. The restart differs. A J314s that failed the same step, as reported in commit 01dd28c ("soc: apple: sep: retry a failed sensor bring-up from a fresh registration") refused the CLEAR_STATE and serial re-registration of every later attempt for the rest of the boot, while a fresh registration recovered. So on a profile without a nonce session each attempt after a failed one, and the late round's first, starts from a fresh registration, as a reboot does. Nonce-session profiles keep clearing the enclave first. registration::retry_stage holds the decision, with KUnit cases for both profiles and for a sensor that stays silent on its first attempts. A verify on these profiles keeps its single attempt. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
…fied Topic head 7beea60, 169 commits not already in the tree. Top commit: arm64: dts: apple: j613-25g83: match the G16G GPU handoff layout
Topic head 6d6d919, 146 commits not already in the tree. Top commit: selftests: asahi: cover the T8140 QSPI window in the host fixture
…ase-wip/7.2.10-unified ad9d402 ("usb: typec: tipd: Descend into tipd/ whenever the core is enabled") fixes a link failure of asahi-wip itself with the J700 configuration. Merged ahead of its topic so that every first-parent commit of rebase-wip/7.2.10-unified links; the 170-usb merge brings the rest of that topic.
Topic head a934b23, 42 commits not already in the tree. Top commit: dt-bindings: iommu: apple,dart: allow DMA windows on all supported SoCs
Topic head 2314db8, 21 commits not already in the tree. Top commit: nvme: apple: queue controller recovery on system_dfl_wq
…unified Topic head 202286b, 48 commits not already in the tree. Top commit: soc: apple: finish the merge of DART, QSPI and SMC hwmon
Topic head 085d961, 82 commits not already in the tree. Top commit: ASoC: apple: t8140-aop-audio: queue work on system_dfl_wq
Topic head cb7bda8, 83 commits not already in the tree. Top commit: ASoC: apple: select the MAX98357A codec for macaudio
Topic head 7e1c8a0, 194 commits not already in the tree. Top commit: wifi: brcmfmac: describe the scan timeout KUnit module
Topic head 78742b7, 51 commits not already in the tree. Top commit: HID: magicmouse: document the host-driven click members
Topic head 9acd787, 382 commits not already in the tree. Top commit: tools: aurora-sep: Refresh the Arch PKGBUILD sums for XART-SAFETY.md Conflict resolved in MAINTAINERS (ARM/APPLE MACHINE SUPPORT): 060-power-thermal widens the hwmon pattern to macsmc-hwmon*.c and 100-sep moves the drivers/pmdomain/apple/ line to its sorted place; keep both, as aurora-wip has it. Unified 900 review: retain the current macsmc-hwmon*.c coverage and drivers/pmdomain/apple/ entry in the sole MAINTAINERS conflict. Keep every nonconflicting SEP entry from the three-way merge. The narrower old hwmon filename and stale removal of pmdomain coverage are not improvements. Exact base/ours/theirs blobs are recorded in MAINTAINERS.sides. Re-recorded when 010-soc added the pmp-report KUnit config line; the rule is unchanged. drivers/soc/apple/aop.rs: keep the assembled side. 070-audio's AOP service registration runs from its own registration queue behind the removal gate; 100-sep's only change there is the system() -> system_dfl() workqueue switch, which that queue already supersedes.
Topic head 2c399a1, 280 commits not already in the tree. Top commit: reset: apple-cio: build the CIO reset driver by default on Apple Unified assembly resolutions (900 lane): - include/linux/soc/apple/pmp-report.h: keep both additions. 010-soc b56195a145e5 adds apple_pmp_report_wait_supplier_ready(); 170-usb 2af69d67f3b3 (from 4336e52) adds apple_pmp_report_wait_ready(). Both prototypes and both !CONFIG_APPLE_PMP_REPORT stubs are kept. - include/linux/soc/apple/pmp.h (add/add): keep the 010-soc header. It declares the same apple_pmp_link_device() and apple_pmp_set_device_power() prototypes as 170-usb, plus their !CONFIG_APPLE_PMP stubs and the PMP driver's registration API, which 170's subset omits.
Topic head 3b8f11d, 421 commits not already in the tree. Top commit: drm/apple: do not start a T8122 dcpext the PMP has not acknowledged
Topic head 6d5b51d, 175 commits not already in the tree. Top commit: drm/asahi: uapi: use integration/aurora's wording Unified assembly: keep the current 010-soc RTKit file. The GPU topic changes only start_ep to return the send result relative to its merge base; current 010 already propagates that result and adds one retry only for an unsent -ETIMEDOUT. Retain all current OSLog Neo/M5/sync no-ACK policy, adopted session, kdebug and teardown changes. No GPU-specific RTKit delta is lost. Re-recorded (900 lane) when the current side gained apple_rtkit_flush_rx(); the resolution is still the current side verbatim.
The firmware allocates its working memory through the SHAREDMALLOC
channel, and frees it on the same channel by sending the surface's
iova. The driver acknowledges a free but keeps the surface on the gc
list, and frees that list only when the firmware stops, because the
firmware does not free everything it allocated and may still access a
surface after freeing it.
Resident firmware never stops while the driver is bound, so nothing
it frees is ever freed. On J700 every camera session allocates its
SHAREDMALLOC surfaces anew: MemAvailable falls by about 85 MB per
session, from 3.2 to 1.5 GB over 20 sessions, until the ISP's IOVA
range is used up. Then the firmware's 0x484000-byte requests fail
("SHAREDMALLOC: handler failed: -12"), IO commands time out, and
REQBUFS returns -ENOMEM because the capture buffers no longer fit in
the IOVA range. Firmware started for each stream is not affected,
since every stream ends with a firmware stop.
Handle the free request: move the surface with that iova to a list of
released surfaces, and free those when the stream stops, after the
channel has stopped and its buffers have been returned, or when the
firmware stops. Waiting for the end of the stream keeps the surface
mapped while the firmware may still be using it. Surfaces the firmware
never frees are still freed only when it stops, and a free for an iova
the driver does not know is still acknowledged. A released log or
buffer return surface is no longer used to read firmware messages.
The firmware itself stays resident, as before.
Test the free request handling with KUnit. Compile-tested and KUnit
only; not yet run on hardware.
Fixes: 16a04f7 ("media: apple: isp: Keep resident firmware running between streams")
Assisted-by: LLM
Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Topic head d58647b, 108 commits not already in the tree. Top commit: arm64: handle Apple M4+ wait state without boot flags Conflict resolved in drivers/gpu/drm/drm_gem_shmem_helper.c as in the 210/220 test merge 5bc189ffceb3: the shared drm_gem_shmem_object_offset() line once, and in drm_gem_shmem_mmap() 220's byte-range validation before 210's revocation check, which is aurora-wip's order. Re-recorded after the 220 review fixes (#136): same rule, with 220's validation now covering a partial native-page PRIME offset.
Topic head 282a6e1, 82 commits not already in the tree. Top commit: media: apple: isp: Free the shared surfaces resident firmware releases
Topic head 0febca4, 29 commits not already in the tree. Top commit: accel/ane: queue the boost release on system_dfl_wq
…-unified Topic head 5810654, 91 commits not already in the tree. Top commit: selftests: Register Aurora host tools and the AFKV2 target
…, MAX98357A Bring publish/unified-7.2.10 to the tree of the canonical unified assembly, as a fast-forward of the previous publish cdc7cd1. The second parent is that canonical assembly; the tree is identical to it. The third parent is integration/aurora 339ea04, so this branch contains the integration head it targets and stays mergeable into it. New since cdc7cd1: - 210-gpu: include/uapi/drm/asahi_drm.h now matches integration/aurora symbol for symbol (the M3 and J613 runtime numbers, and the G17P numbers moved past them), with the runtimes themselves not carried. The M1/M2 queue ends each command at the new timestamp copies, so a command that uses them fails with EINVAL, as on G17P. - 070-audio: integration/aurora's #149, the macaudio machine driver selects SND_SOC_MAX98357A, cherry-picked onto the audio topic. - 200-dcp: a DCP that did not start leaves the boot framebuffer in place, and a T8122 dcpext whose PMP request was not acknowledged is not started. - 010-soc: pmp-report documents a failed PMP start and its recovery, with KUnit fault injection for the start. - 100-sep: diag reports the xART guard and whether matching can save state; aurora-sep-ready tells restored fingerprints from usable matching; wording fixes, and the Arch PKGBUILD sums refreshed. - 240-isp: firmware-released SHAREDMALLOC surfaces are freed at stream stop on resident-firmware T8140. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
commented
Oct 19, 2026
|
Thanks @maralcbr. Your follow-ups from both approvals are in updates #11 ( From the #10 review
From the #9 approval
Two more things worth your eyes
Also in #12: an apple-isp fix for a per-session leak on T8140's resident firmware (~100 MB per camera session until ENOMEM). Gates on #12:
Hardware: the Neo runs #11 as its daily. #12's Neo qualification, with the matching Mesa, is running now. I'll post the result. The |
commented
Oct 19, 2026
|
Correction to my last comment: I said older Mesa keeps working on #12 through its fallbacks. It doesn't, and that applies to On the Neo, #12 with the pre-merged-ABI Mesa (agx3b-based) ran fine until a modeset about 100 s in. Then Zink got I traced the cause from the code; it isn't confirmed on hardware yet.
The fix is in Mesa: pick the first subqueue that has work, and only send the large ray-query compute command when the kernel advertises it. I'm building that now. #12 isn't the Neo's daily until it's qualified together with the fixed Mesa; the Neo stays on #11. A kernel-side option would also keep old Mesa working: advertise bit 3 on G17P. @DjDeveloperr, that's your call, since it puts an integration bit to a new G17P use. |
commented
Oct 19, 2026
|
#12 (
The M1 Pro and M2 haven't run #11 or #12 yet; they're still on the #7-era kernel. |
commented
Oct 19, 2026
|
The ref Macs are on #12 as well. The M1 Pro (J316s, stock Fedora Asahi Mesa 26.1.3) and the M2 (J413, stock Mesa 26.2.3) both passed and run it as their daily kernel. GNOME, Vulkan and GL render on stock Mesa with the merged UAPI: no submit EINVAL, no device loss, 0 GPU errors. tipd replug held 10/10 on each, and 3× s2idle passed. Touch ID restores on both. Diag reads |
commented
Oct 22, 2026
|
Thanks for the 7.2 port. We found a small merge regression while testing a two-display TS3 Plus on the M3 Pro: The second tunnel can reach DCP while the HDMI-capable processor is still in its settle window. DCP returns The fix and the original policy tests are in 068fd09 on #177. DP IN KUnit passes 35/35 and Thunderbolt 55/55; removing the flags fails exactly the four restored M3 cases. M1/M2 policy is unchanged. The larger PR is still a draft for separate hardware findings, but this should be useful as a small follow-up to the merge. |
Ready for review. Build, KUnit, dtbs and hygiene gates pass, and the hardware is qualified on the MacBook Neo (J700), the M1 Pro (J316s) and the M2 (J413). One known regression is listed under Known issues. Any further updates will be fast-forward pushes to this branch. This branch moves
integration/aurorato Asahi Linuxasahi-wipv7.2.10 (6d20a3172ffe). On top of that base it carries both:integration/aurora, through its current head168dc647cc51(arm64: handle Apple M4+ wait state without boot flags #147), which is a parent of this branch, so the PR merges cleanly;aurora-wip(through070c8e4d43a4).The result is one kernel for Apple Silicon Macs from M1 to the MacBook Neo (J700).
Layout
The branch is
asahi-wipv7.2.10 plus one merge commit per topic, in dependency order (assemble.sh): at update #10 (b4c606fb1c51), the canonical assemblyb4c606fb1c51^2carried 2,306 non-merge commits over Asahi6d20a3172ffe(2,208 unique subjects). Counted as non-merge commits in the head outside both Asahi andintegration/aurora168dc647cc51, the head adds 3,107; the extra 801 are earlier versions of rewritten commits that the fast-forward publishes keep in history. Each topic is reviewable on its own:000-devicetree·010-soc·020-dart·050-nvme·060-power-thermal·070-audio·080-radio·090-input·100-sep·170-usb·200-dcp·210-gpu·220-userpages·240-isp·245-ane·900-config-toolingTopics with a hard dependency are based on that dependency:
200-dcpon170-usb, and080-radioon020-dart. That way every commit builds.Updates to this PR are fast-forward only: each re-assembly is published as a merge commit on top of the previous head, so the branch is never force-pushed.
Provenance
(cherry picked from commit <sha>).[ryan: adapted to 7.2.10 — …]note above its trailers.Assisted-by: LLMandSigned-off-by: Ryan Murray <ryan@aurorasilicon.org>.AGENTS.md,CLAUDE.md,GEMINI.md) were added.What was carried, and how it was checked
Every commit in both source trees was classified by stable patch-id, subject and author, cherry-pick trailers, and file-level deltas for near-matches. A subject match alone was never treated as equality.
aurora-wip-rebase(0bbaaa063195) vsaurora-wipintegration/auroradelta beyond that (5d570a78a4ab)Rule on conflicts: Asahi is the base. Where two versions of the same change exist, the more correct and more complete one is kept, and nothing either side relied on is lost. J700/Neo code and the SEP keep Aurora's implementation unless the other version is demonstrably better. Every decision is recorded in the topic hand-off notes.
Per topic:
000-devicetree: 35 carried. DT hunks from mixed commits are split here; bindings stay with their drivers.010-soc/020-dart/060-power-thermal: 28 carried. The T8122/T6031 display bring-up rows are ported in update media: apple: avd: update decoder and improve playback reliability #10: the PMP startup provider on010-socand the display gate on170-usb(see "M3 native display"). The T6030 rows stay listed, not ported.080/090/240/245: 24 carried, plus 2 adaptations.100-sep(+tools/aurora-sep): 192 carried, 15 of them adapted.170-usb: 59 ported, 35 already present or superseded; rebased onto HPD v2.200-dcp: 161 dispositioned (78 ported, 67 adapted, 13 present, 3 dropped).210-gpu: the M3/T8122 backend is compile-only and gated to M3 hardware, with no change to G13/G14/G17. The M3 runtime/GPUVM redesign is listed for its maintainer (see "Not in this PR").220-userpages: the Merge aurora-wip (carries #131) with review fixes #136 review fixes, carried mechanically.900-config-tooling: generated bymake-900.sh; 15 carried, 8 adapted.Carried with a provenance note
The following commits were carried on Aurora's maintainer decision. They are disclosed here so their authors can document sources or follow up on gaps:
0aa39105: drm/apple: let a dock replug restore a parked dcpext scanout (Chris Kearney).7b1603a0,f18e6a5b: the T8122 GPU DT resources and UAT placeholders (garymeyerca), as disabled nodes.8b20dcee: gate T8122 G15G identity before startup (garymeyerca).84e34610,8231fa35,330a560b,0d51a403: the T8122 register lists and HwData words (Satya Benson).a0fe58a7: the T8122 remaining runtime InitData words (Chris Kearney).The M3 code they feed is only reachable through M3 compatibles. The G13, G14 and G17 paths are unchanged.
Landed in the fast-forward updates (latest
644133b7799f)644133b7799f, review follow-ups and base alignment). It hasintegration/aurora339ea0487dfcas a parent and carries ASoC: apple: select the Neo speaker codec with macaudio #149 (MAX98357A select for macaudio).integration/aurora.include/uapi/drm/asahi_drm.hnow uses the merged numbering from0c986f352044(G17P feature bits 10–15, timestamp-copy arrays,VM_CREATEflags). A layout check proves all 499 of its symbols equal to339ea0487dfc's header. The only diff is two comments describing this tree's behaviour (GEM_MADVISE, RSRC_SPEC_HI). Without this, merging would have reverted the base's UAPI and broken current Aurora Mesa (aurora-silicon/mesaaurora-wip). Older Mesa still runs on it through its existing fallbacks.xart_guard,xart_guard_list,xart_guard_refusalsandmatching(usable/unverified/blocked);aurora-sep-readyreports NOT ready for configurations the guard is known to block and names thexart_guard=0opt-out. The diag ABI stays 2 (keys are only added).XART-SAFETY.mdfull-list wording and the sensor-wake test comment are corrected.cdc7cd13b1b4).exec_lock()no longer leaks the VM.vb2_dma_sgdetach. With it, heap, udmabuf, ISP camera and AVD decode imports pass on a KASAN + kmemleak kernel, with 0 reports.iomfb_v26_6.cfinds the display subsystem throughdisp0, so the 25G83 DCP passes its handoff check.apple,pmp,apple,pmp-report,apple,no-ackandapple,soc-device-recordare documented. dtbs_check is 7,153 lines, below Support USB4/TB DisplayPort Tunneling #9.RESET_APPLE_CIOdefaults toARCH_APPLE, so a 7.1 config no longer loses the USB4 routers silently.apple_pmp_report_wait_ready(), so the DCP takes over from the boot framebuffer. dcpext is admitted the same way. M3 Max (T6031) works the same way but is opt-in withapple_t6031_display.enable=1. Authorship of the carried gate and provider commits is kept.-EEXIST), so those two overlays are dropped. T6030 keeps the overlay path unchanged. 25G83 coldplug stays in drm/apple; only the gate's 25G83 skip is carried.6d52684728eb.aurora-sep-readysays ready only once the enrolment is restored, and NOT ready with a reason otherwise.aurora-wipnot yet in this base is now ported, including the 5-cell/legacy DART window KUnit test, the SELinux label for/dev/sep-bio, the authselect PAM hint and the XART-SAFETY cold-boot note. A per-commit audit of allaurora-wipwork against this branch found 4 commits missing, and they are the ports above. The other 256 are present under another subject, superseded, already upstream in Asahi 7.2.10, or intentionally dropped. A follow-up hunk-level audit of every fileaurora-wipchanges (1,176 files, 7,337 hunks) found nothing else missing: 6,684 hunks match exactly, 441 are adapted to 7.2, 205 are superseded with a cited replacement, and 7 are recorded drops.!SUSPENDso no shipped config can build it, and stays parked onresearch/ave-transport-7.2.10.integration/auroraarm64: handle Apple M4+ wait state without boot flags #147: Diljit Singh's "arm64: handle Apple M4+ wait state without boot flags", carried unchanged (the J700 keeps the register-preserving WFI path, andarm64.nowfxtis no longer needed).CLEAR_STATEre-registration;XART-SAFETY.mddocuments the guard per platform; the J613/J615 25G83 display coldplug finds its nodes by alias and phandle.system_dfl_wq, the M1/M2 Type-C replug relink, the ATC KUnit objects built as modules, and missingMODULE_DESCRIPTIONs.Validation
Build gates (head
644133b7799f; baseasahi-wipv7.2.10; compared with 7.2.10rebase-wip/7.2.10c6d6d0964f73)apple-drm-resumefixture still stalls under lockdep; every other DCP suite passes thererun.py)tools/aurora-septestsintegration/aurora5d570a78a4ab: no new warning comes from Aurora's commits, and J700 has no new line. The 337 new lines (after node moves) are all carried: 290 are Asahi 7.2.10's own warnings, 34 are Asahit8122.dtsiwarnings on the base's J613/J615 profiles, and 13 already exist in substance on the base. The T8122 GPU, mailbox and UAT nodes stay disabled--strict(cherry picked from …)references, and contributor commits without a nominal-author Signed-off-byCo-Authored-Byon Aurora commits (contributors' own trailers are kept) · every Aurora commit ends withAssisted-by: LLM+Signed-off-by· 0 AI-instruction files · 0 private paths or identifiers in diffs or messagesHardware
MacBook Neo (J700), first boot of this tree, compared with the 7.2.10 daily:
Driver binding: identical on every platform/SPMI/I²C/SPI/PCI device: DCP×2, apple-drm, the G17P GPU, the SEP, ISP, AOP audio, ALS, PMP, and MT7932 Wi-Fi/BT.
External display, 180 Hz over the rear dock, software-driven:
Short sweep: display, GPU (Vulkan/EGL/GLES via Zink/Honeykrisp), Wi-Fi, BT, Touch ID (restored 3 on the first attempt), camera, mic, USB, wake and thermal all pass.
Regression sweep, essentials (same scripts as the 7.1 baseline):
It was the Neo's daily kernel until the updates below replaced it.
The latest update (
ffa615e26f29) on the Neo: it passes the same kit and is now the Neo's daily.Attended checks on the Neo, on this kernel: all pass.
The current head (
a9712ec4665e) on the Neo: it passes the full kit. Driver binding is identical, with 0 WARN. DPMS 10/10, mode change 5/5, s2idle with the monitor 6/6, the short sweep before and after sleep, about 99.2% s2idle residency, and a 5-minute idle check matching the previous head. Touch ID restored 3, including a first-attempt failure that the retry recovered.M1 Pro and M2 on this tree's code (the head before the final M4+ wait-state commit, which does not apply to M1/M2): the full battery passes on both, and both run it as their daily. The M2 has the SEP on and the xART ledger unchanged (0 of 10).
M1 Pro (J316s) and M2 (J413) on 7.2.10 (the same code base minus the unified carries):
M1 Pro: the full battery passes. That covers tipd, USB4 routers, Type-C cycles, pm_test, the display DART attach, the GL smoke test and the ANE probe.
Touch ID verified on the M1 Pro, with the xART ledger unchanged.
M1 Pro on this tree (
e0fa50d863ee, the Fedora stock-config recipe): the same battery passes, matching 7.2.10.pm_test=platform3/3 with 0 DART faults;The only new dmesg line is an intermittent
brcmf_get_assoc_ies-52. It is now the M1 Pro's daily kernel, with 7.2.10, the 7.1 Touch ID kernel and stock as GRUB fallbacks.M1 Pro, attended: Touch ID verify matches; a USB 3 camera in all three ports, both orientations, enumerates at SuperSpeed 7/7.
M1 Pro external display through a USB-C dock (DP alt mode), attended:
M1 Pro on the 7.2.10 DTB set (one-shot boots; the daily runs the 7.1 DTB set, which this kernel also supports): 7 of 8 boots of this tree came up with display, Wi-Fi and tipd 4/4. One hung before the root filesystem, with no log, and the watchdog recovered it; it did not reproduce in 6 retries. The 7.2.10 baseline came up 4 of 4. Every boot shows the already-known late-IOMMU probe race, which moves between devices.
M2 on this tree: the same battery passes with 0 warnings, and the xART ledger is unchanged (0 of 10).
M2 with the SEP on (this tree plus the xART guard and the T8112 SEP DART window, now landed):
It is now the M2's daily kernel.
Known issues and follow-ups
integration/aurora.asahi,j615-25g83-experimental): the coldplug now finds all ten display/PMP nodes through aliases and phandles, so the 25G83 native display can be admitted again.disp0lookup iniomfb_v26_6.c).apple_t8122_display.enable=0(T8122) ornomodeset. T6031 only starts it withapple_t6031_display.enable=1. The display stays on the boot framebuffer in that case. Verified with KUnit fault injection only.APPLE_T6030_DISPLAY_GATEnow defaults to y on Apple. It returns immediately without an M3 handoff. The J700 release config pins it off, so its config is unchanged.displayportlink has no matching DRM connector there; adding one would give no extra function. It applies to M1/M2 CD321x ports.xart_guard=1, restoring Touch ID at boot works on every platform, because it only reads xART. Using it does not always work: a fingerprint match rewrites session records, and the guard allows that only for records Linux created while the guard was on.xart_guard=0. Because setup ran unguarded, the matches that follow need it too.A refused write fails closed and is logged;
tools/aurora-sep/XART-SAFETY.mdcovers restore, use, setup and recovery per platform.107036c9c167and the ISP part of7f835188acccstill need owner reconciliation.How to review
Review the canonical assembly, the second parent of the head, not the first-parent chain. The first parents only link earlier fast-forward publishes, so their topic merges are stale copies. The canonical is Asahi 7.2.10 plus one merge per topic, in NNN order.
Because the canonical is reassembled for each update,
git rev-listover the whole head counts every topic commit several times.What from
integration/aurorais carried, deferred or dropped: the head hasintegration/auroraas a parent, so git counts all of its commits as merged even where the content isn't carried. A per-commit list (1,389 commits checked; 153 deferred, most of them the M3 GPU runtime, 99 superseded, 3 dropped) is here: https://gist.github.com/RyanTheTide/980fce5c903a3b158b37a45432b47abdPlease merge with a merge commit (or a fast-forward), not squash or rebase, so the topic structure and authorship survive.
🤖 Generated with Claude Code