Repository navigation
soc: apple: display-gate: request T8122 storage by soc-device record - #2682
RyanTheTide wants to merge 1 commit into
Conversation
On T8122 the PTD request and acknowledge bits are indexed by soc-device record, not by device ID - 1. The gate already marks the display entry apple,soc-device-record for that reason, but left the storage entry (report@11, ANS, device ID 18) on its ID bit, 17. On T8122 that bit is another record's (the device ID 14 record, report@d), and ANS's own record bit is never set. The native T8122 path in pmp-report already expects ANS at its record, bit 19. Mark the storage entry by record too, wherever the PTD is indexed that way (gate_soc->records). The bit then comes from the PMP's own soc-device table, as the display entry's does. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
Looks good; approve once a J613 row and a J615 row run on this head.
The change itself is right. pmp-report resolves every marked entry through Nit: the remaining T8122 entries (report@5/6/9/a/b/c/d, t8122.dtsi:776-863) are disabled and still ID-indexed. Whoever enables one hits this same bug. Marking the record indexing once on the T8122 report would cover them all. HW row: on dc5faac on |
Problem. On T8122 (M3: J613, J615) the PMP's power request and acknowledge bits are indexed by soc-device record, not by device ID - 1. The display gate already marks the display entry
apple,soc-device-recordfor that reason. It leaves the storage entry (report@11, ANS, device ID 18) on its ID bit, 17, though. On these Macs bit 17 belongs to a different record (the device ID 14 record,report@d), so the PMP is asked to keep that block up, and ANS's own record bit, 19, is never set. The native T8122 path in pmp-report already expects ANS at bit 19 (apple_pmp_record_of_id(table, 18) != 19).Change. Where the PTD is indexed by record (
gate_soc->records), the display gate marks the storage entryapple,soc-device-recordas well. The bit then comes from the PMP's own soc-device table, the same way the display entry's does. No new property, parameter or board check.Testing. J615 (MacBook Air 15-inch, M3) on its default Stage 2 and the default kernel command line. Kernel: our T8122 sleep trial tree plus this commit, same file and hunk as here.
T8122 PMP handed over: requests 0x80800(was0x20800), andrequest bits 0x80800 are soc-device records.PMP ready: ... ack 0x8f0. The display record is acknowledged, and ANS is not, as its record's flags say. Before, the PMP acknowledged bit 17, i.e. it was keeping the other record's block up.display-gate.obuilds on this base with W=1.Still to run. A J613 row (the other T8122 Mac). There the PMP runs with the GPU, so this changes what it is asked for at start: ANS instead of the device ID 14 block.
Detail for reviewers
no unique request bit for /soc/pmp_report@2d03c0000/report@11. The added scodec entry (record 17) collided with the storage entry's ID bit 17.0x20800, the PMP's unrequested ack bits are 4-7. Those are the records of the always-on SoC and CPU-cluster devices, which only fits record indexing.report@21): none.recordsis set for T8122 only.traces/power/20261121-j615-s2r2/row-stor.log,stor-*-dmesg.txton our store.Assisted-by: LLM (Claude:Opus 5.5)