Repository navigation
arm64: dts: apple: t6050: describe the fans on J775c and J873s - #2397
RyanTheTide wants to merge 1 commit into
Conversation
The Mac Studio (M5 Max, J775c) and the Mac mini (M5 Pro, J873s) have the SMC hwmon node from t6050-die0.dtsi but no fan or power keys, so neither shows a fan speed. Move the J775d's SMC keys (DC input power PD0R, the two fans with the T6050 mode keys F0md/F1md) into a new t6050-j775-hwmon.dtsi and include it from both Studios. The J775d DTB is byte-identical. The J775c board support by Satya Benson and Diljit Singh uses the same keys. The J873s takes the Mac mini pattern (hwmon-common.dtsi, hwmon-mini.dtsi: one fan), drops the shared temperature nodes so that key discovery still runs, as J714s and J716s do, and uses the T6050 fan mode key F0md. No new SMC keys: all of them are in the shared hwmon files or already used on other T6050 boards. The other nine T6050 DTBs are unchanged. Suggested-by: Jeff Queisser <funkzy@users.noreply.github.com> Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
No blockers. I built all 11 T6050 DTBs from this PR merged onto the current integration/aurora. J775d and the eight others are byte-identical to the base. J775c gains only fan-F0Ac/F1Ac (F0md/F1md) and power-PD0R. J873s gains only the hwmon-common power/voltage/current keys and one fan, and TH0x/TW0P are deleted, so apple,discover-temperatures still runs. In drivers/hwmon/macsmc-hwmon.c:1113-1150 (integration/aurora), a key the SMC lacks drops only that attribute. A kernel fan request needs the mode, minimum, maximum and target keys, and its target comes from the SMC's own min/max (:649-661). The new fan nodes add no hardcoded limit. dt-checks and host-tests pass.
HW row (not blocking, both boards are DT-inventory only today): J775c and J873s, once booted: sensors shows the fan(s) with RPM, no "optional keys not found" line, J775c "DC Input Power" non-zero. Plus 0 AVC, 0 failed units and 0 new kernel errors. Assisted-by: LLM (Claude:Opus 5.5) |
Problem
The Mac Studio (M5 Max, J775c) and the Mac mini (M5 Pro, J873s) have the SMC hwmon node from t6050-die0.dtsi, but no fan or power keys. Neither board shows a fan speed in
sensors.Change
t6050-j775-hwmon.dtsi, shared by both Mac Studios: the J775d's SMC keys, moved as they are. That is DC input power (PD0R),hwmon-fan-dual.dtsi, and the T6050 fan mode keys F0md/F1md. J775c and J775d include it. The J775d DTB is byte-identical.hwmon-common.dtsi+hwmon-mini.dtsi(one fan), as on J773s and J773g. The shared temperature nodes (TH0x, TW0P) are deleted so thatapple,discover-temperaturesstill runs. J714s and J716s do the same. The fan mode key is F0md, as on J714s, J716s, K116s and J775d.drivers/hwmon/macsmc-hwmon.chas no SoC or board gate on fans. A missing optional fan key only drops that attribute, and a missing sensor key only drops its channel (dev_dbg). The open driver PRs hwmon: macsmc: Select sensor keys by key metadata, not by SoC #2353, hwmon: macsmc: SMC key inventory and sensor key checks on every SoC #2304, hwmon: macsmc: Drop the fan_control module parameter #2354 and hwmon: macsmc: retain fan ownership until automatic mode is restored #2209 do not add a gate either.Testing
Still to run
sensorsshows "Fan 1" and "Fan 2" with non-zero RPM and "DC Input Power".cat /sys/class/hwmon/hwmon*/fan*_inputgives two non-zero values.dmesg | grep -i macsmcshows no "optional keys not found" line and no SMC errors.sensorsshows "Fan" with RPM (it may read 0 at idle if the fan is stopped) and the discovered T* keys.cat /sys/class/hwmon/hwmon*/fan1_inputgives a value. dmesg has no "optional keys not found" line for F0Ac. Also check whether PSTR/PDTR read 0 here as they do on the Studio. If they do, a later change can drop hwmon-common, as on J775d.sensorsshows both fans and "DC Input Power" as before. The DTB is byte-identical, so no change is expected.This does not depend on a loader change. It applies on its own and does not overlap the J775d/J873s hunks of #2279, #2277, #2278, #2291 or #1973.
Per-board values and DTB diffs
J775c, added under /soc/smc/hwmon:
J873s, added under /soc/smc/hwmon:
J775d: IDENTICAL-DTB (the hwmon nodes moved from t6050-j775d.dts into t6050-j775-hwmon.dtsi unchanged).
The fan counts come from the hardware (Mac Studio: two fans, Mac mini: one fan) and match the sibling boards on earlier SoCs. Studios J375c/d, J475c/d, J575c/d use hwmon-fan-dual. Minis J274, J473, J474s, J773g, J773s use hwmon-mini.
Assisted-by: LLM (Claude:Opus 5.5)