Skip to content

arm64: dts: apple: t6050-k114-k116: SMC fans and sensors on all four boards - #2281

Draft
RyanTheTide wants to merge 1 commit into
integration/aurorafrom
dtfill-t6050/smc-fans
Draft

RyanTheTide wants to merge 1 commit into
integration/aurorafrom
dtfill-t6050/smc-fans

Conversation

@RyanTheTide

@RyanTheTide RyanTheTide commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Problem

The SMC hwmon node is disabled on K114c, K114s and K116c (t6050-k114-k116.dtsi). Only K116s turns it on, in its own board file. So the other three PROLED MacBook Pros show no fan speeds and no SMC power, voltage or temperature channels.

J714c is handled in #1984 and J716c in #2208/#2209. This PR does not touch them.

Change

  • t6050-k114-k116.dtsi: the K116s hwmon block moves here, unchanged: hwmon-common.dtsi, hwmon-fan-dual.dtsi and hwmon-laptop.dtsi, the shared temperature nodes and apple,soc-die-keys dropped so temperature discovery runs, and fan mode keys F0md/F1md. There is no apple,fan-manual-control, so the SMC keeps driving the fans.
  • t6050-k116s.dts: the block is removed from here.

No per-board deltas. The SMC node in the four boards' ADTs is the same. The ADT has no fan count or SMC key list. All four boards are dual-fan MacBook Pros like J714s and J716s, which use the same two-fan key set.

drivers/hwmon/macsmc-hwmon.c has no board gate. It checks only the SoC compatible, for its debugfs files.

Testing

  • Full kernel tree make dtbs CHECK_DTBS=y (dtschema) for every T6050 DTB on this branch: builds clean, no dtc warnings, and no schema message that integration/aurora does not already have.
  • All 11 T6050 DTBs build with no dtc warnings, before and after.
  • J714c, J714s, J716c, J716s, J775c, J775d, J873s and K116s DTBs are byte-identical.
  • K114c, K114s and K116c change only in the hwmon node (diff below).
  • dt-validate: no new messages on K114c, K114s or K116c.

Still to run

The keys were read on the K116s. On K114c, K114s and K116c the same keys are assumed: F0Ac/F1Ac with F0Mn/F0Mx/F0Tg/F0md and F1Mn/F1Mx/F1Tg/F1md, plus PSTR, PDTR, PMVR, PHPC, ID0R, VD0R and SBAV. If a key is missing, its channel is dropped and the driver logs it.

  • K114c (joshuaswarren): sensors shows two fan RPMs and the temperatures. dmesg | grep -i macsmc shows no key errors.
  • K114s (chrisohearn): the same check.
  • K116c (owner unknown): the same check.

No loader change is needed.

Per-board values and DTB diffs

Values: no new values. The key set is the K116s one, already used by J714s and J716s. The SMC node was compared across the K114cAP, K114sAP, K116cAP and K116sAP ADTs and is the same apart from phandles.

K114c, K114s and K116c each get this same change in the decompiled DTB (/soc/smc/hwmon):

 hwmon {
 	apple,discover-temperatures;
-	apple,soc-die-keys = "TCMb";
 	compatible = "apple,smc-hwmon";
-	status = "disabled";
+	status = "okay";
+	current-ID0R  { apple,key-id = "ID0R"; label = "AC Input Current"; };
+	fan-F0Ac      { key F0Ac, min F0Mn, max F0Mx, target F0Tg, mode F0md, label "Fan 1" };
+	fan-F1Ac      { key F1Ac, min F1Mn, max F1Mx, target F1Tg, mode F1md, label "Fan 2" };
+	power-PDTR    { "AC Input Power" };
+	power-PHPC    { "Heatpipe Power" };
+	power-PMVR    { "3.8 V Rail Power" };
+	power-PSTR    { "Total System Power" };
+	voltage-SBAV  { "Battery Voltage" };
+	voltage-VD0R  { "Charger Input Voltage" };
 };

K116s: byte-identical DTB.

Assisted-by: LLM (Claude:Opus 5.5)

…boards

The K114c, K114s and K116c leave the SMC hwmon node disabled; only the
K116s turns it on, with the dual-fan, power, voltage and current keys and
temperature discovery.

Move the K116s block into t6050-k114-k116.dtsi so all four boards get it.
The four boards' ADTs carry the same SMC node, and all four are dual-fan
MacBook Pros like the J714s and J716s. The key set is the one the K116s,
J714s and J716s already use; a key a board's SMC lacks only drops its
channel.

The K116s DTB is byte-identical. K114c, K114s and K116c gain the hwmon
channels. No other T6050 board changes.

The K116s block was written by Jens Axboe.

Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
@RyanTheTide

Copy link
Copy Markdown
Contributor Author

No blockers.

On current integration/aurora, K114c, K114s and K116c change only in /soc/smc/hwmon (okay, soc-die-keys dropped, the K116s key set with the F0md/F1md mode keys), and K116s and the other seven DTBs are byte-identical. No node sets apple,fan-manual-control, so macsmc-hwmon exposes the fans read-only and the SMC keeps its own fan policy. A key one of these SMCs lacks only drops its channel. Both CI jobs were cancelled; rerun them. Can leave draft.

HW row: K114c, K114s and K116c (owners) on the head: sensors shows two fan RPMs, the power/voltage/current channels and discovered temperatures, dmesg | grep -i macsmc has no key errors, and fans ramp under a 2 min all-core load and settle after it; 0 AVC, 0 failed units, no new kernel errors.

Assisted-by: LLM (Claude:Opus 5.5)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant