Skip to content

arm64: dts: apple: t8142: CPU idle, PMU and cluster power gate on every M5 (on #2325) - #2328

Draft
RyanTheTide wants to merge 2 commits into
integration/aurorafrom
dtfill/t8142-cpu-idle-default
Draft

RyanTheTide wants to merge 2 commits into
integration/aurorafrom
dtfill/t8142-cpu-idle-default

Conversation

@RyanTheTide

Copy link
Copy Markdown
Contributor

Problem

On the MacBook Pro 14-inch M5 (J704), the boot P core never powers down in WFI, perf has 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_pwrgate existed only in t8142-j813.dts, so the J815 lacked it too.
  • cpu_pmu was enabled per board.
  • The idle states lived in the Air-only t8142-j813-psci-idle.dtsi.

These are CPU and PMGR facts of the T8142: the J704, J813 and J815 ADTs have the same /cpus and the same pmgr.

Change

  • Move cluster_pwrgate into t8142.dtsi, as t8140.dtsi already does.
  • Enable cpu_pmu in t8142.dtsi.
  • Rename t8142-j813-psci-idle.dtsi to t8142-psci-idle.dtsi and include it from t8142.dtsi. cpuidle-psci still only probes when a /psci node is present.
  • Update the file name in the comment in cpuidle-apple.c.

Testing

cpp + dtc before and after, decompiled trees compared node by node:

  • J813: unchanged.
  • J815: gains cluster_pwrgate.
  • J704: gains cluster_pwrgate, the PMU, the idle-states node and cpu-idle-states on all ten CPUs.

dt-validate -m reports nothing new on any of the three boards.

Still to run

  • @term-guy (J704), booted through the loader's PSCI monitor:
    • /sys/devices/system/cpu/cpu*/cpuidle/state*/usage climbs on every CPU.
    • perf stat -e cycles,instructions sleep 1 counts.
    • The cluster power-gate driver probes.
    • Three s2idle cycles pass. Deep sleep stays off: the J704 has no sleep controller node yet.
  • @m0d16l14n1 (J815): cpuidle residency on the boot core before and after.
Details

Assisted-by: LLM (Claude:Opus 5.5)

…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>
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.

1 participant