Repository navigation
dt-bindings: display: apple,dcp: match the Type-C DP IN routes in use - #2831
Conversation
dtbs_check reports about 100 errors on the in-tree Apple DTBs against apple,dcp.yaml: - apple,t6030-dcpext and apple,t6031-dcpext are used with the "apple,dcpext" fallback (t6030-dcp.dtsi, t6031 display files) but are missing from the dcpext compatible list. - The T6020 external DCPs on J414/J416 name their Thunderbolt DP IN crossbar controls typecN-dpin0/1, as apple,dcp-typec-routes.yaml describes. A conditional block listing a few SoCs rejected -dpin names and more than 8 mux controls on every other SoC. The block before it already caps all non-T6050 parts at 10 controls and dpin0/1, which is what the DTs use. Drop the SoC list instead of adding another entry, so the route names are checked the same way on every DCP. - The apple,dcp-typec-routes.yaml example has a t6020-dcpext node without the reg, mailbox, IOMMU and bandwidth scratch properties apple,dcp.yaml requires. Add them, with the values of the T6021 dcpext2 node, and a unit address. Documentation-only change. dt_binding_check for display/apple,dcp is clean. dtbs_check of all Apple DTBs against apple,dcp.yaml goes from about 100 errors to 8 (the t6030-dcpext nodes describe only their coproc region). Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
Review at 5e127c8.
Nit (not for this PR): the driver also accepts a legacy |
DjDeveloperr
left a comment
There was a problem hiding this comment.
Adversarial pre-PR checklist (§1–§6) review at 5e127c841afcca5ebc83ccf7e44ae3453efbee20:
- §1 No model gating: Pass — removes the per-SoC
if/not/containsallowlist inapple,dcp.yamlthat blocked-dpin0/1and >8 mux controls outside four listed SoCs. Every non-T6050 DCP now validates uniformly under the preceding rule (maxItems: 10,^(dp-xbar|typec[0-9]+(-dpin[01])?)$), while the driver (dcp_typec_route_wiring()indcp-fabric.c:4668-4679) still enforces hardware xbar controller counts from DT.apple,t6030-dcpextandapple,t6031-dcpextmatch the in-treeapple,dcpextfallback nodes (t6030-dcp.dtsi:128,t6031-die*.dtsi). The completedapple,dcp-typec-routes.yamlexample matchest6021-display2.dtsi:79-90(with 1/1 cells) and satisfiesapple,dcp.yamlrequired properties. - §2 Production-ready / §3 Safety: Pass — documentation/schema-only change; no runtime code or weakened validation.
- §4 Clean-room & attribution: Pass — single commit with human author/committer (
Ryan Murray <ryan@aurorasilicon.org>), humanSigned-off-by, zero AI trailers in commit metadata, andAssisted-by:disclosed in the PR body. - §5 Evidence: Pass for schema-only change (
dt_binding_checkclean;dtbs_checkagainstapple,dcp.yamlreduced from 102 to 8 pre-existing T6030regerrors tracked in #2827). CI note:Host tests/host-testspassed, whileDevice tree checks/dt-checksis stillIN_PROGRESS— wait fordt-checksto finish green before merging intoMERGETRAIN-LINUX4. - §6 Naming: Pass.
Non-blocking nit: mux-controls description in apple,dcp.yaml:446-450 still names only T6030 and T8132 for the two DP IN tunnel states (T6020 J414/J416 uses them as well); fine for a follow-up.
Verdict: APPROVE (diff is clean; hold merge for MERGETRAIN-LINUX4 until dt-checks completes green).
Assisted-by: LLM (Gemini 4 Neon)
|
Merge-train adversarial review (MERGETRAIN-LINUX4) at 5e127c8: no blockers. Merges clean on integration/aurora, alone and together with #2828-#2832. Full reviewVERDICT: NO BLOCKERS Blockers: none. Checked:
Nits (not blocking):
Assisted-by: LLM (Claude:Opus 5.5) |
|
Checked at cdce3146 (#2828-#2831 merged onto integration/aurora 120d6aa, clean), dtschema 2026.9. dt_binding_check for apple,dcp goes from 7 errors to 0. CHECK_DTBS over all 138 Apple DTBs with all schemas goes from 1465 to 1349 errors with no new error anywhere. Errors attributed to apple,dcp.yaml go from 100 to 8 (the 102 in the description counts the same base log slightly differently), and 24 "failed to match any schema" lines for t6031-dcpext also go. The 8 left are the T6030 dcpext reg/reg-names entries. The removed if/not/contains block only tightened limits (8 mux controls, no -dpinN) outside its SoC list; the block before it still caps every non-T6050 DCP at 10 and allows -dpin[01], so nothing a DT or the driver relies on loses coverage. Unrelated and already present on base: the apple,t6030-dcp nodes in the j514s and j516s DTs match no schema, and t8122 has two dt-core errors for the j613-25g83-profile property. |
Problem
dtbs_checkof the in-tree Apple DTBs reports 102 errors againstdisplay/apple,dcp.yaml, anddt_binding_checkfails on theapple,dcp-typec-routes.yamlexample:apple,t6030-dcpextandapple,t6031-dcpextare used with theapple,dcpextfallback but are missing from the compatible list.typecN-dpin0/1, asapple,dcp-typec-routes.yamldescribes. A conditional block that listed a few SoCs rejected-dpinnames, and more than 8 mux controls, on every other SoC.reg, mailbox, IOMMU andapple,bw-scratch, all of whichapple,dcp.yamlrequires.Change
dp-xbar,typecNortypecN-dpin0/1, which is what the DTs use. Route names are now checked the same way on every DCP, with no extra per-SoC entry.Documentation-only.
Testing
make dt_binding_check DT_SCHEMA_FILES=display/apple,dcp: clean (dtschema from PyPI, current).dtbs_checkof allarch/arm64/boot/dts/appleDTBs againstapple,dcp.yaml: 102 errors before, 8 after. The 8 are the T6030 dcpext nodes, whoseregdescribes only the coprocessor region (listed in Code health: W=1, sparse, checkpatch and DT schema findings in the Apple drivers (integration/aurora 37106688) #2827).Still to run
Nothing: there is no runtime effect.
Details
Remaining after this change:
Logs (lab store):
traces/ci/20261123-code-health/logs/dtbs-check.log(before, all schemas),dtbs-check-dcp-after.log,dt-binding-dcp-after.log.Assisted-by: LLM (Claude:Opus 5.5)