diff --git a/Documentation/devicetree/bindings/gpu/apple,agx.yaml b/Documentation/devicetree/bindings/gpu/apple,agx.yaml index 202544c07b0bb..992783b2dc68f 100644 --- a/Documentation/devicetree/bindings/gpu/apple,agx.yaml +++ b/Documentation/devicetree/bindings/gpu/apple,agx.yaml @@ -17,6 +17,7 @@ properties: - apple,agx-g13s - apple,agx-g14g - apple,agx-g14s + - apple,agx-g17s - apple,agx-t6040 - apple,agx-t6041 - apple,agx-t6050 @@ -40,9 +41,11 @@ properties: - const: apple,agx-g14s reg: + minItems: 1 maxItems: 2 reg-names: + minItems: 1 maxItems: 2 power-domains: @@ -200,6 +203,14 @@ properties: AFR leakage. Per-chip efuse values decoded by the boot loader, stored as IEEE-754 binary32 bit patterns in big-endian cells. + apple,leakage-calibration-words: + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 3 + maxItems: 3 + description: + Raw per-chip GPU leakage calibration words for the M5 Pro controller + defaults. Supplied by the boot loader, never fixed in a board DT. + apple,firmware-abi: $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 3 @@ -213,6 +224,46 @@ required: - reg allOf: + - if: + properties: + compatible: + contains: + const: apple,agx-g17s + then: + description: + The M5 Pro GPU uses one MMIO range and two firmware mailbox roles. + Its firmware graph supplies the performance tables, so it has no + operating-point table in the board DT. + properties: + reg: + maxItems: 1 + reg-names: + items: + - const: sgx + mboxes: + items: + - description: Primary GFX firmware mailbox + - description: Secondary GFX firmware mailbox + memory-region: + items: + - description: Region containing GPU MMU TTBs + - description: Region containing GPU MMU page tables + - description: Shared handoff structure for VM coordination + - description: Data segment of the loaded GPU firmware + - description: Firmware kernel-window page tables + - description: Text segment identifying the loaded GPU firmware + memory-region-names: + items: + - const: ttbs + - const: pagetables + - const: handoff + - const: fw-data + - const: l2-pagetables + - const: fw-text + required: + - power-domains + - reg-names + - memory-region-names - if: properties: compatible: @@ -409,6 +460,7 @@ allOf: - apple,agx-t6041 - apple,agx-t8132 - apple,agx-t8140 + - apple,agx-g17s then: properties: reg: diff --git a/arch/arm64/boot/dts/apple/t6050-j714s-gpu-panel.dtsi b/arch/arm64/boot/dts/apple/t6050-j714s-gpu-panel.dtsi new file mode 100644 index 0000000000000..de9e9ba09285d --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6050-j714s-gpu-panel.dtsi @@ -0,0 +1,206 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* + * J714s internal panel, external display engines and GPU (G17S), for the boot + * loader's display and GPU handoff. Everything here stays disabled: the loader + * checks the ADT and the live DCP, DART and GPU firmware state, publishes the + * DCP's firmware properties and fills the GPU reservations, and only then + * enables the nodes, the GPU last. A loader without the handoff, or one whose + * checks fail, leaves the boot framebuffer to simpledrm and the GPU off. + * + * Values are from the J714sAP 27.0 ADT (dcp, dart-dcp, dart-disp0, dcpext*, + * dart-dcpext*, dart-dispext*, sgx, gfx-asc, gfx1-asc, pmgr) and the GPU + * firmware's own boot arguments (dArW, the two ASC wrappers). + */ + +/ { + aliases { + /* The loader writes apple,notch-height into the "dcp" alias */ + dcp = &dcp; + disp0 = &display; + /* The loader finds the GPU through this alias */ + gpu = &sgx; + }; + + /* As on t6050-ultra.dtsi, with the internal display's DART (disp0, SID 0) */ + display: display-subsystem { + compatible = "apple,display-subsystem"; + iommus = <&disp0_dart 0>; + status = "disabled"; + }; + + reserved-memory { + /* Filled and enabled by the loader from the ADT */ + gpu_fw_text: gpu-fw-text { + reg = <0 0 0 0>; + no-map; + status = "disabled"; + }; + + gpu_fw_data: gpu-fw-data { + reg = <0 0 0 0>; + no-map; + status = "disabled"; + }; + + uat_ttbs: uat-ttbs { + reg = <0 0 0 0>; + no-map; + status = "disabled"; + }; + + uat_pagetables: uat-pagetables { + reg = <0 0 0 0>; + no-map; + status = "disabled"; + }; + + uat_l2_pagetables: uat-l2-pagetables { + reg = <0 0 0 0>; + no-map; + status = "disabled"; + }; + + uat_handoff: uat-handoff { + reg = <0 0 0 0>; + no-map; + status = "disabled"; + }; + }; +}; + +/* ADT dart-dcp and dart-disp0: vm-base 1 TiB, vm-size 3 TiB */ +&dcp_dart { + apple,dma-range = <0x100 0x0 0x300 0x0>; +}; + +&disp0_dart { + apple,dma-range = <0x100 0x0 0x300 0x0>; +}; + +&dcp { + /* + * The 14.2-inch 3024x1964 mini-LED panel of J314/J414/J514. The OS takes + * the dimensions from the ADT when it has them; this J714s ADT does not. + */ + panel { + compatible = "apple,panel-j714", "apple,panel-mini-led", "apple,panel"; + width-mm = <302>; + height-mm = <196>; + adj-height-mm = <189>; + }; +}; + +/* + * The four external display engines (dcpext0..3): the loader hands each over + * when its checks pass, else leaves it disabled. No display is described on + * them: dcpext0 loses its Type-C route, whose crossbar J714s keeps disabled. + */ +&dcpext0 { + /delete-property/ phys; + /delete-property/ phy-names; + /delete-property/ mux-controls; + /delete-property/ mux-control-names; + /delete-property/ apple,typec-dptx-phys; + /delete-property/ apple,typec-mux-indices; + /delete-property/ apple,connector-type; + /delete-node/ typec-routes; +}; + +/* The ADT lists no clocks for the external engines (clock-ids = []) */ +&dcpext1 { + apple,clock-ids; +}; + +&dcpext2 { + apple,clock-ids; +}; + +&dcpext3 { + apple,clock-ids; +}; + +/* ADT dart-dcpextN and dart-dispextN: vm-base 1 TiB, vm-size 3 TiB, as dcpext0's */ +&dcpext1_dart { + apple,dma-range = <0x100 0x0 0x300 0x0>; +}; + +&dispext1_dart { + apple,dma-range = <0x100 0x0 0x300 0x0>; +}; + +&dcpext2_dart { + apple,dma-range = <0x100 0x0 0x300 0x0>; +}; + +&dispext2_dart { + apple,dma-range = <0x100 0x0 0x300 0x0>; +}; + +&dcpext3_dart { + apple,dma-range = <0x100 0x0 0x300 0x0>; +}; + +&dispext3_dart { + apple,dma-range = <0x100 0x0 0x300 0x0>; +}; + +/* The inventory ASC nodes; the mailboxes below describe the same windows. */ +/delete-node/ &gfx_asc; +/delete-node/ &gfx1_asc; + +&{/soc} { + /* + * ADT gfx-asc and gfx1-asc at their physical windows: the wrapper, the + * 8-byte iop-vbar, and their second and third interrupts (send-empty, + * recv-not-empty), as T8140/T8142. + */ + gfx_mbox: mailbox@2302600000 { + compatible = "apple,t6050-j775d-ascwrap-v6"; + reg = <0x23 0x2600000 0x0 0x88000>, + <0x23 0x2050000 0x0 0x8>; + reg-names = "wrapper", "iop-vbar"; + interrupts = , + ; + interrupt-names = "send-empty", "recv-not-empty"; + apple,firmware-role = "GFX"; + power-domains = <&ps_gfx>; + #mbox-cells = <0>; + status = "disabled"; + }; + + gfx1_mbox: mailbox@2302e00000 { + compatible = "apple,t6050-j775d-ascwrap-v6"; + reg = <0x23 0x2e00000 0x0 0x88000>, + <0x23 0x2850000 0x0 0x8>; + reg-names = "wrapper", "iop-vbar"; + interrupts = , + ; + interrupt-names = "send-empty", "recv-not-empty"; + apple,firmware-role = "GFX1"; + power-domains = <&ps_gfx>; + #mbox-cells = <0>; + status = "disabled"; + }; +}; + +/* The ADT marks GPX and AFR, GFX's parents, critical. */ +&ps_gpx { + apple,always-on; +}; + +&ps_afr { + apple,always-on; +}; + +&sgx { + compatible = "apple,agx-g17s"; + /* ADT sgx reg[0]; the driver maps the first 16 MiB as "sgx" */ + reg = <0x23 0x0 0x0 0x3fdc000>; + reg-names = "sgx"; + /delete-property/ interrupts; + mboxes = <&gfx_mbox>, <&gfx1_mbox>; + memory-region = <&uat_ttbs>, <&uat_pagetables>, <&uat_handoff>, + <&gpu_fw_data>, <&uat_l2_pagetables>, <&gpu_fw_text>; + memory-region-names = "ttbs", "pagetables", "handoff", "fw-data", + "l2-pagetables", "fw-text"; +}; diff --git a/arch/arm64/boot/dts/apple/t6050-j714s.dts b/arch/arm64/boot/dts/apple/t6050-j714s.dts index 79544fbdc4c16..301a1e02ec041 100644 --- a/arch/arm64/boot/dts/apple/t6050-j714s.dts +++ b/arch/arm64/boot/dts/apple/t6050-j714s.dts @@ -500,6 +500,9 @@ /* The same T6050 camera as J716c (J714sAP ADT); the loader sets the J714s sensor type. */ #include "t6050-j716c-isp.dtsi" +/* The GPU and the internal panel, for the boot loader's handoff */ +#include "t6050-j714s-gpu-panel.dtsi" + /* * Audio is not brought up: ADT i2c1 has the left sn012776 amplifiers and i2c2 the * cs42l84 codec, so both buses stay off.