Repository navigation
Conversation
4832dc2 to
6195f71
Compare
8cef6bd to
f3a64c0
Compare
|
No blockers. Checked the 32 register windows against t6050-ultra.dtsi's die-0 list (AMCC a at 0x2220000000 + a * 0x2000000, planes at +0x40000, 16 KiB each: they match), that
HW row: after the move, one other Max board (J714c or J716s) on this stack: Assisted-by: LLM (Claude:Opus 5.5) |
|
Heads-up before moving the 32-plane MCC node into Measured on a live J714s (14-inch M5 Pro, T6050):
If On J714s with the 16-plane MCC node and Assisted-by: LLM (Claude:Opus 5.5, Google:Gemini 4 Neon) |
f3a64c0 to
5c4935f
Compare
|
Note 🤖 Gemini 4 Neon responding on behalf of erikwb Updated PR #2540 (
|
|
Thanks, both points are fixed at 5c4935f. The controller is now in t6050-max.dtsi (lines 481-519), listing the four AMCCs that both M5 Pro and M5 Max enable, Two smaller things:
Rows still needed on this head: J716c with the shared 16-plane node ("allocation enabled on 16 planes" after "boot scanout retired", panel up, no new errors), plus one more M5 Max board (J714c or J716s). The J714s row from #2708 covers M5 Pro. #2539 and #2540 also still sit on the previous #2538 head (bddfd57), not 5b30245. Assisted-by: LLM (Claude:Opus 5.5) |
…ller Single-die T6050 boards all include t6050-max.dtsi. M5 Pro parts enable four of the eight die-0 AMCCs (AMCC 0..3, 16 planes, amcc-enable-mask 0xf), while M5 Max ships in both 460 GB/s (binned) and 614 GB/s (eight AMCCs, 32 planes, amcc-enable-mask 0xff) variants under the same board device trees. Describe the die-0 memory cache controller (apple,t6050-mcc) in t6050-max.dtsi with the four AMCCs (16 planes) verified across both M5 Pro and M5 Max and apple,boot-dma-devices = <&dcp>, so neither M5 Pro nor a binned M5 Max reads unverified AMCC 4..7 apertures. Size the parent bus ranges for all eight die-0 AMCCs so the boot loader can populate the full enabled mask from the live ADT. Add display = <&dcp> to the boot framebuffer node on every single-die T6050 laptop (J714c, J714s, J716c, J716s, and the K114/K116 base) so apple-mcc waits for the internal DCP to retire the boot scanout before enabling cache allocation, including when the bootloader keeps the boot framebuffer and leaves the DCP disabled. Desktop boards (t6050-j775c.dts and t6050-j873s.dts) also inherit the MCC node, have no boot framebuffer, and keep &dcp disabled, so they stay in safe probe deferral with no cache allocation until the boot loader enables dcp. Signed-off-by: Erik Bourget <erik@ebourget.net>
6195f71 to
7803302
Compare
5c4935f to
2bd59c8
Compare
|
Note 🤖 Gemini 4 Neon responding on behalf of erikwb Rebased #2540 onto the rebased #2539 (
|
|
Thanks. 2bd59c8 is the same device tree change as 5c4935f, rebased onto #2539 7803302 and #2538 5b30245, and the commit message now says the J775c and J873s desktops stay in probe deferral with cache allocation off until the loader enables No further code comments. What's left is the boot row on this head: J716c with the shared 16-plane node ("allocation enabled on 16 planes" after "boot scanout retired", panel up, no new errors), plus J714c or J716s. Assisted-by: LLM (Claude:Opus 5.5) |
DjDeveloperr
left a comment
There was a problem hiding this comment.
Pre-PR checklist review at 2bd59c882c1e (0 code/DT/policy blockers; holding for CI and §5 live-head hardware proof):
Stack & Dependencies
- Stacked cleanly on live #2539 (
7803302be7ee, which sits on #25385b302458524fand #2518e6fdaf6d4b23). Must land after #2518, #2538, and #2539 soapple-mccwaits forapple-dcpto retire the boot framebuffer before enabling SLC allocation.
DT & Safety Audit
arch/arm64/boot/dts/apple/t6050-max.dtsi:soc@2220000000ranges(0x22 0x20000000, size0x10000000) covers all 8 die-0 AMCCs and matchest6050-ultra.dtsi;mcc: memory-controller@2220000000(apple,t6050-mcc) lists the 16 planes of AMCC 0..3 (0x2220..0x2226, 4 x 16 KiB planes each at+0x40000) verified on both M5 Pro (amcc-enable-mask = 0xf) and 614 GB/s M5 Max (0xff). Keeping AMCC 4..7 out of staticreguntil the boot loader populatesregfrom the live ADT avoids touching unverified apertures on M5 Pro and binned 460 GB/s M5 Max parts.- Board coverage & phandles: Verified
&dcpresolves tot6050-peripherals.dtsi:2673across all 10 single-die T6050 boards includingt6050-max.dtsi(j714c,j714s,j716c,j716s,k114c,k114s,k116c,k116s,j775c,j873s), andt6050-j775d.dts(t6050-ultra.dtsi) is untouched. All 8 single-die laptops get standarddisplay = <&dcp>;onframebuffer@0(valid underDocumentation/devicetree/bindings/display/simple-framebuffer.yaml). Desktops (t6050-j775c.dts,t6050-j873s.dts) have no boot framebuffer and keep&dcpdisabled, failing safe in probe deferral under #2538 (now accurately documented in both commit message and PR body). - Note on binned 460 GB/s M5 Max: Acknowledged honestly in the PR body that its live
/arm-io/mccamcc-enable-maskhas not been read yet; follow-up boot-loader ADT population remains the right long-term path.
Pre-PR Checklist (§1–§6)
- §1 No model gating: PASS — shared in
t6050-max.dtsifor all single-die T6050 boards with no per-board code gates. - §2 Production-ready: PASS — pure DT description, default cmdline.
- §3 Safety: PASS — conservative verified 16-plane static
reg; laptops wait for DCP retirement (and stay off undersimpledrm); desktops stay safely deferred until&dcpis enabled. - §4 Clean-room & attribution: PASS — commit
2bd59c882c1ecarries human author/committer and humanSigned-off-by:only; PR body carriesAssisted-by:. - §5 Evidence: HOLD — J714s (M5 Pro, 16 planes +
display = <&dcp>) is covered by #2708, but live-head rows on2bd59c882c1eare still needed:- J716c boot with the shared 16-plane node (
allocation enabled on 16 planesafterboot scanout retired, panel up, 0 SELinux denials, 0 failed units, 0 new kernel errors). - One additional M5 Max board (e.g. J714c or J716s) with the same verification + regression row.
- J716c boot with the shared 16-plane node (
- §6 Naming: PASS.
CI Status
- 0 GitHub Actions checks ran on
2bd59c882c1ebecause this PR targets stacked branchj716c/display-takeover-ready(dt-checks.ymlandhost-tests.ymlonly trigger onintegration/aurora/aurora-wip).dt-checksCI will need to run and pass once retargeted after #2538/#2539 land.
Assisted-by: LLM (Gemini 4 Neon)
Problem
Single-die T6050 boards (M5 Pro and M5 Max, all including
arch/arm64/boot/dts/apple/t6050-max.dtsi) have noapple,t6050-mccnode, soapple-mccnever binds and system level cache allocation stays disabled. In addition, the single-die T6050 laptopframebuffer@0nodes do not name&dcpas theirdisplay, soapple-mcccannot know when the internal DCP is still scanning out the boot framebuffer.Change
soc@2220000000/mcc(compatible = "apple,t6050-mcc",apple,boot-dma-devices = <&dcp>) toarch/arm64/boot/dts/apple/t6050-max.dtsi, shared by all single-die T6050 boards (j714c,j714s,j716c,j716s,j775c,j873s,k114c,k114s,k116c,k116s).0x2220000000..0x22260c0000, 16 planes of 16 KiB each) verified across both M5 Pro (amcc-enable-mask = 0xf) and 614 GB/s M5 Max (amcc-enable-mask = 0xff). M5 Max also ships a 460 GB/s binned variant under the same board device trees whose/arm-io/mccamcc-enable-maskhas not been read from hardware yet, so AMCC 4..7 stay out of the staticreglist (and remain non-allocating) until the boot loader populatesregfrom the live ADT'samcc-enable-mask. The parent busranges(0x22_20000000, size0x10000000) already covers all eight die-0 AMCCs for that update.display = <&dcp>toframebuffer@0on every single-die T6050 laptop (t6050-j714c.dts,t6050-j714s.dts,t6050-j716c.dts,t6050-j716s.dts, andt6050-k114-k116.dtsi).drivers/soc/apple/mcc.c(apple_mcc_scans_boot_framebuffer()) parsesdisplayon enabledsimple-framebuffernodes soapple-mccwaits for the internal DCP to retire the boot scanout before enabling cache allocation (and keeps allocation off when the boot loader keepssimpledrmwith&dcpdisabled);simpledrmitself ignoresdisplay.t6050-j775c.dtsandt6050-j873s.dts) also inherit the MCC node, have no boot framebuffer, and keep&dcpdisabled int6050-peripherals.dtsi. Under soc: apple: mcc: wait for display controllers to retire boot scanout #2538 a disabledapple,boot-dma-devicessupplier holdsapple-mccin safe probe deferral, so desktop boards stay with cache allocation off until the boot loader enablesdcp.Stack:
satchlj/mcc-t6050-slc-allocate-20261120)j716c/t6050-mcc-display-ready@5b302458524f)j716c/display-takeover-ready@7803302be7ee)j716c/t6050-cache-planes)Testing
7803302be7ee, on top of soc: apple: mcc: wait for display controllers to retire boot scanout #25385b302458524f).arch/arm64/boot/dts/apple/t6050-*.dtbtargets withARCH=arm64 LLVM=1 defconfig(0 errors, 0 warnings) and ranCHECK_DTBS=yont6050-j716c.dtb,t6050-j714s.dtb, andt6050-j775c.dtb(no warnings onmemory-controller@2220000000orframebuffer@0).python3 tools/asahi/mcc-boot-dma-tests.py: PASS.scripts/checkpatch.pl --git HEAD~1..HEAD: 0 errors, 0 warnings.bddfd572):apple-dcp 48ae00000.dcp: boot scanout retired by displayed swap 6, followed byapple-mcc 2220000000.memory-controller: system level cache allocation enabled on 32 planes0.4 ms later (vs 0.66 s before display takeover prior to this stack).simpledrm):apple-mcc: waiting for /soc@200000000/dcp@48ae00000 to retire boot scanout; allocation stays off.apple,t6050-mcc+display = <&dcp>onframebuffer@0) was independently verified by @DjDeveloperr in arm64: dts: apple: t6050-j714s: describe the system level cache controller #2708 (system level cache allocation enabled on 16 planes, 0 AVC denials, 0 new failed units, 0 new kernel errors).Still to run
t6050-max.dtsistack (#25385b302458+#25397803302b+#2540) on J716c and a second M5 Max board (e.g. J714c or J716s) to confirmapple-mcc ... allocation enabled on 16 planesafterboot scanout retired, internal panel up, 0 new kernel errors, and 0 failed units./arm-io/mccamcc-enable-maskon a binned 460 GB/s M5 Max once someone with that SKU can read it (we only have a 614 GB/s 8-AMCC J716c locally).mcc'sregfrom the live ADT's/arm-io/mccamcc-enable-maskso 6-AMCC (460 GB/s) and 8-AMCC (614 GB/s) M5 Max parts enable their upper planes automatically without per-SKU DT tables.Assisted-by: LLM (Anthropic:Claude, Google:Gemini 4 Neon, OpenAI:GPT-6.2 Sol)