From 04640c5fb4629cc203c9228ea371df71ff4e7cdf Mon Sep 17 00:00:00 2001 From: LiamRay11 <228416644+LiamRay11@users.noreply.github.com> Date: Mon, 16 Nov 2026 08:46:13 -0800 Subject: [PATCH 1/2] wifi: apple: centauri: add the MacBook Pro (M6, J804) 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 --- drivers/net/wireless/apple/centauri/centauri.h | 6 ++++++ drivers/net/wireless/apple/centauri/centauri_pci.c | 1 + 2 files changed, 7 insertions(+) diff --git a/drivers/net/wireless/apple/centauri/centauri.h b/drivers/net/wireless/apple/centauri/centauri.h index 2ea9c2f7923b9..b7d0f9d7c0f33 100644 --- a/drivers/net/wireless/apple/centauri/centauri.h +++ b/drivers/net/wireless/apple/centauri/centauri.h @@ -48,6 +48,9 @@ struct centauri { * J873 (Mac mini M6): board 0x24, chip 0x8152 from its ADT, the composition taken from the J813 * word; port 0 config 0x388028000, lane 0x38f010000 and PERST# gpio0 pin 3 (0x31a000000 + 4 * 3) * from its ADT; config +0x130 is 0x208 as in the m1n1 T8152 bring-up that links the port. + * J804 (MacBook Pro 14" M6): board 0x22, chip 0x8152 from its ADT /chosen; port 0 config, + * PHY lane and PERST# (pci-bridge0 function-perst = gpio0 pin 3) are J873's, and so are the + * port tweaks, the 27.x link TLV and the scan TLVs. * keep_port_tables: the J813 sequence zeroes the 16 words at port+0x3000 and the 256 words at * port+0x3800. On the J873 those are the RID2SID and MSIMAP tables that pcie-apple programmed * (PORT_T602X_RID2SID, PORT_T602X_MSIMAP); the cycle then drops function 0's stream entry and @@ -83,6 +86,9 @@ static inline const struct centauri_board *centauri_board(void) { "apple,j873g", "apple/centauri/j873-ftab.bin", 0x00248152, 0x388028000ULL, 0x38f010000ULL, 0x31a00000cULL, 0x208, 0, true, 386, true }, + { "apple,j804", "apple/centauri/j804-ftab.bin", 0x00228152, + 0x388028000ULL, 0x38f010000ULL, 0x31a00000cULL, 0x208, 0, true, + 386, true }, }; int i; diff --git a/drivers/net/wireless/apple/centauri/centauri_pci.c b/drivers/net/wireless/apple/centauri/centauri_pci.c index c44e22717f0b5..33eb5b5b856c5 100644 --- a/drivers/net/wireless/apple/centauri/centauri_pci.c +++ b/drivers/net/wireless/apple/centauri/centauri_pci.c @@ -310,3 +310,4 @@ MODULE_DESCRIPTION("Apple N1 Centauri native PCI and ACIPC bring-up backend"); MODULE_FIRMWARE("apple/centauri/j813-ftab.bin"); MODULE_FIRMWARE("apple/centauri/j815-ftab.bin"); MODULE_FIRMWARE("apple/centauri/j873-ftab.bin"); +MODULE_FIRMWARE("apple/centauri/j804-ftab.bin"); From dd61a513911bceeee97385fef1a41b03a8ec2fed Mon Sep 17 00:00:00 2001 From: LiamRay11 <228416644+LiamRay11@users.noreply.github.com> Date: Mon, 16 Nov 2026 08:46:33 -0800 Subject: [PATCH 2/2] Bluetooth: btcentauri: allow the MacBook Pro (M6, J804) 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 --- drivers/bluetooth/btcentauri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bluetooth/btcentauri.c b/drivers/bluetooth/btcentauri.c index 84f9789f9a2bf..817b644e95ade 100644 --- a/drivers/bluetooth/btcentauri.c +++ b/drivers/bluetooth/btcentauri.c @@ -996,7 +996,7 @@ static int cen_probe(struct pci_dev *pdev, const struct pci_device_id *id) int ret; if (!(of_machine_is_compatible("apple,j813") || of_machine_is_compatible("apple,j815") || - of_machine_is_compatible("apple,j873g")) || + of_machine_is_compatible("apple,j873g") || of_machine_is_compatible("apple,j804")) || PCI_FUNC(pdev->devfn) != 2) return -ENODEV; bt = devm_kzalloc(&pdev->dev, sizeof(*bt), GFP_KERNEL);