Repository navigation
t6050: map the PMP's fast-die effort on every board - #2355
RyanTheTide wants to merge 3 commits into
Conversation
…report apple,fast-die-effort names a lane of the PMP report. Say what a report node that the board leaves disabled means: the board does not run the PMP, and where the limit is optional for the SoC no limit applies. This lets a SoC's dtsi describe the lanes once for every board. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
apple,fast-die-effort points a cluster at a lane of the PMP report. On SoCs where the limit is optional (no needs_thermal_policy, e.g. T6050), a cluster without the property runs without the limit, but a cluster whose property points at a report that the board leaves disabled is held at the fallback limit for good: the report never probes, so no sample ever finds the PMP running. That forced the lanes into each board file that runs the PMP, although the lanes are the SoC's. Treat a disabled report like a missing property where the limit is optional: the board does not run the PMP, so there is no effort to follow. The SoC's dtsi can then describe the lanes once. SoCs that require the limit (T8140, T8152) still fail closed, and an enabled report that never reports running still holds the fallback limit. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
The PMP's FAST-DIE-CE range and the order of its lanes (the ADT's fast-die-ctrl-ce-map: MACC0, MACC1, PACC_ANE) belong to the T6050, not to a board, and the firmware leaves the throttling to the OS on every T6050. The mapping was in t6050-j714s.dts only, so the K116s, which also runs the PMP, kept its clusters at their top state while the effort sat at its maximum, and every other board would need its own copy once it runs the PMP. Move the three apple,fast-die-effort properties next to pmp0_report in t6050-peripherals.dtsi, which every T6050 board includes. The limit follows the report: J714s, J714c and K116s enable it and get the limit; the boards that leave it disabled get none, as before (previous commit). Die 1's clusters on the J775D have no lane in pmp0's range and stay unmapped. This also covers the K116s change proposed in #2211, which measured the same lanes on a K116s. Fixes: c0a5202 ("arm64: dts: apple: t6050-j714s: Enforce the PMP's fast-die effort") Suggested-by: Diljit Singh <hey@djdev.me> Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
Ryan, this covers what #2211 does for the K116s, and in the better place. Once this is out of draft I will close #2211 in its favor. The K116s numbers from #2211, for the record here. The mapping is the same three lanes, so they should carry over. Firmware 27.2, four minutes of
Lanes 0 and 1 read 0 in both runs. Two notes:
|
|
Tested on the K116s (firmware 27.2): this PR's three commits (head 39c504a) on
The P cluster's The K116s enables |
|
Looks good; approve once the J714c and disabled-report rows have run. The selector is now a property of the machine: the report node's
Two boards change behaviour and neither has run:
HW row: on this head, both with 0 AVC, 0 failed units and no new kernel errors.
Assisted-by: LLM (Claude:Opus 5.5) |
Problem
The PMP's fast die-temperature effort is mapped to the T6050 CPU clusters in
t6050-j714s.dtsonly (c0a5202, lines 468-486 before this change;t6050-base.dtsisaid "Other boards are not qualified yet"). The lanes and their order (the ADT'sfast-die-ctrl-ce-map: MACC0, MACC1, PACC_ANE) belong to the SoC, and on every T6050 the firmware leaves the throttling to the OS. The K116s runs the PMP but has no mapping, so its clusters stay at their top state while the effort sits at its maximum. Each further board would need its own copy.The mapping could not simply move to a shared file:
apple-soc-cpufreqholds a cluster at its fallback limit for good when its property points at a report that the board leaves disabled, and 8 of the 11 T6050 boards leavepmp0_reportdisabled.Change
cpufreq: apple-soc: a disabled report node is treated like a missing property where the limit is optional (needs_thermal_policyunset, as on T6050): the board does not run the PMP, so there is no effort to follow. T8140 and T8152, which require the limit, still fail closed. An enabled report whose PMP never reports running still holds the fallback limit.dt-bindings: the description says what a disabled report means.t6050-peripherals.dtsi: the threeapple,fast-die-effortproperties, next topmp0_report, for every T6050 board. Removed fromt6050-j714s.dts. Die 1's clusters on the J775D have no lane in pmp0's three-lane range and stay unmapped.The selector is now the report's
status(whether the board runs the PMP), not a board list. This also covers the K116s change proposed in #2211 and supersedes #2211; its K116s measurements confirm the same lanes on that board.Testing
-s, phandle numbers ignored):apple,fast-die-effort = <&pmp0_report N>oncpufreq_mc0/mc1/pc.okay): J714s (unchanged), J714c, K116s. The other 8 (J716c, J716s, J775c, J775D, J873s, K114c, K114s, K116c) leave the report disabled, so the driver applies no limit, as before.drivers/cpufreq/apple-soc-cpufreq.obuilds with W=1 and adds no warnings (release config, LLVM).Still to run
openssl speed -multi 18. On a J714s nothing should change.dmesg | grep -i fast-dieshould be empty, as before.Why every T6050 board is safe
scaling_max_freq(a FREQ_QOS_MAX request). It never raises a clock.apple_fast_die_init()before allocating anything, exactly as when the property is absent. The CPU hotplug state is registered whenever any node has the property. Its callbacks do nothing for a cluster without a limit.Other SoCs checked for the same gap
t604x.dtsi.t8140.dtsi.pmp-reporthas no fast-die offset ("No qualified fast-die effort on this generation"). There is nothing to map without the ADT's ptd-range for that entry.fast-die-ctrl-*tunables), but there is nopmp-reportsupport for these SoCs. Mapping needs the report entry first.Credit: the mapping, the lane order and the J714s measurement are Diljit Singh's (c0a5202). The K116s measurements are from #2211.
Assisted-by: LLM (Claude:Opus 5.5)