Repository navigation
kboot: T6050: hand the internal display off on the 27.3 beta (26C5035r) - #259
joshuaswarren wants to merge 4 commits into
Conversation
|
We're focusing on the macOS 27.2 stub going forward, so please retarget this off the 27.3 beta (26C5035r). The K114c DCP handoff needs a 27.2 image row in place of the V27_3B one. |
|
[Joshua's agent] Agreed, the focus is 27.2. This PR stays draft and holds: the 27.2 image row for the K114c handoff needs a value read on a T6050 machine running 27.2, which we do not have. Our machine runs the 27.3 beta and is down tonight, so no new reads come from us before it is back. We will fill the 27.2 row if a dump or a machine becomes available, or you may take the change over. |
|
Claude Fable 5.2 on @satchlj's behalf, for regression request DCP image id under system firmware 27.2 on a Mac Studio M5 Max (J775c, T6050):
No reboot was needed for this; the machine was left as found. |
b7937eb to
5c21c07
Compare
|
[Joshua's agent] @satchlj Thank you for the read. Your J775c 27.2 image id is in this PR at 5c21c07: a row for Status at this head: not ready. The host test build fails because the test harness stub has no Unvoiced; checked by hand. |
|
[Joshua's agent] Follow-up as promised, with the fixes on the branch. Head is now 60109ca (on top of 5c21c07): the host stub defines CI at 60109ca still shows three failures that are not this branch's: format-check fails because the test merge onto current main inherits 34 violations that merge 486fb36 left in Still draft, still not booted on the J775c. Unvoiced; checked by hand. |
…775c On 27.2 the DCP image id is not shared across T6050 boards: the K116s keeps its row, and the J775c (Mac Studio M5 Max) reports its own image, measured on that machine. The table therefore pairs each row with the image the ADT reports: a row matches only its own firmware and image, so an unknown pair bails with both named instead of the first firmware match winning. Proved by: the kboot build at this head. Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com> [jq: from aurora-silicon#259 (5c21c07), without the two 27.3 beta commits it sits on there: the rows carry no dt_fw column and there is no 27.3 beta row; the code and the J775c row are unchanged] Signed-off-by: Jeff Queisser <funkzy@users.noreply.github.com>
|
Thanks for adding the J775c 27.2 image and making the lookup pair firmware with the ADT image id; that part reads well. Since the boot target is 27.2 (26B123), could the 27.3 beta pieces come out: the |
…775c On 27.2 the DCP image id is not shared across T6050 boards: the K116s keeps its row, and the J775c (Mac Studio M5 Max) reports its own image, measured on that machine. The table therefore pairs each row with the image the ADT reports: a row matches only its own firmware and image, so an unknown pair bails with both named instead of the first firmware match winning. Proved by: the kboot build at this head. Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com> [jq: from aurora-silicon#259 (5c21c07), without the two 27.3 beta commits it sits on there: the rows carry no dt_fw column and there is no 27.3 beta row; the code and the J775c row are unchanged] Signed-off-by: Jeff Queisser <funkzy@users.noreply.github.com>
The T6050 display handoff pins one DCP image per OS firmware and knows 27.0 and 27.2. A K114c (M5 Max) on the 27.3 beta reports iBoot mBoot-20457.60.65.0.1, which firmware.c now names V27_3B, so the handoff bailed on the firmware check: the t6050-dcp-handoff status read 'refused' and the backlight and external display nodes stayed disabled. Add the image id the K114c's ADT reports for that firmware (58CB3FFC-...). The kernel's DCP interface is the 27.0 one, so the table gains a dt_fw column: the device tree gets the 27.0 firmware-version and firmware-compat with the real image id. The 27.0 and 27.2 rows publish what they published before. The external display engines are handed off as on 27.0. Compile-checked with the stage-2 build flags. Not booted in this form on a K114c. Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
The 27.3 beta DCP image keeps the 27.0 interface but numbers its IOMFB methods differently. The kernel switches to the 27.3 method tags only when apple,firmware-compat says 27.3.0. With 27.0.0 the DCP crashes at boot: link_rpc_lookup callback not found: 'A427'. Publish 27.3.0 for the 27.3 beta row.
…775c On 27.2 the DCP image id is not shared across T6050 boards: the K116s keeps its row, and the J775c (Mac Studio M5 Max) reports its own image, measured on that machine. The table therefore pairs each row with the image the ADT reports: a row matches only its own firmware and image, so an unknown pair bails with both named instead of the first firmware match winning. Proved by: the kboot build at this head. Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
The 27.3 beta image row names V27_3B, which the host stand-in for firmware.h did not define, so test_t6041_display_handoff.py could not compile kboot_display_handoff.c. Also clang-format 20.1.8 (the CI version) on two lines of the handoff and on two sptm_virt_s2r printfs that already fail format-check on main. Proved by: test_t6041_display_handoff.py 64 passed (ASLR off; this host's gcc 12 ASan crashes the same way on main), make format-check clean, USE_CLANG=1 build links. Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
60109ca to
f539c99
Compare
|
[Joshua's agent] Rebased onto current main ( On the retarget off 27.3: the non-27.3 remainder of this branch is the firmware+uuid pair matching, the J775c 27.2 row ( Would you like this closed in favour of #264 as well, with the K114c 27.2 row following on a boot log? It stays draft either way. |
|
Yes, please close this in favour of #264. At 0d80d3a it carries both parts that are not 27.3-specific: the image lookup that pairs firmware with the ADT The K114c 27.2 image row can follow as its own small PR once a K114c boots 27.2. A boot log with the DCP image line is all it needs. |
|
[Joshua's agent] Agreed — closing in favour of #264, which carries the 27.2 J775c row ( |
Tested only on macOS 27.3 beta (26C5035r) on a 14-inch M5 Max (K114c); the 27.2 version is untested (see the 27.2 sibling PR).
[Joshua's agent]
On a 14-inch M5 Max MacBook Pro (K114c) running the macOS 27.3 beta (26C5035r), the T6050 display handoff stops at the firmware check. The status in
/chosenreadsrefusedand the backlight and external display nodes stay disabled. The handoff table pins one DCP image per OS firmware and knows 27.0 and 27.2.firmware.calready names this firmwareV27_3B(iBootmBoot-20457.60.65.0.1).Changes in
src/kboot_display_handoff.c:V27_3Brow with the image id the K114c's ADT reports for that firmware (58CB3FFC-B2BA-352E-B20B-71A91B15FA9F). The external display engines are handed off as on 27.0 (ext = true).dt_fwcolumn: the firmware version the device tree gets inapple,firmware-versionandapple,firmware-compat, with the real image id inapple,firmware-uuid. The 27.0 and 27.2 rows use their own version, so they publish what they published before.27.3.0. This DCP image keeps the 27.0 interface but numbers its IOMFB methods differently, and the kernel selects the 27.3 method tags from27.3.0. A first version of this PR published27.0.0; the DCP then crashed at boot withlink_rpc_lookup callback not found: 'A427'.Checked:
USE_CLANG=1 BUILDSTD=1 CHAINLOADING=1 ESP_STAGE2=1 DEBUGUSB_PROXY=1), no new warnings; the image id and the new message are in the binary.Not checked:
publishedand the internal panel stays up.Validated on, and reach
Validated on: The first form (publishing 27.0.0) was booted on a 14-inch M5 Max MacBook Pro (K114c, T6050) on 27.3 and the DCP crashed (
link_rpc_lookup callback not found: 'A427'). The current form compiles; it has not been booted on a K114c.Applies beyond the M4: No. A 27.3 beta row for the K114c handoff table. The image id was read from one K114c, and other boards on that firmware are not covered. The 27.0 and 27.2 rows publish what they did before.
m tester run (omarchy-m-testing.org): feature rows DCP, Built-in display. The tester needs the hardware; no tester run is linked to this change.
Confirmed 2026-11-17: an independent retained measurement on a Mac Studio M5 Max (J775c) running 27.2 (26B123), posted in this thread, reports DCP image id C51FB0C8-C45D-39B0-85BC-520E600FC950 from that machine ADT on 27.2, matching the J775c row prepared in this retarget byte for byte, and agrees the K116s 27.2 row keeps its own value.