From nobody Sat Sep 05 23:32:18 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hcqPH1wvgz6rJww for ; Sat, 05 Sep 2026 23:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hcqPG29SCz47Z8 for ; Sat, 05 Sep 2026 23:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788651138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5E+QQC/WumJxb8Ipzb5xQb0veIna2dokqhLfnrY6NRM=; b=mlOcSqumOSNbuRL0uFWaNUDD04wrYK7hDzwDFtrl0C5uhNwjtk9QZlxwxCpvMbxPl07uuy vcwXkeo+Pt2lsXsXh1XnNXbJMguYHiyJmbWtbxoz9BOs/FZhAOAAeSyXB2tbQnAgXEezXF yqSNCHe7aQbc2U7aOGUmQKu5SbeLXm4RikNLW1euQp1q1ydSFR0I6gO8rmb12WFkAfU5Jq 7GYfTFlw4WaTqGOJ1rXJpcX6LuasG5r1kTw8e/A27IaaJ5QIS8TPKUzRoRNerVaZvkZxby BJihJzY1AbkXM0s8Ro+5ICmj0oJ1MDALnwE+MduNa8wZ/GKvJAntDmoygoqVsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788651138; a=rsa-sha256; cv=none; b=HyOJTFOT9PX5wnTjyR+BXZaaC8IwM1w1rP9Aiff71GOE88bp04UhbzuQL7iBaFq8ddfr7O 4HT6poz6ozAbqkT3HYOHPfSunxKZJ/GmkJrTImOuDVurRqvi2mC0ZEW2nOB+zlzvTJOMbr FKbGIrGDIpioTLAurnDLYPA2oiZvvl+UGMBQrIlIms24nsFpYFQ1gI2jJiq8sOlofOzPJp GPjDGeigmS0xH+PSFJsOsLVUAKaxWnm+TgZMrDgLN38t9CYrQUyGeDfdjNWBLhq9hktg87 A6JKkWElqP2p2y9BfUTxj2+JBmn72Qr8KZrYV8Ar1JsoWLmADNEGq7m+Zun3Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788651138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5E+QQC/WumJxb8Ipzb5xQb0veIna2dokqhLfnrY6NRM=; b=P0knkjfu+wGZjm31Wkw5St6GFkLN7ZNiMjPbaU8gDQR3yjvZHpPXtPWnRgQ30FfiM+0/SV nOs2j4LBQCWogrgLH/b7yRxXH3rQcVScRubVTgU6mnUCKbv3ZZ9+sj8KXnhR5GrybNJTXb dYL+8HhrRt/EBJCpYZnH/ixESEWIG8R/UuzTrjHRghmh0x6/6f+9GDYUWIS5Mez8pHfpJX FuCFkfJL1U3z+sKlfF3aaJq/GKok4AihOm77vXnwzz5TV9NkeWK96vuBat40gad21EdrpX mSFJDKi2NatjVQPpnGV7QXUb9TtsTOrql/skAHhHWp9V/VWTkORK64lpeDa/hA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcqPG0MXMz15kn for ; Sat, 05 Sep 2026 23:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22cf3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 05 Sep 2026 23:32:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Marcus Gartner From: Enji Cooper Subject: git: 470993a3d879 - stable/14 - asmc: add support for MacBookPro13,1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 470993a3d879ab41b2e6466d3495887f480cd247 Auto-Submitted: auto-generated Date: Sat, 05 Sep 2026 23:32:18 +0000 Message-Id: <6a9ca682.22cf3.2db3f9f3@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=470993a3d879ab41b2e6466d3495887f480cd247 commit 470993a3d879ab41b2e6466d3495887f480cd247 Author: Marcus Gartner AuthorDate: 2026-04-11 02:03:18 +0000 Commit: Enji Cooper CommitDate: 2026-09-05 23:31:45 +0000 asmc: add support for MacBookPro13,1 This commit adds support for the MacBookPro13,1 (late 2016, 13-inch). The SMC keys were collected from https://logi.wiki/index.php/SMC_Sensor_Codes. Two temperature keys are omitted because they fail to be read: TI0P (IO Proximity) and Ta0P (Ambient Air). Note that the with this model the `dev.asmc.0.fan.0.minspeed` setting only applies when the fans have been activated by the system. In my testing, the fans did not spin up until CPU temperatures hit about 80C. At lower temperatures, the fans will happily ignore the minimum speed and remain at 0 rpm. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/2137 (cherry picked from commit b5b9c65a689457e608cc31831ed690d303d63ffa) --- sys/dev/asmc/asmc.c | 6 ++++++ sys/dev/asmc/asmcvar.h | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 044fd7e85057..7cd5181605a8 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -343,6 +343,12 @@ static const struct asmc_model asmc_models[] = { ASMC_MBP115_TEMPS, ASMC_MBP115_TEMPNAMES, ASMC_MBP115_TEMPDESCS }, + { + "MacBookPro13,1", "Apple SMC MacBook Pro Retina Core i5 (late 2016, 13-inch)", + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS, + ASMC_MBP131_TEMPS, ASMC_MBP131_TEMPNAMES, ASMC_MBP131_TEMPDESCS + }, + /* The Mac Mini has no SMS */ { "Macmini1,1", "Apple SMC Mac Mini", diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 0e8d4e9d4a36..2c60181704e5 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -564,6 +564,24 @@ struct asmc_softc { "Pbus", "Ambient Light", "Leftside", "Rightside", "CPU Package Core", \ "CPU Package GPU", "CPU Package Total", "System Total", "DC In" } +#define ASMC_MBP131_TEMPS { "TB0T", "TB1T", "TB2T", "TC0F", \ + "TC0P", "TC1C", "TC2C", "TCGC", \ + "TCSA", "TCXC", "Th1H", "TM0P", \ + "TPCD", "Ts0P", "Ts0S", "TaLC", \ + "Ts1P", NULL } + +#define ASMC_MBP131_TEMPNAMES { "battery", "battery_1", "battery_2", "cpu_die_peci", \ + "cpu_proximity", "cpu_core_1", "cpu_core_2", "intel_gpu", \ + "cpu_sys_agent", "cpu_core_peci", "right_fin_stack", "memory_proximity", \ + "platform_ctrl_hub", "trackpad", "bottom_skin", "air_flow", \ + "trackpad_act" } + +#define ASMC_MBP131_TEMPDESCS { "Battery", "Battery Sensor 1", "Battery Sensor 2", "CPU Die (PECI)", \ + "CPU Proximity", "CPU Core 1", "CPU Core 2", "Intel GPU", \ + "CPU System Agent Core (PECI)", "CPU Core (PECI)", "Right Fin Stack", "DDR3 Proximity", \ + "Platform Controller Hub Die", "Trackpad", "Bottom Skin", "Air Flow", \ + "Trackpad Actuator" } + #define ASMC_MM_TEMPS { "TN0P", "TN1P", NULL } #define ASMC_MM_TEMPNAMES { "northbridge1", "northbridge2" } #define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \