From 7428f77bbe34574c45d33a0a0a274c81eb24e6de Mon Sep 17 00:00:00 2001 From: Fredrik Silfver <1684291+freber@users.noreply.github.com> Date: Sun, 22 Nov 2026 07:50:44 +0100 Subject: [PATCH] arm64: dts: apple: t8122-j615: describe the CPU memory floor The 15-inch M3 MacBook Air (J615) has the J613's SoC, DRAM, PMP tables and PACC0 request layout. Its device tree is a legacy handoff tree. The report binds the generic "apple,t8122-pmp-v2-report" and names its PMP with apple,pmp. This driver starts that PMP, which runs the 14.x firmware (3B18C886-4C70-349B-B1C4-70F35DE2C5CD). Without a memory floor nothing raises the DRAM or fabric state for the CPUs. A 4-thread membw2 read then reaches 19.8 GB/s. Give its report apple,cpu-memory-floor = <0x21 2 0x25 4>. The levels come from the J615 runs of the earlier J615 floor patch, not from the J613 tree. That patch stored DCS 4 in bits 51:48 and fabric level 2 in bits 35:32 of the PACC0 request, word 0x2004000200000000. Those are the lanes of request classes 0x25 and 0x21, so these pairs build the same word. The 14.x PMP answered it with DVFS-STATE 0x24 within 5.1 ms. That is class 0x25 at 4 in the low nibble with class 0x21 at 2 in the high nibble. In one boot it confirmed 39 of 39 raises and 38 of 38 releases. With the floor the same membw2 read reached 68.2 GB/s. The levels equal the J613's because the SoC, DRAM and PMP tables are the same, but they were measured on this board. The driver needs no change. pmp_floor_probe() runs for any report with the property. pmp_floor_find_pmp() takes the report's apple,pmp without an availability check, so it does not matter that the PMP is still disabled when the report probes. The start work waits for the report to read READY. It does once the PMP runs, which apple_pmp_start_init() arranges when the display asks for it. Admission then reads the tables m1n1 fills in on the PMP node. Run on this board's live tables, the upstream check admits 2 CPU clients and puts the PACC0 update alias at +0x10888, where the earlier patch wrote it. pmp_floor_word_of() builds 0x2004000200000000 from the pairs. The binding already allows the property on apple,t8122-pmp-v2-report. The generic T8122 report does not set floor_confirm. Raises and releases are published without the DVFS-STATE check, as on every report but the J613 25G83 one. The experimental t8122-j615-25g83 tree includes this file. It binds the native J613 report, where the floor has not run on a J615. It deletes the property so that it stays uncovered, as it was before. Tested by building both J615 trees. Decompiled, the J615 report carries the property while the 25G83 report has none. pmp-report.o builds with clang 18. The floor ran on a J615 with the 14.x firmware on a 7.2.11 kernel carrying the earlier patch. A 7.3 kernel built from this tree with #2090, #2199 and #2203 merged then booted on a J615 with the 14.x firmware and the default command line. The report admitted the floor from the property with the PACC0 update alias at +0x10888. During three 4-thread membw2 reads the floor was up, DVFS-STATE read 0x24 each time and the read reached 69.3 GB/s. The boot logged no floor fault or refusal. On a later boot of the same kernel the read gave 21.6 GB/s with the floor's enable attribute at 0 and 69.3 GB/s with it at 1. Signed-off-by: Fredrik Silfver <1684291+freber@users.noreply.github.com> --- arch/arm64/boot/dts/apple/t8122-j615-25g83.dts | 5 +++++ arch/arm64/boot/dts/apple/t8122-j615.dts | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t8122-j615-25g83.dts b/arch/arm64/boot/dts/apple/t8122-j615-25g83.dts index 7aef84a8e3494..a56f93b0864b3 100644 --- a/arch/arm64/boot/dts/apple/t8122-j615-25g83.dts +++ b/arch/arm64/boot/dts/apple/t8122-j615-25g83.dts @@ -7,6 +7,11 @@ #include "t8122-j613-dcp-25g83.dtsi" #include "t8122-j613-qspi.dtsi" +/* The memory floor has not run with the native J613 report on a J615. */ +&pmp_report { + /delete-property/ apple,cpu-memory-floor; +}; + /* As on the J613 25G83. */ &mtp { compatible = "apple,t8122-mtp", "apple,t8122-rtk-helper-asc4", "apple,mtp"; diff --git a/arch/arm64/boot/dts/apple/t8122-j615.dts b/arch/arm64/boot/dts/apple/t8122-j615.dts index fdb511bd9a4e7..7bf3577a31ef5 100644 --- a/arch/arm64/boot/dts/apple/t8122-j615.dts +++ b/arch/arm64/boot/dts/apple/t8122-j615.dts @@ -17,6 +17,14 @@ model = "Apple MacBook Air (15-inch, M3, 2024)"; }; +/* + * CPU memory floor, class 0x25 (DCS) at 4 and 0x21 (fabric) at 2. The 14.x + * PMP answers it with DVFS-STATE 0x24: 4-thread membw2 19.8 -> 68.2 GB/s. + */ +&pmp_report { + apple,cpu-memory-floor = <0x21 2 0x25 4>; +}; + &dcp { panel: panel { compatible = "apple,panel-j615", "apple,panel";