Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
583dd2c
arm64: dts: apple: t6050: add disabled acio0/1/3 routers
satchlj Nov 9, 2026
f3fe6ac
arm64: dts: apple: provide loader-filled DROM placeholders
satchlj Nov 11, 2026
039181f
PCI: apple: keep Clock PM off on adopted T6050 links
satchlj Nov 11, 2026
8de5521
arm64: dts: apple: rebase the J775c compatibility board layout
satchlj Nov 13, 2026
2e29056
arm64: dts: apple: retain enabled laptop routers with shared inventory
DjDeveloperr Nov 16, 2026
32fc7e6
selftests: asahi: cover adopted-link Clock PM policy
DjDeveloperr Nov 16, 2026
21e05e1
arm64: dts: apple: consolidate J775c into one final board description
DjDeveloperr Nov 16, 2026
f21ee13
dt-bindings: gpu: apple: describe the installed G17C loader fallback
DjDeveloperr Nov 16, 2026
9c5e19f
drm/apple: add a best-effort software camera indicator
joshuaswarren Nov 13, 2026
b093ab3
media: apple: isp: ask the DCP for a best-effort camera indicator
joshuaswarren Nov 13, 2026
016a251
drm/apple: camera indicator: never wait, survive a rebind, no unlocke…
joshuaswarren Nov 13, 2026
3c6965c
media: apple: isp: look the camera indicator DCP up at stream start
joshuaswarren Nov 13, 2026
6336c0a
tools: asahi: isp host tests: stub the camera indicator
joshuaswarren Nov 13, 2026
606fb2b
camera indicator: test the stream-start DCP bind, close two review mi…
joshuaswarren Nov 13, 2026
3c4b504
drm/apple: retry the camera indicator off commit until it lands
joshuaswarren Nov 13, 2026
a302906
drm/apple: refuse a userspace assignment to the reserved indicator plane
joshuaswarren Nov 13, 2026
a3f2bc0
drm/apple: retry the camera indicator on commit too, and test the retry
joshuaswarren Nov 13, 2026
44bc1d8
drm/apple: do not refuse the kernel's own indicator framebuffer on re…
joshuaswarren Nov 13, 2026
80611c9
drm/apple: show the camera indicator again after a display resume
joshuaswarren Nov 13, 2026
8ec445e
drm/apple: keep the camera indicator state through a lit resume, test…
joshuaswarren Nov 13, 2026
021f5c0
drm/apple: send the primary surface with every camera indicator swap
joshuaswarren Nov 13, 2026
51c6780
drm/apple: draw the camera indicator green, say what a resumed plane …
joshuaswarren Nov 13, 2026
fd2df4e
drm/apple: pass the is-ext26 flag to the indicator plane create (reba…
joshuaswarren Nov 19, 2026
61593f7
drm/apple: wait for a busy flip without polling the indicator
joshuaswarren Nov 20, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/dt-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ jobs:
echo "/usr/lib/llvm-$CLANG_VERSION/bin" >> "$GITHUB_PATH"
pip install --quiet dtschema yamllint pylibfdt

- name: GPU binding compatibility and resource contracts
run: python3 scripts/dtc/apple-agx-binding-test.py

- name: CHECK_DTBS and dt_binding_check, base vs head
id: dt
env:
Expand Down
69 changes: 69 additions & 0 deletions Documentation/devicetree/apple-j775c-compatibility.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
.. SPDX-License-Identifier: GPL-2.0-only

J775c loader compatibility and DT validation
==========================================

The J775c (Mac Studio M5 Max) board has one final description in
``arch/arm64/boot/dts/apple/t6050-j775c.dts``. The staging fragments and
separate ANE trial wrapper are not part of the board source. Consolidating
the resolved description preserves the normal board's compiled DTB byte
for byte, including its enabled and disabled device policy.

The description retains the GPU layout required by the installed Aura
b6e6faf4 loader: the GPU path below ``/soc@2300000000``, the
``apple,agx-t6050`` fallback compatible, and the ASC/SGX resource pair.
Migrating to the modern GPU layout requires a separately qualified loader
update. Do not remove this contract merely to satisfy schema validation.

The MTP DART remains disabled after its activation failed qualification.
The ANE DARTs retain their ANE_SYS suppliers. Neither the consolidation nor
the removal of the trial wrapper enables additional hardware.

Historical hardware evidence
----------------------------

At PR #1619 head 32149e08e8b191a500b40435eb0820cc78ec22fe, the former
``t6050-j775c-ane.dtb`` trial booted with SHA256
``dc88aa139f329bb568e48ba7ba80417e7d2c01ec6be49514a95ca24285dfd8d9``.
The combined kernel revision and test limits are recorded at:

https://github.com/aurora-silicon/linux/pull/1619#issuecomment-6816611851

That result applies only to the stated trial composition. It is not a new
qualification of this rebased head, the normal board DTB, GPU rendering,
audio playback, SD media, suspend, hotplug or other boards.

Rebase and remaining gates
-------------------------

The rebased stack starts at integration commit
``677be395b9d2e15d98696107ebf88191f08efbf9``. It includes Satya Benson's
shared disabled ACIO routers from PR #1579, the adopted-link Clock PM
policy from PR #1618, and the final board state from PR #1619. The original
PRs and their branches remain unchanged.

The rebase retains K114c in the existing Max router activation guards,
keeps the current PCIe radio and SD helpers, and preserves the T8142 ANE
binding constraints alongside the separate T6050 layout. J714s and J716c
explicitly retain their previously enabled routers and mailboxes when
inheriting the shared disabled inventory. The production-C Clock PM host
test covers the locked and unlocked PCI APIs, errors and adopted-host
gate; it does not qualify physical links or other M5 boards.

The GPU binding describes both the two-item G17C compatible list and the
exact three-item list carrying the installed loader's T6050 fallback.
Both forms retain the same register, mailbox, memory and performance
handoff requirements. This does not change the separate, disabled raw
T6050 GPU inventory contract. ``scripts/dtc/apple-agx-binding-test.py``
checks both valid forms and rejects malformed lists, incomplete G17C
resources and a raw T6050 node without its required interrupt inventory.

``scripts/dtc/apple-dt-check.sh`` compares normalized warning sets for all
Apple DTBs at base and head. It has no warning allowlist or board exception
mechanism. ADT coverage waivers cannot waive schema diagnostics.

Keep this work draft until affected-board hardware qualification is
complete. Any later migration to a modern loader must recheck GPU handoff
and HDMI on J775c; old hardware receipts do not qualify a new loader or
kernel composition. Accepting the existing binding contract is not new
hardware qualification.
10 changes: 10 additions & 0 deletions Documentation/devicetree/bindings/display/apple,dcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,16 @@ properties:
Per-slot enable flags, in slot order. The legacy J700 bootloader
supplies a single zero to select surface zero instead.

apple,camera-indicator-surface:
$ref: /schemas/types.yaml#/definitions/uint32
maximum: 3
description: |
Swap slot the kernel reserves for the software camera indicator, a
kernel-owned overlay on the internal panel that the camera driver shows
while it streams, on a best-effort basis: the camera does not depend on
it. The slot must not be enabled in apple,iomfb-surfaces. Userspace cannot
use the slot. This is a software indicator, not a privacy guarantee.

apple,power-lut-data-x:
$ref: /schemas/types.yaml#/definitions/uint8-array
minItems: 4
Expand Down
7 changes: 7 additions & 0 deletions Documentation/devicetree/bindings/gpu/apple,agx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ properties:
- items:
- const: apple,agx-g17c
- const: apple,agx-g17s
- description:
G17C firmware handoff with the SoC fallback required by installed
boot loaders when filling operating points and firmware resources.
items:
- const: apple,agx-g17c
- const: apple,agx-g17s
- const: apple,agx-t6050
- items:
- const: apple,agx-t8103
- const: apple,agx-g13g
Expand Down
8 changes: 8 additions & 0 deletions Documentation/devicetree/bindings/media/apple,t6050-isp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,14 @@ properties:
description:
Firmware temporal-filter strength selected for the attached sensor.

apple,camera-indicator:
$ref: /schemas/types.yaml#/definitions/phandle
description:
Optional. The display coprocessor asked to present the software camera
indicator while the camera streams. The request is best-effort and the
camera streams whether or not the indicator is shown. The indicator is
software, not a privacy guarantee.

sensor-presets:
type: object
description:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ allOf:
- apple,t6022-ave
- apple,t6030-ave
- apple,t6031-ave
- apple,t6050-ave
- apple,t8103-ave
- apple,t8122-ave
- const: apple,ave
Expand Down Expand Up @@ -234,7 +235,6 @@ allOf:
contains:
enum:
- apple,t6041-ave
- apple,t6050-ave
- apple,t8140-ave
- apple,t8142-ave
then:
Expand Down
58 changes: 56 additions & 2 deletions Documentation/devicetree/bindings/npu/apple,ane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@ properties:
minItems: 1
maxItems: 7

apple,clpc:
$ref: /schemas/types.yaml#/definitions/phandle
description: Host controller holding the DRAM and fabric floor for ANE work.

performance-domains:
maxItems: 1
description: CPU performance domain sharing the ANE voltage supply.

apple,performance-controller:
$ref: /schemas/types.yaml#/definitions/phandle
description:
Expand Down Expand Up @@ -175,7 +183,7 @@ properties:

apple,ane-type:
$ref: /schemas/types.yaml#/definitions/uint32
enum: [0x100, 0x110, 0x200]
enum: [0x100, 0x110, 0x200, 0x210, 0x220]
description: Firmware generation identifier supplied by the bootloader

apple,firmware-preloaded:
Expand Down Expand Up @@ -246,7 +254,6 @@ allOf:
properties:
compatible:
enum:
- apple,t6050-ane
- apple,t8140-ane
- apple,t8142-ane
then:
Expand All @@ -265,6 +272,53 @@ allOf:
- const: pwgate
required:
- apple,dapf-ranges
- if:
properties:
compatible:
const: apple,t6050-ane
then:
properties:
interrupts:
minItems: 2
power-domains:
maxItems: 1
apple,ane-type:
const: 0x220
oneOf:
- properties:
reg:
minItems: 3
maxItems: 4
reg-names:
minItems: 3
items:
- const: engine
- const: pmgr
- const: pwgate
- const: xl
required:
- apple,dapf-ranges
- description: Complete ADT inventory, not a firmware backend interface.
properties:
reg:
minItems: 7
reg-names:
items:
- const: engine
- const: pmgr
- const: aux-0
- const: aux-1
- const: aux-2
- const: aux-3
- const: aux-4
status:
const: disabled
required:
- status
else:
properties:
apple,clpc: false
performance-domains: false
- if:
required:
- apple,preload-data-sha256
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ properties:
- apple,j473-macaudio
- apple,j493-macaudio
- apple,j575c-macaudio
- apple,j775c-macaudio
- apple,j775d-macaudio
- apple,j575c-macaudio-jack
- apple,j604-macaudio
Expand Down
13 changes: 12 additions & 1 deletion Documentation/devicetree/bindings/sound/apple,t6030-dpaudio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,18 @@ required:
- compatible
- dmas
- dma-names
- power-domains
- ports

allOf:
- if:
properties:
compatible:
contains:
const: apple,t6050-dpaudio
then:
description: The DCP service owns the power lifecycle on T6050.
else:
required:
- power-domains

additionalProperties: false
Loading