Repository navigation
arm64: dts: apple: t8142: CPU idle, PMU and cluster power gate on every M5 (on #2325) - #2328
RyanTheTide wants to merge 4 commits into
Conversation
…ery M5 The Neural Engine (with its three DARTs and ANE_SYS power state), the video encoder (two DARTs, VENC power tree) and both JPEG engines (DART, JPG power state) are SoC blocks: the J704, J813 and J815 ADTs give the same addresses, interrupts and power gates for ane, dart-ane, ave, dart-ave, jpeg0, jpeg1 and dart-jpeg. Only the J815 enabled all three and the J813 only the encoder (twice); the J704 had none of them. Turn them on in t8142-peripherals.dtsi and drop the per-board enables. The ANE and the encoder run firmware that iBoot preloads: the boot loader hands the preload over by compatible and disables the node when the ADT has none, so a board without a preload keeps them off. Every DART keeps its engine's power domain. The JPEG engines need no firmware. J815: no change in the built tree beyond status "okay" becoming implicit. J813: gains the Neural Engine and both JPEG engines. J704: gains all three. The ANE and JPEG enables on J815 come from m0d16l14n1's 33d8f13 and c3c1417. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
…ry M5 The CPU cluster power-gate enables, the CPU PMU and the PSCI retention idle state are CPU/PMGR facts of the T8142, not of a board: the J704, J813 and J815 ADTs have the same /cpus and the same pmgr. They were only described for the MacBook Airs (cluster_pwrgate in t8142-j813.dts alone, cpu_pmu enabled per board, the idle states in the Air-only t8142-j813-psci-idle.dtsi), so on the MacBook Pro 14" (J704) the boot P core never powered down in WFI, perf had no hardware counters and cpuidle-psci had no state under aura's PSCI monitor. Move cluster_pwrgate into t8142.dtsi (as t8140.dtsi already has it), enable cpu_pmu there, and rename t8142-j813-psci-idle.dtsi to t8142-psci-idle.dtsi, included from t8142.dtsi. Without a /psci node cpuidle-psci does not probe, as before. J813: unchanged. J815: gains cluster_pwrgate. J704: gains cluster_pwrgate, the PMU and the retention idle state. cluster_pwrgate is gig3m's (c58ab8c). Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
No row has covered this one yet. gig3m's J813 row on #2325 ran with this PR on top, but this change leaves the J813 tree unchanged, so that row only shows it doesn't break the J813 (including two deep sleeps). term-guy's J704 rows on #2325 and #2329 were on a kernel without it. Still open, as listed above:
|
|
J815 (MacBook Air 15" M5) row for the boot-core cpuidle residency. Kernel: integration/aurora Before and after. On the J815 this PR does not change the device tree: the J815 DTB with it is identical, node for node, to our previous J815 DTB without it, apart from phandle numbers. (In the old tree Residency. 30 s with the desktop idle, deltas of
On T8142, index 1 is the second WFI entry by design (the driver keeps index 1 for the s2idle path, and CYC_OVRD is locked from M4 on), so it is named |
|
J704 (MacBook Pro 14" M5) row. macOS 27.2 (26B123) stub. Kernel: this head No PSCI monitor here. The installed aura starts the CPUs with spin-table (secondaries confined at EL2), so there is no cpuidle. 30 s with the desktop idle, deltas of
Every CPU climbs. PMU. Before this PR the J704 had no hardware counters ( Cluster power gate. The driver ran at boot ( Read back through /dev/mem: both words are 0x80000000. On the kernel without this PR, the P word (+0x60, the boot core's) is 0x00000000, as the description says. s2idle.
Deep sleep stays off: no sleep controller node on the J704 yet. Unrelated to this PR, seen in the same boots: with #2325's AVE enabled, the J704 on 27.2 logs AI-assisted, tested by me on the hardware. |
Conflicts: t8142-j813.dts, t8142-j815.dts (took integration: #1806 moved the board enables to t8142-j813-j815.dtsi and cluster_pwrgate there); dropped the now-redundant venc/ANE/JPEG enables from t8142-j813-j815.dtsi. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Via the updated dtfill/t8142-media-default (#2325). No textual conflicts; t8142-j813-j815.dtsi: dropped the cluster_pwrgate copy integration added there (now in t8142.dtsi), t8142-j813-j815-sleep.dtsi comment points at t8142.dtsi. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
Merged integration/aurora (d1b022d, via the updated #2325 branch); no textual conflicts, dropped the duplicate cluster_pwrgate integration added to t8142-j813-j815.dtsi (now in t8142.dtsi); t8142-j704/j813/j815 dtbs and cpuidle-apple.o build (J813/J815 differ from #2325 only by the implicit pmu status=okay). |
Problem
On the MacBook Pro 14-inch M5 (J704), the boot P core never powers down in WFI,
perfhas no hardware counters, and cpuidle-psci has no idle state under the loader's PSCI monitor. The CPU cluster power-gate enables, the CPU PMU and the PSCI retention state were described only for the MacBook Airs:cluster_pwrgateexisted only int8142-j813.dts, so the J815 lacked it too.cpu_pmuwas enabled per board.t8142-j813-psci-idle.dtsi.These are CPU and PMGR facts of the T8142: the J704, J813 and J815 ADTs have the same
/cpusand the samepmgr.Change
cluster_pwrgateintot8142.dtsi, ast8140.dtsialready does.cpu_pmuint8142.dtsi.t8142-j813-psci-idle.dtsitot8142-psci-idle.dtsiand include it fromt8142.dtsi. cpuidle-psci still only probes when a/pscinode is present.cpuidle-apple.c.Testing
cpp + dtc before and after, decompiled trees compared node by node:
cluster_pwrgate.cluster_pwrgate, the PMU, theidle-statesnode andcpu-idle-stateson all ten CPUs.dt-validate -mreports nothing new on any of the three boards.Still to run
/sys/devices/system/cpu/cpu*/cpuidle/state*/usageclimbs on every CPU.perf stat -e cycles,instructions sleep 1counts.Details
t8142-j813.dtsnext to each other).cluster_pwrgatecame from @gig3m (c58ab8c). The E/P words are in pmgr reg[34] at +0x0/+0x60, the same pmgr on all three boards.traces/kernel/20261119-dtfill-m5m6/(dts-idle, valm-idle-*).Assisted-by: LLM (Claude:Opus 5.5)