Skip to content

wifi: apple: centauri: add the MacBook Pro (M6, J804) - #2108

Open
LiamRay11 wants to merge 2 commits into
aurora-silicon:integration/aurorafrom
LiamRay11:j804/centauri
Open

LiamRay11 wants to merge 2 commits into
aurora-silicon:integration/aurorafrom
LiamRay11:j804/centauri

Conversation

@LiamRay11

Copy link
Copy Markdown

Summary

This adds the J804 machine row to the Centauri (N1) Wi-Fi driver and allows btcentauri on J804.

Changes

  1. wifi: apple: centauri: add the MacBook Pro (M6, J804): board word 0x00228152 (board-id 0x22, chip 0x8152). Port config, PHY lane, PERST# pad, port tweaks, link TLV and scan TLVs are J873's, read from the J804 ADT. Firmware: apple/centauri/j804-ftab.bin (MODULE_FIRMWARE), built from the Mac's own macOS by the installer.
  2. Bluetooth: btcentauri: allow the MacBook Pro (M6, J804).

Superseded parts of the bring-up patches (dropped)

  • MAC from local-mac-address and BT local-bd-address: upstream already has both.
  • centauri-multi-akm: upstream accepts PSK among several AKMs.

Not included (follow-up)

  • The cfg80211 stale-scan fix is now its own PR (j804/cfg80211-stale-scan).
  • The Centauri scan/join abort, interface-down quiesce, PCI suspend/resume and rebind-keeps-firmware changes (bring-up centauri-sleep.py). Upstream now has its own scan abort and per-chunk changes, so the remainder needs a careful rebase and its own PR.
  • The J804 PCIe, N1 and Bluetooth DT nodes, which come after the board PR.

Testing

On hardware: MacBook Pro 14-inch (M6, J804), 2026-11-16, tested by LiamRay11.

  • What ran: kernel 7.3.0 built from integration/aurora bf423bf0e with all nine J804 linux PRs merged (t8152-mailboxes, dart-gen3, dt-board, centauri, g18-fast-retire, cfg80211-stale-scan, smc, cs42l84-jack, and an NVMe PR that is not sent yet), plus retest-only device-tree changes that are not part of these PRs: SSD nodes (ANS mailbox, SART, NVMe), PCIe port 0 with the N1 Wi-Fi, the USB0 gadget console, and a read-only NVRAM partition. Those nodes were needed to reach the root filesystem and SSH.
  • Booted through aura on the installed root filesystem. A systemctl reboot from this kernel (watchdog restart) returned to the installed system.

Results for this PR:

  • The driver loads apple/centauri/j804-ftab.bin for board word 0x00228152, and wld0 connects. 200 MB pushed over it arrived with an identical SHA-256.
  • Bluetooth: btcentauri's probe returns -EBUSY on this kernel (a known issue, not addressed by this PR), so the Bluetooth half was not verified here.

Earlier, on an older base (integration/aurora f5fa539): the N1 joined WPA2 networks (DHCP, DNS, HTTPS ~10 MB/s, NTP, reconnect at boot), the MAC came from the loader, Bluetooth started natively with the loader's address and a BlueZ scan found devices (pairing/ACL not tested).

Checks on this base: drivers/net/wireless/apple/centauri/ and drivers/bluetooth/btcentauri.o build with W=1 without warnings.

integration/aurora has since moved to 677be395b; this branch still merges into it without conflicts.

Dependencies

None for the code. The DT nodes need j804/dt-board.

🤖 Generated with Claude Code

LiamRay11 and others added 2 commits November 16, 2026 10:58
The J804 (14-inch MacBook Pro, M6) has the N1 on T8152 PCIe port 0,
wired as on the J873 Mac mini: the same port config, PHY lane and
PERST# pad (pci-bridge0 function-perst, gpio0 pin 3), as read from its
ADT. Its /chosen gives board-id 0x22 and chip-id 0x8152, so the board
word is 0x00228152. The firmware is the J804 ftab with its ticket,
apple/centauri/j804-ftab.bin, which the installer builds from the
Mac's own macOS.

Tested on a MacBook Pro (M6, J804), on an earlier base
(integration/aurora f5fa539): the N1 boots, joins WPA2 networks and
gets DHCP, DNS, HTTPS (about 10 MB/s) and NTP, and reconnects at boot.
The MAC address is the Mac's own from the loader's local-mac-address.

Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The J804 has the same N1 as the J873 Mac mini, with Bluetooth on PCI
function 2 (106b:1903). Let the driver bind there.

Tested on a MacBook Pro (M6, J804), on an earlier base
(integration/aurora f5fa539), with native startup and the loader's
local-bd-address: the controller comes up with the Mac's own address and
a BlueZ scan finds the devices around it. Pairing and ACL data were not
tested.

Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

@sithglan sithglan left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test report, 2026-11-17: Apple Mac mini M6 (J873g/T8152, board 0x24). PR revision tested: dd61a513911bceeee97385fef1a41b03a8ec2fed.

Host validation used the combined #2105–2108/#2110–2112 series (54742c617db4 on 677be395b9d2) with Clang 22. All changed driver objects built with W=1 and no new warnings; two pre-existing DART unused-helper warnings were unchanged.

The Centauri driver objects (including Bluetooth) built with Clang 22 and W=1 with no new warnings. The new board entry is J804-specific; this J873g mini cannot qualify that entry on hardware. Successful Wi-Fi scans elsewhere in the combined test are not evidence of J804 board-row coverage.

@RyanTheTide

Copy link
Copy Markdown
Contributor

Thanks for bringing up Wi-Fi and Bluetooth on the J804.

The Bluetooth probe in drivers/bluetooth/btcentauri.c:998-999 admits a hand-written list of machines (now with apple,j804), and the same boards are listed again in centauri_board() (centauri.h:89-91). We select behaviour by a hardware or device-tree property rather than by the list of machines it was tested on. Could the BT probe accept any function 2 whose board resolves through centauri_board()? Better still, it could key off the N1 port's DT node, so a new board needs only its own entry and no second list.

Related, and older than this PR: the port config, PHY lane and PERST# addresses in that table are hardware description and would sit better in the board DT, where pcie-apple already reads them. Not needed for this PR.

We can run no-regression rows on our other Macs if that helps.

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.

3 participants