Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
76b6d84
arm64: dts: apple: t8132: put the display subsystem under /soc
DjDeveloperr Nov 7, 2026
1027007
arm64: dts: apple: t8132-j713: mark the GPU and DCP nodes okay
DjDeveloperr Nov 7, 2026
411ee8b
arm64: dts: apple: t8132-j713: use the shared T8132 files
DjDeveloperr Nov 7, 2026
3d35324
arm64: dts: apple: t8132: split the boards into SoC, common and famil…
DjDeveloperr Nov 7, 2026
5aa0279
arm64: dts: apple: t8132: describe the PCIe-C tunables on every board
DjDeveloperr Nov 7, 2026
c5fd88e
arm64: dts: apple: t604x: describe the T6040-only blocks in t6040.dtsi
DjDeveloperr Nov 7, 2026
e47365e
arm64: dts: apple: t6041: describe the PMU, JPEG, AVE, SIO and QSPI
DjDeveloperr Nov 7, 2026
969cd60
arm64: dts: apple: t8132: scale the 720p camera preset
DjDeveloperr Nov 7, 2026
d3a3629
arm64: dts: apple: t6040-j616s: give the panel the 16-inch width
DjDeveloperr Nov 7, 2026
6ed01be
arm64: dts: apple: t604x-j614-j616: enable the JPEG engines on both
DjDeveloperr Nov 7, 2026
8a947b9
arm64: dts: apple: t6041: share the J614c and J616c board body
DjDeveloperr Nov 7, 2026
fa1e8ad
arm64: dts: apple: t604x, t8132: use the common USB and GPU labels
DjDeveloperr Nov 7, 2026
1f1f0e6
arm64: dts: apple: t604x, t8132: put status last
DjDeveloperr Nov 7, 2026
875e481
arm64: dts: apple: t604x: expand one-line nodes and raw specifiers
DjDeveloperr Nov 7, 2026
c23a8f0
arm64: dts: apple: t604x, t8132: shorten the longest comments
DjDeveloperr Nov 7, 2026
108975e
arm64: dts: apple: t8132-j713: say what the PMGR policy leaves to the…
DjDeveloperr Nov 7, 2026
5ee12f0
Revert "arm64: dts: apple: t6040-j616s: give the panel the 16-inch wi…
DjDeveloperr Nov 7, 2026
5f0304b
Merge integration/aurora into dts/m4-asahi-layout
DjDeveloperr Nov 7, 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
95 changes: 17 additions & 78 deletions arch/arm64/boot/dts/apple/t6040-gpu-thermal.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -162,86 +162,25 @@
};

/*
* CPU die temperature: SMC key TCMz (CPU die max), sensor 0 of
* smc_hwmon, polled once a second as the SMC refreshes it. Per-cluster
* and GPU zones follow, one per SMC die-maximum sensor (smc_hwmon
* channels 1-23, in the order of the temperature nodes below): Tex0-3
* throttle the E cluster, Tpx0-5 the first P cluster and Tpx8-D the
* second. The die zone throttles all three. The cpufreq cooling device
* sits on a cluster's policy CPU, so each map lists every CPU of its
* cluster.
* Zones on the SMC die-maximum sensors (smc_hwmon 0-23): TCMz for the
* die, Tex0-3, Tpx0-5 and Tpx8-D per CPU cluster, and the seven
* hottest GPU sensors. The PMP's loop holds the die at the ADT
* fast-die-ctrl-loop target of 110 C, as on macOS; these zones are
* the backstop behind it.
*
* The fast control is the PMP's, as on macOS: its loop holds its own
* hot-spot sensors at the ADT fast-die-ctrl-loop target of 110 C and
* cpufreq enforces its effort as a frequency limit within milliseconds.
* Under a sustained all-core build TCMz then settles at 113 to 114 C.
* The CPU zones are the slower backstop above that point: the power
* allocator switches on at 75 C and controls at 115 C, so it leaves the
* PMP's operating point alone and only trims what the PMP lets through.
* - CPU zones run the power allocator from 75 C, control at 115 C and
* throttle only the cluster their sensor sits on. The 1 s samples
* jump by about 10 C, so the zones are integral-led.
* - GPU zones: the GPU firmware limits itself from 101 C; these shed
* CPU power from the same point (on at 90 C) and shut down at 118 C.
* A powered-off GPU reads -4 to 4 C.
* - Hot at 120 C only reports; critical is the ADT's 125 C sochot
* level, after three samples (critical-samples).
* - The fans stay with the SMC, as on macOS: no active trips.
*
* The PMP's sensors do not see every hot spot. Under mixed SIMD,
* memory and GPU load the per-core Tpx sensors follow a core's power
* within a second and jump by 9-10 C (one standard deviation) between
* 1 s samples while the PMP's effort stays at zero. A controller on
* these samples cannot stop single excursions, and a proportional one
* swings between no limit and full cooling every second, so the zones
* are integral-led: the wide 40 C switch-on window keeps the
* proportional gains low and integral-time-constant-ms sets the
* integral term. Each zone throttles only the cluster its sensor sits
* on: the allocator divides a zone's budget by requested power, so a
* zone that throttled every cluster left a hot core's own cluster
* nearly at full speed.
*
* Critical (orderly shutdown) is at 125 C, the per-sensor maximum the
* ADT temp-sensor table gives next to the 110 C target for the PMP's
* sensors (the sochot level). The SMC sensors read a few degrees above
* the PMP's, so Linux shuts down at or before the hardware's own limit.
* A hot trip at 120 C only reports, and the critical trip acts only
* after three consecutive samples at or above it (critical-samples),
* so one excursion cannot shut the machine down. Under any load the
* per-core excursions have peaked at 116.5-118 C, which the former
* 118 C critical trip turned into a shutdown.
*
* The GPU has no cooling device of its own: its firmware sets the GPU
* performance state and starts limiting at 101 C. So when a GPU die
* sensor reaches the GPU firmware's limit, the seven
* hottest ones (Tg05, Tg0S, Tg0Y, Tg0k, Tg0z, Tg1V, Tg1l) also shed
* CPU power through the CPU clusters, from the same 101 C, leaving the
* shared heat budget to the GPU. They shut down at 118 C. While the
* GPU is powered off its sensors report placeholder values from -4 to
* 4 C.
*
* Every zone runs the power allocator, which acts at any temperature
* unless a zone has a second passive trip: the first one is then its
* switch-on point, below which it resets and grants full power. So each
* zone has one: 75 C under the 115 C die and CPU control trip and 90 C
* under the GPU zones' 101 C one. Without them the GPU zones, whose
* placeholder readings never warm up, held all 14 CPUs to about 7.5 W
* (1.26/1.02/1.26 GHz) under any all-core load. The GPU zones also
* carry the die's sustainable power rather than the allocator's
* estimate from the lowest CPU states (about 2.6 W).
*
* The fans stay with the SMC, as on macOS: macOS writes no SMC key at
* runtime and its fans run in the SMC's own mode, which ramps them
* under sustained load. No zone has active trips; the hwmon fans stay
* cooling devices for userspace and manual control.
*
* sustainable-power is what the CPUs dissipate with the die held at
* its operating point: 720 s of all-core load (10 P, 4 E busy loops),
* headless, SMC fans in their own mode. Over the last 600 s TCMz held
* 112.0 to 113.8 C with the PMP limiting the P clusters to a mean of
* about 3.7 GHz and the fans at 3450/3730 rpm (where macOS settles
* too). The SMC core rails then read P0 25.3 W, P1 23.9 W and E 2.1 W
* on average, the units of the energy model. Each zone gets the sum
* over the clusters it throttles. Without it the power allocator
* estimates a budget from the cooling devices' lowest states, which
* throttles far below what this machine sustains.
*
* All of these values were measured on the J616s. The J614s and J773s
* inherit them until they are measured: Apple's package power limits
* for the J614s are about 78% (CPU) and 90% (GPU) of the J616s ones,
* so its budgets are generous here, and these zones are a backstop
* behind the PMP.
* sustainable-power is the J616s's: a 720 s all-core load held TCMz
* at 112-114 C with P0 25.3 W, P1 23.9 W and E 2.1 W on the SMC core
* rails. The J614s and J773s inherit these values until measured.
*/
thermal-zones {
cpu-die-thermal {
Expand Down
14 changes: 11 additions & 3 deletions arch/arm64/boot/dts/apple/t6040-j614s.dts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,14 @@
};
};

&isp_dart0 { status = "disabled"; };
&isp_dart1 { status = "disabled"; };
&isp_dart2 { status = "disabled"; };
&isp_dart0 {
status = "disabled";
};

&isp_dart1 {
status = "disabled";
};

&isp_dart2 {
status = "disabled";
};
10 changes: 4 additions & 6 deletions arch/arm64/boot/dts/apple/t6040-j616s-extdisp-hdmi.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@

/*
* DISPEXT0 may only be powered once the PMP has acknowledged it in its
* device-state table (SOC-DEV-PS-REQ/ACK, PTD entries 480/488 on T6041): the
* soc-device record of DISPEXT0 has ID 18 (ADT iop-pmp-nub soc-device, ack
* flag set), so its request bit is 17. Without it, enabling the DISPEXT0 PMGR
* chain hung the machine before root.
* Same contract as the T6030 PMP device-state provider of
* aurora-silicon/linux#358, through the existing pmp-report entries here.
* device-state table (SOC-DEV-PS-REQ/ACK, PTD entries 480/488 on T6041):
* its ADT iop-pmp-nub soc-device ID is 18, so its request bit is 17.
* Without it, enabling the DISPEXT0 PMGR chain hung the machine before
* root. The T6030 PMP device-state provider works the same way.
*/
&pmp_report {
pmp_dispext0: report@11 {
Expand Down
6 changes: 3 additions & 3 deletions arch/arm64/boot/dts/apple/t6040-j616s-tether.dts
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
status = "disabled";
};

&usb_drd0 {
&dwc3_0 {
status = "disabled";
};

&usb_drd0_dart_0 {
&dwc3_0_dart_0 {
status = "disabled";
};

&usb_drd0_dart_1 {
&dwc3_0_dart_1 {
status = "disabled";
};
6 changes: 3 additions & 3 deletions arch/arm64/boot/dts/apple/t6040-j616s-usb3.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@
apple,tunable-usb2-host = <0x8 0x7003 0x3>;
};

&usb_drd0 {
&dwc3_0 {
/* DRD_USB31_GBL_DEFAULT, then GCTL.PWRDNSCALE = 0xd as macOS's controller reset() sets it */
apple,tunable-gbl-default = <0x64 0x2 0x0>, <0x10 0xfff80000 0x00680000>;
apple,tunable-gbl-host = <0x4 0x0001ef00 0x00002f00>, <0x1c 0x00000100 0x0>,
Expand All @@ -557,7 +557,7 @@
<0x60 0x0003ffff 0x00000600>;
};

&usb_drd1 {
&dwc3_1 {
/* DRD_USB31_GBL_DEFAULT, then GCTL.PWRDNSCALE = 0xd as macOS's controller reset() sets it */
apple,tunable-gbl-default = <0x64 0x2 0x0>, <0x10 0xfff80000 0x00680000>;
apple,tunable-gbl-host = <0x4 0x0001ef00 0x00002f00>, <0x1c 0x00000100 0x0>,
Expand All @@ -571,7 +571,7 @@
<0x60 0x0003ffff 0x00000600>;
};

&usb_drd2 {
&dwc3_2 {
/* DRD_USB31_GBL_DEFAULT, then GCTL.PWRDNSCALE = 0xd as macOS's controller reset() sets it */
apple,tunable-gbl-default = <0x64 0x2 0x0>, <0x10 0xfff80000 0x00680000>;
apple,tunable-gbl-host = <0x4 0x0001ef00 0x00002f00>, <0x1c 0x00000100 0x0>,
Expand Down
21 changes: 0 additions & 21 deletions arch/arm64/boot/dts/apple/t6040-j616s.dts
Original file line number Diff line number Diff line change
Expand Up @@ -83,27 +83,6 @@
firmware-name = "apple/mesacal-j616s.bin", "apple/msrk-j616s.bin";
};

&ps_jpg {
status = "okay";
};

&jpeg0_dart {
status = "okay";
};

&jpeg0 {
status = "okay";
};

&jpeg1_dart {
status = "okay";
};

&jpeg1 {
status = "okay";
};


&i2c4 {
sd_card_control: card-control@20 {
compatible = "apple,t6041-sd-card-control", "apple,sd-card-control";
Expand Down
12 changes: 6 additions & 6 deletions arch/arm64/boot/dts/apple/t6040-j773s-usb-front.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
mboxes = <&atcphy3_mbox>;
mbox-names = "phy-cpu";
nonposted-mmio;
status = "disabled";

apple,tunable-axi2af =
<0x0 0x800000ff 0x80000025>,
Expand Down Expand Up @@ -212,6 +211,7 @@
<0x44 0x00000004 0x00000004>;
apple,tunable-usb2-host =
<0x8 0x00007003 0x00000003>;
status = "disabled";
};

atcphy3_mbox: mailbox@39b148000 {
Expand All @@ -229,7 +229,7 @@
status = "disabled";
};

usb_drd3_dart_0: iommu@39af00000 {
dwc3_3_dart_0: iommu@39af00000 {
compatible = "apple,t6041-dart", "apple,t8110-dart";
reg = <0x3 0x9af00000 0x0 0xc000>;
interrupt-parent = <&aic>;
Expand All @@ -240,7 +240,7 @@
status = "disabled";
};

usb_drd3_dart_1: iommu@39af80000 {
dwc3_3_dart_1: iommu@39af80000 {
compatible = "apple,t6041-dart", "apple,t8110-dart";
reg = <0x3 0x9af80000 0x0 0xc000>;
interrupt-parent = <&aic>;
Expand All @@ -251,7 +251,7 @@
status = "disabled";
};

usb_drd3: usb@39a280000 {
dwc3_3: usb@39a280000 {
compatible = "apple,t6040-dwc3", "apple,t8103-dwc3";
reg = <0x3 0x9a280000 0x0 0xcd00>,
<0x3 0x9a28cd00 0x0 0x3200>,
Expand All @@ -260,12 +260,11 @@
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 1715 IRQ_TYPE_LEVEL_HIGH>;
dr_mode = "host";
iommus = <&usb_drd3_dart_0 0>, <&usb_drd3_dart_1 1>;
iommus = <&dwc3_3_dart_0 0>, <&dwc3_3_dart_1 1>;
power-domains = <&ps_atc3_usb>;
resets = <&atcphy3>;
phys = <&atcphy3 PHY_TYPE_USB2>, <&atcphy3 PHY_TYPE_USB3>;
phy-names = "usb2-phy", "usb3-phy";
status = "disabled";

apple,tunable-gbl-host =
<0x4 0x0001ef00 0x00002f00>,
Expand All @@ -289,5 +288,6 @@
apple,tunable-gbl-default =
<0x64 0x00000002 0x00000000>,
<0x10 0xfff80000 0x00680000>;
status = "disabled";
};
};
Loading
Loading