Skip to content

arm64: dts: apple: enable PMP for M2 Pro and Max - #2013

Draft
muness wants to merge 1 commit into
aurora-silicon:integration/aurorafrom
muness:codex/j414c-enable-pmp
Draft

muness wants to merge 1 commit into
aurora-silicon:integration/aurorafrom
muness:codex/j414c-enable-pmp

Conversation

@muness

@muness muness commented Nov 15, 2026 •

Copy link
Copy Markdown

Move APPLE_USE_PMP into the T6021 SoC include. T6020 inherits it from T6021, so the J414s board-level define can go. The PMP can then manage fabric and DCS p-states on M2 Pro and M2 Max. Ship these DTBs after the Aura loader fix.

Enabling the same define on T6022 exposed a missing pmp_report_avd_sys_die1 phandle. M2 Ultra needs a separate change to describe that power domain.

DTB build

All eight T602x DTBs build with Aurora’s bundled dtc. J414s and both M2 Ultra DTBs are byte-for-byte identical to the base. Five boards gain the PMP alias (J416s, J474s, J414c, J416c, J475c).

J414c results from the board-level trial

On Aurora Alarm -40, the original board-level DTB booted with patched Aura, passed 87 tunables (13,220 value bytes), and logged PMP firmware and endpoint ready and PMP manages fabric and DCS p-states. The DTB SHA-256 is ad16664a8cbc1e323bb883999a741ae1ca9fae20b0aa57c4aedc787c5ab28058.

The original board-level DTB passed 10/10 s2idle cycles on a J414c with patched
Aura 52af355c, Aurora Alarm -40 and a Microsoft Surface Thunderbolt 4 Dock.
The built-in panel returned, the stock BCM4388 driver reconnected and
answered a Wi-Fi gateway ping, and 22 USB devices enumerated after every
wake. The Wi-Fi reload workaround was disabled. PMP stayed enabled.

Suspend durations in seconds, cycles 1–10: 24.7, 31.1, 30.6, 37.9, 49.1, 69.2, 27.4, 32.0, 43.6, 33.2.

Each wake logged a DRM resume error (-22), USB4 DisplayPort discovery and
tunnel messages, and DCP lane-count warnings. Nine wakes also logged USB
descriptor errors (-32) on a dock hub and USB audio sample-rate warnings.
The devices still enumerated. The cycle logs contain no PMP or RTKit warnings.
The PMP-on boot logged that pmp-isp-sys would stay powered. The Aura PR records the
stock bootloader failure and patched boot comparison.

Screen-on idle power

J414c on battery at 40% built-in brightness with the dock unplugged. Both
boots used Aurora Alarm -40, the same Aura Stage 2 and U-Boot, and differed
only in the J414c DTB. Each run settled for 60 seconds, then sampled the SMC
power sensors at 1 Hz for 240 seconds.

Average PMP off PMP on Reduction
Total system 10.938 W 8.963 W 1.975 W (18.1%)
Heatpipe 5.930 W 2.675 W 3.255 W (54.9%)

One run per setting, PMP on first. CPU activity averaged 2.7% with PMP off
and 3.6% with PMP on.

Review checklist

  • Build and compare all eight T602x DTBs.
  • Land the Aura loader fix before shipping the PMP-enabled DTBs.
  • Boot the revised J414c DTB and confirm PMP initializes.
  • Boot another T602x board covered by this change, capture PMP manages fabric and DCS p-states, and run three s2idle cycles with no PMP or RTKit warnings.
  • Run the repository’s DT and host checks.
  • Add human DCO sign-off for the revised patch.

Assisted-by: LLM (OpenAI:GPT-6.2-sol)

@RyanTheTide

Copy link
Copy Markdown
Contributor

Thanks for the thorough J414c rows: the tunables count, 10/10 s2idle with display, Wi-Fi and USB checked after each wake, and the idle power table.

One request on the shape. APPLE_USE_PMP only switches on SoC blocks (the PMP node and its report entries in the t602x dtsi files). Today it is set on the J414s only, and this PR adds a second board. Since nothing about the PMP differs between T602x boards, could the define move to the SoC include instead: once at the top of t6021.dtsi (next to APPLE_T602X_NON_ULTRA), and the same in t6020.dtsi/t6022.dtsi, dropping it from t6020-j414s.dts? The real dependency is the loader change (aura#268), so this would land after that. If you prefer, we can do the family move and use your J414c rows as the T6021 evidence.

The extra rows for the SoC-level form, where an owner can run them: one other T602x machine (e.g. a J475c) with PMP manages fabric and DCS p-states, three s2idle cycles, and no PMP or RTKit warnings.

Move APPLE_USE_PMP to the T6021 SoC include. T6020 inherits it from that include, so drop the J414s board define.

Pair the DTBs with a bootloader that can copy the PMP tunables. T6022 needs a separate change for its second-die AVD power domain.

Link: aurora-silicon/aura#268
Signed-off-by: Muness Castle <931+muness@users.noreply.github.com>
@muness
muness force-pushed the codex/j414c-enable-pmp branch from b5d5dfa to 1500657 Compare November 22, 2026 14:54
@muness muness changed the title arm64: dts: apple: t6021-j414c: enable PMP arm64: dts: apple: enable PMP for M2 Pro and Max Nov 22, 2026
@RyanTheTide

Copy link
Copy Markdown
Contributor

Thanks, 1500657 is the shape I asked for. APPLE_USE_PMP now sits once in t6021.dtsi next to APPLE_T602X_NON_ULTRA, T6020 inherits it through t6020.dtsi, and T6022 stays out because it doesn't include t6021.dtsi. The J414s board define is gone. The change is SoC-level, so it now also turns PMP on for the J416c and J475c, which is the point. Your J414c rows cover the SoC.

One merge-order point: this depends on aura#268 (OPEN), which makes room for the PMP tunables in the boot device tree. Merging the DTBs first would leave the PMP node enabled on loaders that can't copy them. So please land aura#268 first, or confirm what the PMP does on these boards when its tunables are absent. If it then stays off cleanly, the order doesn't matter. Approving with that ordering.

Assisted-by: LLM (Claude:Opus 5.5)

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.

2 participants