Repository navigation
Return stale aurora-wip leftovers to integration/aurora - #610
Merged
Merged
Conversation
b7fa6db dropped 36 requests that defconfig and the Fedora base resolve anyway. The file states every hardware request explicitly on purpose, so the survival check verifies each one after olddefconfig. Go back to the file as integration/aurora carries it. The one difference left is CONFIG_APPLE_SIO_T6030. This branch no longer has that option, since the SIO firmware behaviour comes from compatible data (e3653e6), and the same line goes in integration/aurora with that change. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
crashdump.rs is not referenced by the driver or the Makefile, so it is never compiled. integration/aurora does not carry it. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
No DTS includes t6040-dpaudio.dtsi, and integration/aurora carries the live J616s device tree. Return the dpaudio, DCP and T6040 ATC binding text to the integration/aurora version. The DP audio description can come back with the J616s HDMI audio work once the T6041 SIO backend exists. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
atcphy_usb3_set_mode() already returns -EBUSY while usb_off_pending is set, right after restoring the PHY. The second check further down came from an older composite and can never trigger. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The fixture alignments made on this branch on 10-26 are older than the ones integration/aurora carries: apple-dart-range-tests.py fails here and passes there. Take the integration/aurora versions of the tools/asahi DART and RTKit fixtures, the asahi-m4 host models and av-lifetime-test. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The PMP dvfs debugfs file that t8140-pmp-dvfs.rst describes exists on neither branch, and the ARM/APPLE QSPIMC DRIVER entry repeats the existing QSPI entry. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
integration/aurora already shipped aurora-sep 1-9 (Fedora) and pkgrel 14 (Arch) without sep-bio-identities. This branch added the tool under the same release numbers, so a build from here would collide with the shipped packages. Give it its own release: Fedora 1-10 with its own changelog entry, and Arch pkgrel 15. The sources and their checksums do not change. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
#472 added a T6050 PMP registry-v2 path to apple_rtkit_rx_work(): endpoint 7 now goes to apple_rtkit_pmp_aux_rx() when rtk->pmp_registry_v2 is set. The ordered-rx fixture extracts apple_rtkit_rx_work(), but its struct apple_rtkit has no such field and nothing defines the new handler, so the group stopped compiling and the apple-dcp host suite went from 80/80 to 79/80 on integration/aurora. Give the fixture struct apple_rtkit the field and stub the handler the way the CoreAnalytics one is stubbed, as unreachable in this fixture. No assertion changes. The edid group also still passes on the tree before #472, where the stub is unused. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit 14b5515)
The T8132 support in atc.c added the PIPE lock timeout helper, T8132 lane and PIPE back ends, a USB2-only power restore and new state members. The harness extracts the driver bodies, so it stopped compiling on integration/aurora. Extract atcphy_pipehandler_lock_timeout() with the other driver functions, since the ACK polling moved into it, and point the missing-ack-check mutation there. Add the new members to the modeled structs, and stub the T8132 back ends and the USB2-only power restore with assertions: the modeled machines never select that generation. All 36 cases pass and all 49 mutations are killed. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit 97dafeb)
Contributor
Author
|
Build on buildbox (shipping recipe: Fedora Asahi base + this asahi.config, Image modules dtbs, corrected bindgen 0.73.2): BUILD-RC 0. An earlier attempt had failed only because /srv/aurora/fast was full. Host tests and CI were already green. Merging. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Brings the stale aurora-wip leftovers from the 2026-10-30 convergence report back to integration/aurora's version, as Ryan decided. After this,
git diff integration/aurora aurora-wipis the open WIP plus the items already in flight as PRs.One commit per item:
asahi.config: back to integration/aurora's file (DJ's explicit requests), reverting the b7fa6db trim. The only difference left isCONFIG_APPLE_SIO_T6030=y, which aurora-wip no longer has since e3653e6; dmaengine: apple-sio: select firmware behavior from compatible data #603 drops the same line on integration/aurora. TheDRM_ASAHI_G15=yrequest goes with it.drivers/gpu/drm/asahi/crashdump.rs(never referenced, never compiled).t6040-dpaudio.dtsiand return the dpaudio, DCP and T6040 ATC binding text to integration/aurora's version.atc.c: drop the duplicateusb_off_pendingcheck inatcphy_usb3_set_mode(). integration/aurora already returns-EBUSYfor it at the top of the function, so the second check could never trigger.Documentation/soc/apple/t8140-pmp-dvfs.rst(documents a debugfs file that exists on neither branch) and the duplicate "ARM/APPLE QSPIMC DRIVER" MAINTAINERS entry. The s2idle doc line stays (that doc is in docs: explain Apple s2idle wake paths and qualification #604).sep-bio-identities, so this branch's builds now carry Release 10 with its own changelog entry and pkgrel 15. Sources and checksums are unchanged. The tree has no NixOS packaging for aurora-sep.-x) of the two test-only fixes just merged into integration/aurora: selftests: apple-dcp: follow the PMP auxiliary buffer in ordered-rx #598 (apple-dcp ordered-rx) and tools: asahi: model the T8132 members in the ATCPHY USB3 harness #609 (atc-usb3 harness).Testing (buildbox, every host-side python test plus the apple-dcp, apple-afkv2 and asahi-g15 runners):
apple-dart-range-tests.py,atc-usb3-tests.pyandapple-dcp/run.py(80/80).asahi.configover the Fedora Asahi base: every request survives olddefconfig, except# CONFIG_TRUSTED_KEYS_TEE is not set, which is not visible withTEE=m. integration/aurora behaves the same.Not touched: L6 SEP v5 work, L10 AVE (another agent), L11 J414c DT (third party), and the j413 click-strength, dockchannel-hid and haptic lines, which are not convergence items.
🤖 Generated with Claude Code