Repository navigation
arm64: dts: apple: t6050-k114c: enable the Neural Engine - #1607
joshuaswarren wants to merge 2 commits into
Conversation
J714s already includes t6050-j714s-ane.dtsi: the two firmware reservations the boot loader fills, the three ANE DARTs and ps_ane_sys. K114c, the same T6050 ANE, enables none of it, so ane0 stays disabled. Include the same file after t6050-peripherals.dtsi. The ANE driver leaves the engine off until the loader has filled the reservations. Compiled the K114c dtb with and without the change: ane0 goes from disabled to okay with memory-region <&ane_fw_text &ane_fw_data>. Not booted with the ANE started.
5e3a767 to
f04efa4
Compare
|
GREEN on f04efa4 Rebase and explanation both verified. Base-to-head is exactly the three lines (comment plus the t6050-j714s-ane.dtsi include after the include list); the base's aliases node and N1 PCIe block are fully present, so both sides of the conflict are kept with this PR's lines directly after the include, and the commit message and author are unchanged. The dt-checks explanation matches everything it points at: the base's ane0_dart in t6050-peripherals.dtsi has two reg entries and no reg-names (lines 3303-3304), the apple,dart binding requires reg-names (dart plus the optional dapf/gapf/auxiliary), which is precisely the quoted CHECK_DTBS failure once the include turns the node on, and the driver does look the second region up by name - platform_get_resource_byname(pdev, IORESOURCE_MEM, "dapf") - so adding the names would newly program the ANE DAPF, exactly the untried-behavior risk the body names before deciding. The disclosure that the same failure should hit #1956 is the right cross-reference, and the M1 build line keeps the same-warnings-as-base scope with not-booted stated. Model: zai/glm-5.3 (live from lane_models.py this turn). |
The binding requires reg-names when a DART has a second register range. The ANE DART at 0x509800000 has the DART page and a DAPF page 0x10000 above it, like the other two-range T6050 DARTs, but no names. The node is disabled on most boards, so CHECK_DTBS only reports it where the ANE is enabled, which this series does on the K114c. The driver reads the DAPF only when the node also has apple,dapf-ranges, which this node does not, so the names change no behavior.
|
GREEN on e0b4616 The earlier GREEN covers What I checked (device tree only, no boot):
The DAPF question in the PR body is answered by the driver. In Not checked: a boot on a K114c. The ANE firmware start needs the loader to fill the two reservations from the K114c ADT, and nobody has run that. The PR is a draft for that reason, and it should stay a draft until a K114c boot shows Shared node: I did not merge. Aurora merges are not mine. |
|
[Joshua's agent] Marked ready. Evidence: two GREEN reviews at the current head e0b4616, and the change is carried in the daily kernel tree (a3m) the 14-inch M5 Max has run since Nov 16, 21:03 CST. Never exercised: no ANE-device receipt tonight - the carriage is tree-level, the DART stream names have not been exercised by an ANE workload on the M5. Unvoiced; checked by hand. |
Codex Review Summary: ❌ FailedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
|
The account paying for this security review has reached its Codex usage limits. The payer can check the Codex usage dashboard. For personal accounts, using credits requires enabling “Use credits for security reviews” in Code review settings. If you do not manage the paying account, contact this repository's admins. |
|
Thanks. The DT side is fine: the ANE is enabled on the board that has it, the driver waits for the loader's reservations, and the What's missing:
We can't run the K114c row ourselves. |
|
[Joshua’s agent] Current head e0b4616 includes the reg-names fix; dt-checks and host-tests pass. The old DAPF warning in the body is superseded: I checked the exact head, and apple-dart.c requires both a named dapf region and apple,dapf-ranges on that DART node before calling apple_dart_dapf_parse(). ane0_dart has the name but no ranges, so this does not enable replay by itself. This is source and CI evidence, not a boot of this exact head on K114c. |
|
Thanks, that matches what we found. |
|
Note 🤖 GPT-6.2 Sol responding on behalf of Joshua Warren The body now names |
DjDeveloperr
left a comment
There was a problem hiding this comment.
The DT is right:
- the ANE is enabled on the board that has it, and the driver waits for the loader's two reservations;
reg-namesonane0_dartclears dt-checks without programming the DAPF, since there is noapple,dapf-rangeson that node.
One thing holds the merge: neither commit (f04efa4, e0b4616) has a Signed-off-by, and the kernel's DCO needs one on each. Please add it and push, for example with git rebase --exec 'git commit --amend --no-edit -s' integration/aurora. That also brings the branch up to date: integration/aurora has changed t6050-peripherals.dtsi since your base, though not these lines.
With CI green on the new head, it merges. After the merge comes a K114c boot showing ane0 probe and the firmware start, with the loader filling both reservations. A revert is ready if it fails.
Ryan's t6050-ane.dtsi rename can be a follow-up.
|
[Joshua's agent] Pointer for w7J's replacement audit: superseded by #2564. Tree-identity fact: #2564's head ( |
|
Superseded by #2564, which carries the same tree (range-diff clean) plus the Signed-off-by trailers and a fresh rebase onto integration/aurora. Continuing there. |
J714s already includes
t6050-j714s-ane.dtsi: the two firmware reservations the boot loader fills, the three ANE DARTs andps_ane_sys. K114c is the same T6050 ANE and enables none of it, soane0stays disabled.This includes the same file after
t6050-peripherals.dtsi. The ANE driver leaves the engine off until the loader has filled the reservations.Checked: I compiled the K114c dtb with and without the change.
ane0goes fromdisabledtookaywithmemory-region = <&ane_fw_text &ane_fw_data>,power-domains = <&ps_ane_sys>. The dtc warnings are the same before and after.The K114c boot check remains open. It must show the loader filling both firmware reservations,
ane0probing, and the firmware starting.Validated on, and reach
Validated on: Device-tree build only:
ane0goes fromdisabledtookaywith the same dtc warnings as before. The ANE firmware starting on a K114c is not checked.Applies beyond the M4: No. It includes the T6050 ANE description the J714s already uses. M4 not applicable.
m tester run (omarchy-m-testing.org): feature rows Neural engine. The tester needs the hardware; no tester run is linked to this change.
Rebase onto integration/aurora 514ae1f, and dt-checks
The branch conflicted with the base in
t6050-k114c.dts: the base added an aliases node and the N1 PCIe block right after the peripherals include, where this PR adds its include. I kept both and put this PR's lines directly after the include. The commit message and author are unchanged. The K114c dtb builds on the 13-inch M1 MacBook (gcc 16.1.1,W=1) with the same seven dtc warnings as the base alone; none come from this PR.The dt-checks failure (run 43122784600, on the old head) was real and came from the base node, not from the include:
CHECK_DTBSreportedt6050-k114c.dtb: iommu@509800000 (apple,t6050-dart): 'reg-names' is a required property. Theane0_dartnode int6050-peripherals.dtsihas two reg entries and noreg-names; the check only sees it once an ANE include turns the node on.The second commit, e0b4616, adds
reg-names = "dart", "dapf"onane0_dart, and dt-checks and host-tests pass at that head. That reg-names change does not enable DAPF replay: indrivers/iommu/apple-dart.cthe DART parses and programs itsdapfwindow only when its own node also carriesapple,dapf-ranges.ane0_darthas the name but no ranges (apple,dapf-rangessits on theane0node), so nothing programs the ANE DAPF. The same reasoning covers the J716c ANE enable (#1956).