[DjDeveloperr]

APIF is old SPTM support that doesn't need to be in tree. This removes all of it from integration/aurora. Most of it came in with the shared T6050 APIF base (d9d9ee6, PR #472). Later additions, such as #841's 61 lines in apple-dart-apif.c, go with their files.

Removed

• Drivers: the APIF MMIO transport (drivers/firmware/aurora-apif-mmio.c), the APIF DART (drivers/iommu/apple-dart-apif.c) and the APIF SART (drivers/soc/apple/apple-sart-apif.c), with AURORA_APIF_MMIO, APPLE_DART_APIF, APPLE_SART_APIF and their Makefile lines.
• Headers: apple-dart-apif.h, pci-apple-apif.h and soc/aurora/apif-mmio.h. Also soc/apple/display-event-{log,debugfs}.h: nothing in tree includes them, and their only user is usb: typec: tipd: Reconcile T6050 SPMI and display events #487, part of the APIF series.
• SART: sart-backend.h and the backend indirection in sart.c. Only the APIF SART used it. With no backend set, the existing MMIO path runs unchanged.
• Mailbox: the apple,t6050-apif-ascwrap-v6 profile in mailbox.c. No DT uses it.
• Config and tests: arch/arm64/configs/aurora-apif.config, and tools/testing/selftests/aurora-apif/ with its TARGETS line.
• Bindings: aurora,apif-mmio, apple,dart-apif, apple,sart-apif, and the APIF compatible in apple,ascwrap-v6.
• Docs and MAINTAINERS: the aurora-apif*.rst pages, their toctree entries, the "AURORA PLATFORM MMIO INTERFACE" section, and the Centauri section's link to the APIF doc.

Kept

These came with the APIF base, but native code in tree now uses them:

• RTKit PMP registry-v2: used by pmp.rs, apple,t6050-pmp-v2.
• T6050 CPU IDs and the delay workaround that uses them.
• apple_mbox_ascwrap_v6_get_cpu_state(): used by g18.
• apple_centauri_control_ready(): used by centauri/t6050, btcentauri_t6050.
• apple_dp_phy_link_config(): used by atc-t6050-dp.
• apple_dpxbar_link_configure(): used by apple-display-crossbar.

Grep

git grep -n -E "(^|[^A-Za-z])(apif|APIF)([^a-z]|$)" now matches only the NXP RTC register bit:

drivers/rtc/rtc-s32g.c:27:#define RTCS_APIF		BIT(13)
drivers/rtc/rtc-s32g.c:86:	if (status & RTCS_APIF) {
drivers/rtc/rtc-s32g.c:88:		writel(status | RTCS_APIF, priv->rtc_base + RTCS_OFFSET);
drivers/rtc/rtc-s32g.c:125:		alrm->pending = !(rtcs & RTCS_APIF);

Build

All builds ran on the shared host under the kbuild lock, at nice 19 with -j6.

• M5 kernel 7.3.0-m5-apifrm: the running 7.3.0-m5-argb source with these three commits on top.
  • Built Image modules dtbs with the integration config. After olddefconfig the config differs from the running kernel's in 0 lines.
  • The build's 40 warning lines match the argb build line for line, all pre-existing.
• This branch, arm64 defconfig + asahi.config: built drivers/{soc/apple,iommu,firmware,mailbox}/ at W=1, base vs head.
  • Base: 2 warnings, both pre-existing in display-gate.c.
  • Head recompiled only sart.o and mailbox.o: 0 warnings.
• CI: dt-checks, host-tests, kunit, rust-build and source all pass.

Hardware (M5 Pro J714s, SSD boot)

7.3.0-m5-apifrm is the running 7.3.0-m5-argb source with these three commits. I installed it over SSH as its own release, rebooted, then rolled back and compared it with a fresh argb boot.

• Boot: reached graphical.target with Hyprland running. ssh m5-ssd came back 10 s after the reboot.
• NVMe: root on nvme0n1p5 (ext4 rw) through 45dcc0000.nvme. SART 41dc50000 is bound.
• Mailboxes: six bound, including the GPU's 2302600000 and 2302e00000.
• DCP: five DCP engines plus apple-drm bound.
• GPU: the aurora driver is bound to 2300000000.gpu, with card0/card1.
• Wi-Fi: joined at 5 GHz, ping 10/10. Bluetooth controller is up.
• SEP: loaded read-only (xart_writes=0 provision_keybag=0).
• Errors: no oops, BUG, WARN or SError.
• Diff against argb: dmesg warnings and errors are identical (13 lines each), and so are the 53 loaded modules. The 160 bound drivers match except the phram device's address, which also changes between two boots of argb itself (10006000000 vs 10006378000).
• Afterwards: current is back on 7.3.0-m5-argb with prev 7.3.0-m5-integration. The ESP sets and the composed Stage 2 are byte-identical to the start.

Open PRs

Once this merges, these October APIF-series PRs get closed, since they add or depend on APIF code:

• nvme: apple: Add resident T6050 ANS over APIF #473: NVMe over APIF.
• PCI: apple: Add T6050 APIF hosts and native AIC MSI #474: APIF PCIe hosts.
• arm64: apple: Add checked T6050 APIF guest migration #476: APIF guest migration.
• net: apple: Add T6050 N1 firmware and ACIPC transport #482: calls apple_apif_pcie_cycle() and matches apple,t6050-pcie-apif.
• usb: typec: tipd: Reconcile T6050 SPMI and display events #487: needs the removed display-event headers.
• arm64: configs: Enable the T6050 APIF platform consumers #488: aurora-apif.config.

The rest of that series is native and stays open for the owner to decide:

• Already covered by integration or by drm/asahi, drm/apple: M5 GPU and firmware-27 display on integration/aurora #1012's tree:
  • soc: apple: Add T6050 PMP registry-v2 support #475 by soc: apple: pmp: start the T6050 PMP on bare metal #1326
  • mfd: macsmc: Support T6050 power and pcIO consumers #479 by mfd: macsmc: T6050 power, reboot, RTC and sensors, and ac_power_mode #941
  • phy: apple: Add T6050 DisplayPort and USB combo PHY #480 by phy: apple: add the T6050 Type-C combo PHY and DWC3, with USB3 on every port #939/J716c: USB4 and Thunderbolt 5 on integration #1323
  • wifi: apple: Add N1 protocol-27 station support #483 and Bluetooth: Add N1 protocol-27 HCI and ACL transport #484 by N1 Wi-Fi and Bluetooth on bare-metal T6050, with 6 GHz and WPA3-Personal #938/wifi: apple: centauri: t6050: tell the firmware the host is awake before a join #1316
  • drm/apple: Add T6050 firmware-27 display support #485 by drm/asahi, drm/apple: M5 GPU and firmware-27 display on integration/aurora #1012
  • pinctrl: apple: Describe T6050 host-owned interrupt groups #486 by what is already in tree
  • usb: dwc3: apple: Add the T6050 controller and tunables #489 by phy: apple: add the T6050 Type-C combo PHY and DWC3, with USB3 on every port #939
• Not in tree yet: spmi: apple: Support T6050 generation-4 interrupts and recovery #477 (SPMI gen-4 IRQs), rtc: apple: Add T6050 Abbey PMU clock and wake alarms #478 (Abbey PMU RTC), pmdomain: apple: Preserve active T6050 control state #490 (pmgr), HID: dockchannel: Enable T6050 keyboard reports on open #491 (DockChannel keyboard).

#778 puts a new test under tools/testing/selftests/aurora-apif/, so it needs to move that test.

#1208's sart.c hunks have the removed backend lines as context, so expect a small conflict there.

🤖 Generated with Claude Code