Repository navigation
arm64: dts: apple: t8122, t603x: complete the M3 ProRes node descriptions - #2428
RyanTheTide wants to merge 2 commits into
Conversation
The T6032 branch of the schema lists reg, interrupts, power-domains and iommus only, so a T6032 ProRes node that names its windows or points at its reset fails validation under unevaluatedProperties. Every other variant already allows both. Allow the same core/wrapper/aux reg-names and a single reset as the T6030/T6031/T8122 branch. The second engine on each die (apr1/apr3) has only the core and wrapper windows, so reg-names keeps minItems 2. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
The disabled ProRes nodes and their DARTs on T8122, T6030, T6031 and T6032 came with the M3 resource inventory, both by Ryan Murray: commit 982f330 ("arm64: dts: apple: describe disabled M3 peripheral resources") commit 4c28191 ("arm64: dts: apple: describe disabled T6032 package resources") Checked against the ADT of every M3 board (J613, J615, J433, J434, J504, J514s/c/m, J516s/c/m, J575d) and our own IODeviceTree capture of a J615 under macOS 27.2, their reg, interrupts, DART SIDs and power domains are right, but three things are missing: - reg-names. The driver maps its windows by name (core, wrapper, aux), so without them no variant could ever map these nodes. apr0 on each die has all three windows; apr1 on T6031/T6032 has core and wrapper only, as in the ADT. - resets. The ADT's device_reset function for each engine points at the same PMGR device as its power domain (SCODEC for apr/apr0/apr2, PRORES for apr1/apr3), so the engine is reset through that domain. - power-domains on the T8122, T6030 and T6032 DARTs. The DART sits in the engine's domain; T6031 already says so, the others did not. All nodes stay disabled: the driver has no match data for these engines yet (see the PR for why). Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
No blockers. I checked every hunk at 3b5e96d against the tree. The reset phandles are valid: Runtime effect is none. Every node is still This can leave draft. The hardware row belongs to the later M3 match-data PR, not this one. HW row: none needed for this DT-only change (nodes stay disabled). When the M3 match data lands, run on J615 at that head: probe, engine ID readout, Proxy/LT/422/HQ at 1080p and 4K with every frame decoded by ffmpeg, 0 DART faults, s2idle with the module loaded, 0 AVC, 0 failed units, no new kernel errors. Assisted-by: LLM (Claude:Opus 5.5) |
|
Adversarial pass at 3b5e96d: no blockers.
No hardware row needed for this PR; the J615 row comes with the M3 match data. Assisted-by: LLM (Claude:Opus 5.5) |
Problem
Every M3 SoC (T8122, T6030, T6031/T6034, T6032) already has disabled ProRes and DART nodes from the M3 inventory work, and the binding already lists their compatibles. The nodes were never finished: none has
reg-names, so the driver, which maps its windows by name, could not map them even with match data; none hasresets; and the DARTs on T8122, T6030 and T6032 have no power domain. The T6032 branch of the binding also rejectsreg-namesandresets.Change
reg-namesand one reset as the T6030/T6031/T8122 branch.reg-namesand a reset through its own power domain (SCODEC for apr/apr0/apr2, PRORES for apr1/apr3). The T8122, T6030 and T6032 apr DARTs get the engine's domain, as T6031 already has. Everything stays disabled.No driver match data. The M3 engines are their own ADT revisions (
apr,f0on T8122,apr,h0on T6030,apr,h1on T6031/T6034,apr,h2on the second T6032 die). None of them is a revision the driver already supports (a0, j0/j1, T6050, T8140), and the window layout is different too: the M3 aux window sits at core+0x78000, not core+0xc0000 as on T6041 and T8132, and the T8122/T6030 wrapper window is 32 KiB, not 16 MiB. So reusing T6041's data isn't justified. What the engine needs before its first job, its power-up initialization rows, is not in the ADT. We have no capture of it for any M3 yet, so this PR doesn't guess it. See "Still to run".Testing
dt_binding_checkformedia/apple,prores.yamlis clean.modules_prepareon the buildbox config fails inrust/bindings.o, which has nothing to do with this change. It's listed under "Still to run".commit <sha> ("title")reference line.device_resetPMGR device, and it is the same device as the power domain.Still to run
modules_preparebuilds (the driver itself is unchanged).Per-SoC ADT facts used
All boards of each SoC have the same ProRes description, so the nodes stay in the SoC dtsi.
Related
apr,c0) is draft media: apple: prores: add disabled T8112 variant #1295, whose rows need replacing with traced ones. T8132 (apr,i0) is media: apple: prores: T8132 (M4) engine, gated by its initialization file #1994, a file-only variant bound on request. T602x (apr,d0/d1) has nodes and no driver data.Assisted-by: LLM (Claude:Opus 5.5)