Skip to content

arm64: dts: apple: t6040-j616s: Run the fans on the CPU die like macOS #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jgoyvaerts wants to merge 3 commits into from
Closed

arm64: dts: apple: t6040-j616s: Run the fans on the CPU die like macOS #579

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d55e03f
arm64: dts: apple: t6040-j616s: Run the fans on the CPU die like macOS
jgoyvaerts Oct 29, 2026
a4a2b43
arm64: dts: apple: t6040-j616s: Hold the CPU die fan speeds through T…
jgoyvaerts Oct 29, 2026
5c271f4
arm64: dts: apple: t6040-j616s: Keep full fan speed for the passive trip
jgoyvaerts Oct 30, 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
31 changes: 29 additions & 2 deletions arch/arm64/boot/dts/apple/t6040-j616s.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,18 @@
* highest state any zone asks for and goes back to the SMC once no
* zone asks for anything. States 1-8 of a fan run it from its minimum
* (1350 rpm) to its maximum (5777 rpm) in even steps.
*
* The CPU die ladder follows macOS 26.6.2 on this machine under 300 s
* of all-core load at full clocks (P 3852, E 2592 MHz, never
* throttled): the fans stay off up to TCMz ~100 C, start at their
* minimum, leave it near 104.5 C, and hold the die at a steady 106.5 C
* with 3450/3730 rpm (60-65% of maximum), after a 110.9 C peak, never
* faster than 3730 rpm. So 111 C asks for state 6 (4510 rpm), and full
* speed waits for the 113 C passive trip, where the CPUs also shed
* clocks. TCMz, the hottest of the die sensors, swings by up to 8 C
* between samples under load, so the hysteresis spans that swing; a
* fan stays on its speed until the die is clearly cooler, as the
* SMC's slow ramp does under macOS.
*/
#define J616S_FAN_TRIP(label, node, temp, hyst) \
label: node { \
Expand All @@ -344,6 +356,13 @@
J616S_FAN_TRIP(zone##_fan4, trip-fan4, 90000, 5000) \
J616S_FAN_TRIP(zone##_fan5, trip-fan5, 95000, 5000)

#define J616S_CPU_FAN_TRIPS(zone) \
J616S_FAN_TRIP(zone##_fan1, trip-fan1, 100000, 10000) \
J616S_FAN_TRIP(zone##_fan2, trip-fan2, 104000, 8000) \
J616S_FAN_TRIP(zone##_fan3, trip-fan3, 106000, 7000) \
J616S_FAN_TRIP(zone##_fan4, trip-fan4, 108000, 5000) \
J616S_FAN_TRIP(zone##_fan5, trip-fan5, 111000, 3000)

#define J616S_FAN_MAP(trip_label, node, state) \
node { \
trip = <&trip_label>; \
Expand All @@ -358,14 +377,22 @@
J616S_FAN_MAP(zone##_fan4, map-fan4, 5) \
J616S_FAN_MAP(zone##_fan5, map-fan5, 8)

#define J616S_CPU_FAN_MAPS(zone) \
J616S_FAN_MAP(zone##_fan1, map-fan1, 1) \
J616S_FAN_MAP(zone##_fan2, map-fan2, 2) \
J616S_FAN_MAP(zone##_fan3, map-fan3, 4) \
J616S_FAN_MAP(zone##_fan4, map-fan4, 5) \
J616S_FAN_MAP(zone##_fan5, map-fan5, 6) \
J616S_FAN_MAP(zone##_passive, map-fan6, 8)

thermal-zones {
cpu-die-thermal {
polling-delay-passive = <1000>;
polling-delay = <1000>;
thermal-sensors = <&smc_hwmon 0>; /* TCMz */

trips {
J616S_FAN_TRIPS(cpu_die)
J616S_CPU_FAN_TRIPS(cpu_die)

cpu_die_passive: cpu-die-passive {
temperature = <113000>;
Expand All @@ -381,7 +408,7 @@
};

cooling-maps {
J616S_FAN_MAPS(cpu_die)
J616S_CPU_FAN_MAPS(cpu_die)

map-e {
trip = <&cpu_die_passive>;
Expand Down