Skip to content

J873g: USB3 on the front ports (T8152 ACIOPHY, M6 Mac mini) - #1799

Open
sithglan wants to merge 89 commits into
aurora-silicon:integration/aurorafrom
sithglan:thomas/j873-usb3
Open

sithglan wants to merge 89 commits into
aurora-silicon:integration/aurorafrom
sithglan:thomas/j873-usb3

Conversation

@sithglan

@sithglan sithglan commented Nov 13, 2026 •

Copy link
Copy Markdown
Contributor

Stacked on #1797 (aurora-wip merge for the J873g, which brings #1205's USB2 hosts). Review the last four commits.

The J873g's (Mac mini M6, T8152) front USB-C ports sit behind an on-board VL822 hub on ATC2. With #1205 the hub's USB2 side works through usb-drd2. This adds its USB3 side:

  1. dt-bindings: phy: Add the Apple T8152 ACIOPHY in USB3 mode (apple,t8152-aciophy-usb3).
  2. phy: apple: Add the T8152 ACIOPHY USB3 PHY for a fixed USB3 device (PHY_APPLE_ACIOPHY_USB3).
    • It powers up the ATC2 ACIOPHY and its lane 0 from the clamped state iBoot leaves it in, applies the ADT tunables through the tree's apple-tunable helpers, and moves the PIPE mux from the dummy PHY to the ACIOPHY.
    • It powers lane 0 up explicitly. Without that, the lane registers stay in AHB reset and the PHY never reports PIPE PhyStatus.
  3. arm64: dts: apple: j873: USB3 on the front ports. The ACIOPHY node is added, and usb2 gets it as its usb3-phy and drops maximum-speed = "high-speed".
  4. arm64: configs: asahi: build the T8152 ACIOPHY USB3 PHY. CONFIG_PHY_APPLE_ACIOPHY_USB3=m in the shared defaults, which arm64: asahi: enable all native hardware defaults and guard coverage #1939's hardware-defaults-tests requires of every native driver.

Things to know

  • The front controller now waits for the PHY driver. If the PHY isn't built or fails to power up, the front ports lose USB2 as well.
  • aura's J873 USB prep has to run first, as it does today. It powers USB_AON and the USB PSD, sets up the eUSB2 PHY in host mode, takes the DWC3 out of reset and releases the VL822 reset line.
  • No T8152 power-domain driver covers the ATC states yet, so the PHY driver writes the PMGR power-state and PSD registers itself.
  • The tunables come from this machine's ADT.
  • Suspend and kexec are not exercised.

Testing (M6; with #1797 and the other J873g PRs this is the M6's default kernel)

  • "apple-aciophy-usb3 383000000.phy: USB3 up".
  • The front xHCI has a 480M and a 10000M root. The VL822 appears on both, at 480M and at 10000M.
  • The keyboard and mouse behind it work, and the back-left port is unchanged.
  • The earlier linux-aurora j873 version of this driver ran a USB 3 gigabit NIC behind the hub at 5 Gb/s (873 Mbit/s iperf3).
  • At the 292773f base (2026-11-14, booted through aura's kboot): the 10000M root again has the VL822 at 10000M.
  • At the 0abc2f3 base (2026-11-18, booted from the ESP with the rebased stack): both front-port USB3 roots come up at 10000M (apple-aciophy-usb3 383000000.phy: USB3 up).
  • scripts/dtc/apple-dt-check.sh against integration/aurora 0abc2f3, with Merge aurora-wip 210c8f6e into integration/aurora (J873g NVMe, 10GbE, power off, USB2, audio) #1797 and the stacked J873g PRs: 0 new CHECK_DTBS warnings (8 fewer), and all 21 changed bindings pass dt_binding_check.
  • tools/asahi/run-host-tests.py passes 427/427 (with Merge aurora-wip 210c8f6e into integration/aurora (J873g NVMe, 10GbE, power off, USB2, audio) #1797 and the stacked J873g PRs, on 0abc2f3). defconfig plus asahi.config resolves to CONFIG_PHY_APPLE_ACIOPHY_USB3=m.
  • Image, modules and DTB build (LLVM 22). checkpatch --strict is clean apart from the MAINTAINERS hint.

cc @Acelogic @RyanTheTide @DjDeveloperr @LiamRay10

sithglan and others added 30 commits November 6, 2026 11:23
The T8152 (M6) Always-On Processor differs from the T8140 one: its setup
port is not reachable from the AP, so it has one mailbox, and its audio
service uses six serializer power domains and the jack, speaker and
speaker-sense ADMAC channels.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
Add the Mac mini M6 (J873) sound card.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The J873 (Mac mini M6) AOP runs the same firmware generation as T8140
(EPIC v4, iBoot-loaded, started by the AP), but the T8140 "setup port"
is not reachable from the AP: mailbox 1 of the AOP's mailbox bank and the
ADT aop-exclave-mailbox both bus-error. The firmware boots without it:
RTKit protocol 12, then its "audio" EPIC service. Add apple,t8152-aop
with the T8140 configuration minus the setup port, starting every
advertised endpoint.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The Mac mini (M6, J873) speaker runs a 250-BCLK TDM frame, which the
SN012776's ratio auto-detection rejects. Describe the property that fixes
the ratio instead.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The J873 (Mac mini M6) AOP runs the speaker frame at 250 BCLKs of 12 MHz.
The SN012776 cannot auto-detect that ratio and mutes with "fault: bad
TDM clock". With TAS2764_CLK_CFG (register 0x60) set to 0x30 and
TDM_CFG0 bit 6 set it accepts the frame and plays. Do that when the new
ti,bclk-ratio property names the ratio; only this one ratio is supported.

Source of the value: the register write was first seen in the macOS
SN012776 driver; it is a single register value, and its effect (no fault,
correct playback) was verified on J873 hardware. No table or code was
taken from macOS.

The field is initialised in probe, so non-OF matches keep auto-detection.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The SDOUT1 mux offers the ASP receive channels as a source, but no DAPM
route connected them, so selecting "ASP RX CH1" or "ASP RX CH2" left the
capture path without an input. The J873 and J813 AOP audio services use
it to loop the playback stream back.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
On T8152 (J873, Mac mini M6) the AOP firmware owns the audio fabric, as
on T8140. Its "audio" EPIC service offers cout/cin (the CS42L84 jack,
base-ns ADMAC TX5/RX5, MCA4) and spkr (the SN012776 speaker, TX1, MCA0).

Each service is an ASoC back-end DAI: startup attaches it, requests pw0
(which raises the audio fabric) and powers the MCA leaves, all of which
are required. pwrd starts the serializer clocks at prepare, before ASoC
unmutes the codecs: the jack codec locks its PLL to the bit clock, and
the speaker amplifier reports "bad TDM clock" whenever it runs without
one. The jack restarts its clocks on every prepare so that a stream
restarted after an underrun begins on a frame boundary; the mono speaker
(one slot per frame) keeps them running. The front-ends are dmaengine
PCMs on the base-ns channels: the jack in stereo, the speaker in mono
(its serializer runs one 32-bit slot; stereo frames play at half pitch).

The firmware's serializer configuration (property 701) is byte-identical
to the one macOS publishes, so the driver leaves it alone.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The J873 (Mac mini M6) uses the T8152 AOP audio driver as its CPU
component: the CS42L84 jack on "cout" (DSP_A | IB_NF, one-BCLK sync
pulse) and one SN012776 on "spkr" (I2S, NB_IF: data sampled on the rising
edge, as macOS programs the amp).

Each AOP front-end owns the DMA channel of one serializer, so the speaker
can only be fed from the secondary front-end; the new spk_secondary_only
sets the speaker mux accordingly, and spk_dai_fmt gives the speaker link
its own format.

There is no qualified speaker protection for J873 yet (no verified sense
path, thermal model or power budget), so the speaker fails closed: it is
only enabled with please_blow_up_my_speakers. Opted in, it runs as macOS
runs it: amp gain 15 (ADT speaker-config) and no volume lock (safe_vol 0),
since there is no sense stream for a protection daemon. The jack is not
affected.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The T8142 AOP keeps its crash buffer in its own slot of its DART stream
and asks for it on endpoint 1 with that IOVA. A client without
shmem_setup refused the request, so the firmware never got its crash
buffer acknowledged.

APPLE_RTKIT_FIRMWARE_OWNED_CRASHLOG takes such a buffer as the firmware's,
without a CPU mapping, and acknowledges the request unchanged; a later
crash is reported without a log. RtKit::new_with_firmware_crashlog()
selects it at runtime, so a driver can use it for one SoC only.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The T8142 AOP (MacBook Air J813) waits for the host on a setup port, as
the T8140 one does: the ADT's aop-exclave-mailbox at 0x3d067c000 (AOP
ASC + 0x4007c000, not behind the arm-io translation). Its EPMAP announces
other service endpoints than T8140's fixed set (0x4, 0x20, 0x23 and 0x32
on J813), so take the endpoints that must get buffers from the EPMAP when
the match data says so.

The firmware places its own crash log buffer in its firmware-mapped DART
slot; accept it as the firmware's, as for G17P.

After the setup boot all AFK endpoints start, and with the audio fabric
left to the firmware (see the J813 device tree) the firmware announces
its "audio" EPIC service.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
Behind an AOP the serializer feeding a capture channel is the firmware's,
and it stops in the middle of a frame whenever it likes. A capture that
stays open across such stops (the speaker V/I sense, which a protection
daemon reads for as long as it runs) then carries the partial frame
forward: every later frame is off by its words, and the samples of one
amplifier are read as another's. On the MacBook Air J813 one restart in
three slipped by one 16-bit word.

Let a client pass the frame size in bytes as a u32 in
dma_slave_config.peripheral_config. A paused cyclic capture on such a
channel resumes at the next frame boundary of its current period: the
reports completed before the pause are accounted for, the rings are
reset and the rest of the period is submitted from the aligned address,
then whole periods as before. Without a frame size nothing changes.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The J813 speaker stream (ADT iop-audio-controller/audio-speaker) differs
from J873's: four SN012776 in 32-bit playback slots 0-3, and their voltage
and current sense back on the same stream's RX side (base-ns RX0) as eight
16-bit slots. Make the speaker and sense shapes per-SoC match data:
J873 keeps one playback channel; T8142 gets four, and an 8-channel S16_LE
"Speaker Sense" front-end.

The sense capture is the speaker serializer's RX, which the firmware
stops anywhere in a frame. Before every `pwrd` of the speaker, restart a
running sense capture at a frame boundary (apple-admac realignment, the
partial frame reads as zeros), so that a protection daemon that keeps it
open attributes each amplifier's voltage and current to the right one.

The sense back-end also attaches the speaker service and requests `pw0 `
at startup: its front-end requests the ADMAC channel next, and the ADMAC
only answers while the firmware holds the audio fabric up. Opening the
sense before any other stream since the AOP started (speakersafetyd at
boot) otherwise faults the bus.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
MacBook Air 13" M5 (T8142): as on J873 the AOP firmware owns the audio
fabric and the CPU component is the T8152-style AOP audio driver. The
jack is a CS42L84 on "cout", the speakers four SN012776 (one woofer and
one tweeter per side) on "spkr", with their V/I sense on the same stream.
As on the other SN012776 laptops the speaker volume stays locked until a
protection daemon (speakersafetyd) holds it.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The MacBook Air J813's three microphones are the AOP's "hpai" service
(ADT iop-audio-controller/audio-hp-mic): the firmware runs the PDM part
and delivers 48 kHz float32 frames of three channels (the ADT's
audio-hp-mic-proxy description: 12 bytes per frame) on leap-s ADMAC RX0.
There is no codec, so it gets a card of its own with one capture PCM,
named like the other AOP microphone cards (AppleJ813HPAI, "MacBook Air
J813 High-Power Audio Interface", driver aop_audio) so that the existing
UCM and DSP configurations for those apply.

As on T8140: open attaches the service and requests pw0 (which raises
the LEAP fabric), powers the LEAP leaves (leap-s ADMAC, RX0, LEAP MCA),
and only then requests the channel, whose registers fault without them.
The trigger starts the DMA and queues pwrd behind it; started earlier,
the LEAP produces into a channel nobody services. Close releases the
channel, then pw0 and the leaves.

The card exists only where the DT gives the LEAP power domains (all
three); J873 is unchanged. The dmaengine substream setup moves into a
helper shared with the ASoC front-ends.

Tested on J813: a tone from the speakers reads -44 to -49 dBFS on all
three channels, 70 dB over the quiet floor, exactly while it plays;
PipeWire picks up the card with asahi-audio's J613 beamformer graph.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
integration/aurora added the nCal boot argument and word-wise boot-argument
access to AopHwConfig. Both machine configurations keep the firmware's own
boot arguments unchanged, so set ncal to zero and leave word access off.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
Every boot on the J616s logged "spi-nor spi0.0: supply vcc not found,
using dummy regulator". The M1, M2, M3, J713 and J700 trees describe the
flash's always-on PMU rail as a fixed regulator; the M4 Pro/Max tree
came later and has none. Add the same regulator and point the flash at it.

Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com>
Assisted-by: LLM
Preserve current RTKit crashlog and GPU handling while retaining the expanded macaudio bindings and adding J813/J873 compatibles. Original audio commits and authorship are preserved.
…ation

Test whether COUT standby supplies the missing cold-boot fabric setup. A muted zero-data jack stream permitted HPAI capture and subsequent capture-only opens on J813; standby without any playback is the next hardware qualification step.

Preserve Thomas Glanzmann’s driver and adapt the T8140 DMA sync-stop pattern from Ryan Murray, also flushing queued HPAI work before DMA teardown. No LPAI buffer binding or codec unmute is performed.
…queue

Describe the T8142 microphone DMA and LEAP power domains and card names in the shared audio binding. Queue sleeping firmware power requests on system_dfl instead of the deprecated system workqueue, as directed by the runtime warning observed during hardware capture tests.
…-initialization-20261106

ASoC: apple: integrate J813 audio with first-open microphone initialization
…616-nor-vcc

arm64: dts: apple: t604x-j614-j616: Describe the boot NOR flash supply
Resolves sound/soc/apple/macaudio.c: aurora-wip added spk_dai_fmt and
spk_secondary_only (J813/J873) where integration added tweeter_hpf_granted
(speaker protection ownership); the struct keeps all three.

Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com>
Assisted-by: LLM
Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com>
Assisted-by: LLM
…nc-20261107

Merge integration/aurora into aurora-wip (11-07)
Brings aurora-wip up to integration/aurora 068dfce: pcie-apple endpoint
reset retry (aurora-silicon#1069) and the
tools/aurora-sep PKGBUILD checksum fix
(aurora-silicon#1068).

Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com>
Assisted-by: LLM
…n/wip-sync-20261107b

aurora-wip <- integration/aurora 068dfce (aurora-silicon#1068, aurora-silicon#1069). Clean merge, W=1 pcie-apple.o 0 warnings on the merged tree, CI host-tests/rust-build/source pass. Merge train (MTR).
Brings aurora-wip up to the tested release branch: CTXR execmem
(aurora-silicon#985, aurora-silicon#1079), KFIX speaker sleep and resume fixes (aurora-silicon#1077, aurora-silicon#1080),
JPEG v2 (aurora-silicon#1072), Jonathan's G17 and USB work (aurora-silicon#1073-aurora-silicon#1076), brcmfmac
flowring count (aurora-silicon#1081), ANE H16 startup restart (aurora-silicon#1066) and the
Touch ID per-prompt match (aurora-silicon#904).

Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com>
Assisted-by: LLM
Adds the 11-07 evening batch: t8140 disabled SPI3/FPWM0/SPMI nodes
(aurora-silicon#1034), J700 CPU zones (aurora-silicon#1043), J616C fans (aurora-silicon#1092) and the thunderbolt
DP PM workqueue fix (aurora-silicon#1098).

Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com>
Assisted-by: LLM
…n/wip-sync-20261107c

Gate on the exact head tree 6c684e8 (buildbox): fleet22-config Image+modules+dtbs build rc=0, 0 errors, 0 warnings, 5890 modules (= fleet); run-host-tests 193/193; apple-dcp host selftests 86/86 (fleet baseline 86/86). CI host-tests/source/rust-build green. Brings aurora-wip up to integration/aurora 810b92c.
Brings aurora-wip up to fleet25: DT descriptions (aurora-silicon#1029, aurora-silicon#1030, aurora-silicon#1112),
the J715 board (aurora-silicon#1129), Stockholm NFC (aurora-silicon#1042, aurora-silicon#1136), the AV1 tile check
(aurora-silicon#1100), the M4 Max ANE profile and AVD quirk (aurora-silicon#1088, aurora-silicon#1091), boot-log
fixes (aurora-silicon#1103, aurora-silicon#1104) and the Neo ANE memory floor (aurora-silicon#1137).

Conflicts: macaudio.c and apple,macaudio.yaml, where aurora-wip's J813
and J873 entries and integration's J715 entries were added at the same
spot. Keep all of them.

Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com>
Assisted-by: LLM
RyanTheTide and others added 4 commits November 8, 2026 22:27
Brings aurora-silicon#1215, the ADT coverage fix for boards that are new to the base.

Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com>
Assisted-by: LLM
Brings aurora-silicon#1194, which makes Touch ID wait for the first password after boot (kernel side).

Signed-off-by: Ryan Murray <81541646+RyanTheTide@users.noreply.github.com>
Assisted-by: LLM
…n/wip-sync-20261108b-mtr3

Merge train: sync aurora-wip with integration/aurora 6fee375
…silicon#1410)

The binding and the J714c device tree name the AOP audio service
"apple,t6050-aop-audio", but the driver matched only t8142 and t8152, so
that node never bound.

Add a T6050 hardware config. The J714c ADT audio-speaker stream header
(DeviceTree.j714cap) has the same layout as J813's with six amplifiers in
place of four: 6 speaker slots and 12 sense words (V, I per amplifier), at
16 bits, on slots vsense 0,4,..20 / isense 2,6,..22. J813's header has 4
slots, 8 sense words and vsense 0..12 / isense 2..14. HW_CFG_T8152 (one
amplifier, two sense words) would expose the wrong channel counts, so it is
not reused.

The sense width and the sense realignment are taken from J813's config by
analogy; they are not tested on a J714c.

Tested: builds as a module with Rust enabled (clang 19, arm64 defconfig plus
CONFIG_RUST, CONFIG_SND_SOC_APPLE_T8152_AOP_AUDIO=m); the object carries the
apple,t6050-aop-audio match string. Not tested: no J714c boot, no sound.
@DjDeveloperr

Copy link
Copy Markdown
Contributor

Heads-up: this stack (#1798, #1799, #1800) now conflicts with integration/aurora in drivers/soc/apple/mailbox.c. The conflict comes in through #1797's merge commit a761a62, which brings aurora-wip's T8152 AOP and J873 ANS mailbox matches. It collides with 41c359d and 788441e on integration, which receive the T6050 GPU mailboxes by interrupt.

Could you refresh #1797 onto the current integration/aurora and rebase the three on it? When resolving, please keep those two commits' interrupt-driven receive path as it is. We'll review the listed commits once the stack is mergeable again.

@sithglan

Copy link
Copy Markdown
Contributor Author

Rebased onto the refreshed #1797 (ceade2e, on integration/aurora 292773f). The branch is now e2555c5 (was 2fddae2) and merges cleanly again.

git range-diff shows the three commits unchanged.

The testing lines in the description are updated: apple-dt-check.sh against 292773f shows 0 new CHECK_DTBS warnings (8 fewer) and every changed binding passes, and the host tests pass 323/323, both with #1797 and all three J873g PRs. Not booted on the M6 at the new base yet.

@sithglan

Copy link
Copy Markdown
Contributor Author

Rebased onto the refreshed #1797 (d87e41e, on integration/aurora 514ae1f). The branch is now 814b959 (was e2555c5) and merges cleanly again. git range-diff shows the three commits unchanged.

One commit is new: arm64: configs: asahi: build the T8152 ACIOPHY USB3 PHY. #1939 added hardware-defaults-tests, which requires every native driver option in asahi.config, and it failed on PHY_APPLE_ACIOPHY_USB3. defconfig plus asahi.config now resolves it to =m.

With #1797 and the three J873g PRs, at 514ae1f: apple-dt-check.sh shows 0 new CHECK_DTBS warnings (8 fewer) and every changed binding passes, and the host tests pass 321/321. The description is updated. Not booted on the M6 at the new base yet.

aurora-wip carries the J873g (Mac mini M6) hardware that integration lacks:
aurora-silicon#1197 (ANS2 NVMe, 10GbE on apcie port 2, SMC power off/restart, watchdog,
SPMI, USB2 hosts, audio DT) and the T8152 ADMAC layout.

Resolutions:
- sart: both sides added the same SART4 layout (T6050 on integration, T8152
  on aurora-wip); keep integration's sart_ops_v4 and match both.
- mailbox: keep integration's polled providers and its interrupt-driven
  receive for the T6050 GPU mailboxes (788441e, 41c359d), and
  add the J873 ANS post-office mailbox (rx_poll_required, j873_window)
  next to them. It receives through the T8152 ASCWrap v8 poller.
- nvme: integration's reset_optional replaces aurora-wip's optional_reset;
  keep the T6050 and T8152 tables.
- pcie: keep power-domain attach and the T8152 MRRS limit.
- admac: keep the T6050 display ADMAC and add the T8152 layout; the
  descriptor id goes into the flags word; the resume path is integration's.
- aop.rs, macaudio.c, t8152_aop_audio.rs, tas2764.[ch], sound Kconfig:
  integration's versions, which already carry the T8152/J873 commits and
  extend them (T8142, T6050). Dropped from aurora-wip with them: aurora-silicon#1410
  (integration matches T6050 itself) and the system_dfl workqueue switch
  of ad4910c.
- bindings: list both sides' compatibles. In apple,mailbox.yaml interrupts
  are required unless the mailbox is polled: integration's
  secure-rtbuddy-proxy or aurora-wip's T8152 ANS mailbox, which describes
  none.
  In apple,nvme-ans.yaml resets and power domains are required unless
  the controller is the T6050's or the T8152's, and integration's
  apple,sleep-wake-delay-ms stays T6050-only.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
@sithglan

Copy link
Copy Markdown
Contributor Author

Rebased onto the refreshed #1797 (bbfdefa, on integration/aurora 0abc2f3). The branch is now b6c31d8 (was 814b959) and merges cleanly again. git range-diff shows the four commits unchanged.

Booted on the M6 with the rebased stack: "apple-aciophy-usb3 383000000.phy: USB3 up", and both front-port hubs run at 10000 Mb/s. DT and host checks are as on #1797.

@RyanTheTide

Copy link
Copy Markdown
Contributor

Thanks for getting USB3 up on the M6 front ports. 10 Gbit/s to the hub is a nice result.

Two things before this can go in. First, we avoid a second implementation of a mechanism the tree already has. drivers/phy/apple/aciophy-usb3.c (the CFG 0x60000 power-down/reset sequence, the tunable application and the lane power-up) repeats the ATC PHY bring-up that drivers/phy/apple/atc.c owns. Please extend atc.c instead: add T8152 match data, plus a fixed-USB3 mode for a port wired straight to a device with no Type-C mux, selected by a DT property on the PHY node. Then other ports and boards wired the same way get it for free.

Second, the file header and the comment near line 148 name macOS driver classes and functions. Please describe the sequence by its registers and steps only, with no reference to macOS internals.

When it lives in atc.c, we can run no-regression rows for the shared PHY path on our M1 Pro / M2 / M4 Pro / A18 Pro.

LiamRay11 and others added 5 commits November 19, 2026 19:21
…mailboxes

On T8152 the NVMe (ANS), display (DCP), keyboard and trackpad (MTP)
and SEP coprocessors talk through windows of the same post-office
block as the SMC: counted FIFOs sharing one status register, with
interrupt masking left to the interrupt controller. The register
layout is the one apple,t8152-smc-mailbox already describes.

Add a compatible per coprocessor, each with apple,t8152-smc-mailbox as
its fallback, so the existing driver match serves them without a code
change and a later difference can still be keyed on the specific
compatible.

All four carry traffic on a MacBook Pro (M6, J804), with the
single-compatible form of these nodes: NVMe, the keyboard and
trackpad, and Touch ID run through them, and the DCP driver exchanges
its messages through the DCP window.

Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
[Thomas: taken from aurora-silicon#2105 for the J873g ANS node;
 placed before the T8152 ASCWrap v8 entry this branch adds]
Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
Describe the J873g ANS post-office mailbox as the J804 does: with
apple,t8152-smc-mailbox as the fallback compatible and the window's
send-empty and recv-not-empty interrupts.

The ADT's ans node lists interrupts 302, 262, 222 and 1349 (the last is
NVMe's, nvme-interrupt-idx 3). Every post-office mailbox's list starts
with 299 + its msgbox-mailbox-num and 259 + that number, and for the SMC
(760, 759) and the DCP (304, 264) mailboxes, which run on their
interrupts on the J873g, the first is send-empty and the second
recv-not-empty.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The J873g ANS node now carries apple,t8152-smc-mailbox as its fallback
and describes its interrupts, so the SMC mailbox's match data serves it
on its interrupts, as it serves the J804's. Remove the profile that
polled both directions without interrupts: its match entry, the
rx_poll_required and j873_window fields, and the machine and fixed
address check in probe.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
…ilbox

The J873g ANS mailbox is now described with the apple,t8152-smc-mailbox
fallback and its interrupts. Remove the standalone, interrupt-less
apple,t8152-ans-mailbox entry and its conditions.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The front USB-C ports of the Mac mini (2026, J873g) sit behind an on-board
USB3 hub. The hub is wired to the Type-C PHY (ACIOPHY) of the SoC's ATC2
directly, without a Type-C mux or port controller in between, so the PHY
only ever runs in one fixed USB3 configuration.

Describe the PHY in that role. Besides its own register block it needs the
PIPE handler of its DWC3 controller, which selects whether the controller's
PIPE interface is fed by the ACIOPHY or by the controller's internal dummy
PHY, and the PMGR power states and PSD block of the ATC that have to be up
before the PHY can be powered. The register tunables come from the PHY's
node in Apple's device tree.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The J873g's front USB-C ports sit behind an on-board VL822 hub wired to
ATC2's PHY directly, without a Type-C mux. So far the hub ran at USB2
only: the bootloader leaves the PHY powered down and the PIPE handler on
the controller's dummy PHY.

Bring the PHY up in USB3 mode: its PMGR dependencies, the ACIOPHY
power-up, efuse/PLL tunables, crossbar 0x110, fabric, PLL, USBC and lane
tunables, PHY reset release. Then switch the PIPE handler from the dummy
PHY to the ACIOPHY, holding the MAC's PIPE reset and power-down through
the PHY's BIST overrides meanwhile.

The PMGR dependencies are the ATC's DP_0, DP_1 and USB_AON power states
and its common PSD domain. There is no T8152 power domain driver for
them, so the PHY powers those it finds off and turns only those back off
again. The power-up expects the PHY in the clamped power-down state the
bootloader leaves it in, and the PIPE lock handshake is only acknowledged
while the controller is out of reset.

Power up lane 0 explicitly: without it the lane registers stay in AHB
reset, drop their tunables and the PHY never reports PIPE PhyStatus.

With it the hub enumerates at 10 Gb/s on the J873g. With the earlier
linux-aurora j873 version of this driver, a USB 3 gigabit NIC behind the
hub ran at 5 Gb/s and 873 Mbit/s with iperf3.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The two front USB-C ports sit behind an on-board VL822 hub on usb-drd2.
The hub's USB2 side is on the controller's eUSB2 PHY, which the loader
sets up, and its USB3 side on ATC2's Type-C PHY, wired directly without
a Type-C mux. So far the controller was limited to high speed and the hub
ran at USB2 only.

Describe ATC2's PHY in USB3 mode, hand it to usb-drd2 as its USB3 PHY and
drop the controller's high-speed limit. Nothing changes for usb-drd1 (the
back-left port). PS and PSD are ATC2's DP_0/DP_1/USB_AON power states and
its common PSD domain (ADT clock-gates 57). The tunables are the groups
of the ADT's atc-phy2 node (26A434) that apply to USB3 on lane 0. Some
of them differ between the four ATCs of the same machine, so they likely
carry per-device calibration.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The Mac mini (M6, J873g) front ports reach their USB3 hub through the
T8152 ACIOPHY USB3 PHY. Build it beside the other Apple PHYs, as the
shared defaults require of every native driver.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
@sithglan

Copy link
Copy Markdown
Contributor Author

Thanks. I've done the second point. The head is now 6e2ae8b6f4e0, on #1797's new head:

  • The aciophy-usb3.c file header now describes the bring-up by its steps: the power-down/reset release, the efuse/PLL tunables, crossbar 0x110, the remaining tunables, the PHY reset release, then the PIPE handler switch under the BIST overrides.
  • The lane 0 up/down, BIST override and PIPE switch comments now say what the code does, with no macOS class or function names.
  • I removed the same names from the two commit messages, the tunable comment in t8152-j873-usb.dtsi and the PR description.

No functional change: the driver builds with no W=1 warnings, and the diff is comments only.

I agree with the first point, moving the PHY into atc.c, and it's next: T8152 match data, plus a fixed-USB3 mode selected by a property on the PHY node, reusing atc.c's power-down/reset, tunable and lane power-up code. The T8152-specific parts are crossbar 0x110, the BIST hold around the PIPE handler switch, and lane 0's explicit power-up. It also needs the ATC's PMGR power states and PSD domain as real power domains rather than registers the PHY writes itself, which is the same PSD provider question I raised on #1797. Because it changes the bring-up path, I'll test it on the M6 before pushing.

@RyanTheTide

Copy link
Copy Markdown
Contributor

Thanks for cleaning up the comments and commit messages. The description by registers and steps reads well. The plan for atc.c sounds right to us: T8152 match data, a fixed-USB3 mode selected by a PHY-node property, and only crossbar 0x110, the BIST hold and lane 0's explicit power-up as T8152-specific code. The power-domain question is the same one as on #1797, so the shared PSD provider there should cover it. When the atc.c version is pushed, we'll run no-regression rows for the shared PHY path.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants