Repository navigation
arm64: dts: apple: t8152-j804: the N1 Wi-Fi/Bluetooth on PCIe port 0 (on #2107) - #2338
Draft
RyanTheTide wants to merge 9 commits into
Draft
RyanTheTide wants to merge 9 commits into
RyanTheTide wants to merge 9 commits into
Conversation
The T8152 (M6) PMGR blocks are compatible with the T8103 ones. The J873 device tree already uses this compatible; document it. Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The T8152 (M6) PMGR power state controls are compatible with the T8103 ones. The J873 device tree already uses this compatible; document it. Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The I2C controllers of T8152 (M6) are compatible with the T8103 ones. Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The T8152 (M6) watchdog is compatible with the T8103 one. Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The T8152 (M6) FPWM, which drives the keyboard backlight of the J804 MacBook Pro, is compatible with the S5L one. Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Reading every pin of the T8152 GPIO block to fill a register cache at probe takes an SError on the J804 MacBook Pro: pins 78 and 208 fault on an AP read. The T8140 profile accesses the block uncached and honours gpio-reserved-ranges, so a board that has to keep the CPU off such pins can use "apple,t8152-pinctrl", "apple,t8140-pinctrl", as T6050 does with its T8132 fallback. The existing T8103 fallback stays valid for boards that do not need it. Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
As on T8140, the OS cannot request core power-down on T8152 (M6) and WFI is the only idle state. Allow "apple,t8152-cpuidle" with the T8140 compatible as its fallback, which the driver already matches. Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Turn the disabled J804 inventory into a board description for a RAM
boot from the loader, on top of the shared T8152 description:
- the twelve CPUs (the loader removes those it has not started),
with the first two performance states of each cluster, which the
cpufreq driver may use without a thermal policy, as on J873
- the AIC and the timer, the boot framebuffer and CPU idle
- the SMC with its mailbox, the pcIO output that resets the
trackpad's touch controller, and the hardware monitor: fan, power,
voltage and current keys, with temperatures discovered. The fan
is monitored only; its speed stays under firmware control
- the watchdog, the GPIO controller with the pins that fault on an
AP read reserved, the I2C controllers of the jack codec and the
speaker amplifiers, and the keyboard backlight PWM
- the boot NOR and the PMGR block from t8152-j873-qspi.dtsi, shared
with J873, plus the SIO and I2C power states
Everything else stays described and disabled; the storage, display,
input, wireless and GPU nodes follow with their drivers. The values
come from the J804 ADT.
Tested on a MacBook Pro (M6, J804) with an equivalent standalone device
tree on an earlier base (integration/aurora f5fa539): all twelve CPUs
come up, the watchdog restarts the machine, the SMC hardware monitor
reports about 170 inputs including the fan, the keyboard backlight
lights, and the NVRAM partition of the boot NOR reads. This tree,
rewritten onto the shared T8152 labels, has not been booted.
Signed-off-by: LiamRay11 <228416644+LiamRay11@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The J804 has no apcie host, port 0 or port-0 DART, so the N1 Wi-Fi and Bluetooth functions that the centauri drivers handle never appear. The J804 ADT's /arm-io/apcie, apcie/pci-bridge0 (PERST# GPIO 3, CLKREQ# GPIO 0, maximum link speed 3), its centauri-control/alpha/beta functions and /arm-io/dart-apcie0 have the same registers, interrupts and pins as the J873g's. Move the host and port 0 from t8152-j873-n1.dtsi (sithglan) into a board-neutral t8152-n1.dtsi and include it from both boards. The J873g keeps its own pinctrl_ap and pcie0_dart in t8152-j873-n1.dtsi; its DTB is unchanged. The J804 uses pcie0_dart and pinctrl_ap from t8152.dtsi and its own board file. On the J804, add the PMGR power states the port and its DART sit in, ADT pmgr devices APCIE_GP (+0x8c0) and APCIE_SYS_GP (+0xec0, child of APCIE_GP), kept on because the loader hands over a trained link, and give them to the host and to pcie0_dart. Describe the Wi-Fi and Bluetooth functions (0,1 and 0,2) with the wifi0 and bluetooth0 aliases, which the loader fills from the ADT's /chosen mac-address-wifi0 and mac-address-bluetooth0. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Contributor
|
J873g regression check. I preprocessed and compiled At runtime, the J873g test kernel used for #2330/#2333 today has the same N1 description: Wi-Fi reaches |
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.
Problem
The MacBook Pro 14-inch M6 (J804) has no apcie host, port 0 or port-0 DART. The N1 Wi-Fi and Bluetooth functions that #2108's centauri entry handles therefore never show up.
Change
t8152-j873-n1.dtsiinto a board-neutralt8152-n1.dtsi, included by both boards. The J873g keeps its ownpinctrl_apandpcie0_dart; its DTB is unchanged.pcie0_dart.wifi0/bluetooth0aliases, which the loader fills from the ADT's factory addresses.Testing
cpp + dtc: the J873g decompile is identical before and after, and J833ct is unchanged. The J804 gains the pcie host, port 0, the N1 function nodes, the aliases, the two power states and an enabled
pcie0_dart.Still to run
wlan0associates using the Mac's own MAC address.hci0comes up with its own BD address.Details
/arm-io/apcie,pci-bridge0(PERST# GPIO 3, CLKREQ# GPIO 0, gen 3, IRQ 1571), the three centauri functions anddart-apcie0(IRQ 1572) match. The J804 differs only on port 2 (next PR).t8152-j873-n1.dtsi, moved unchanged.traces/kernel/20261119-dtfill-m5m6/(patches/j804-n1-sd/REPORT.md, dts-*).Assisted-by: LLM (Claude:Opus 5.5)