From nobody Thu Apr 16 06:06:23 2026 X-Original-To: dev-commits-src-all@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 4fx6w50Q8Wz6Z0Qd for ; Thu, 16 Apr 2026 06:06:29 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fx6w42cjVz3hvq for ; Thu, 16 Apr 2026 06:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776319588; 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=CDBSpzCLZwQfeh3j8+0M9TEvvY3X1h+ECxOk7xIDd/w=; b=vJuBE5hMdICGuu3Golw525Hlv+hczxPBB4eFwW9x0XRwV4EKUfZLQGpi/90sUlo7GxedUo aUW3EqzT4a2pmSAjqYzIbzD5ZLjJMkOlDE9VG2BvLPJsrWO/QbtKtzSb90of2JeF/50jc8 J66mbmARYXmtqu6veKH/kLyZOeGKrdtANbGGb09uvWXI5nOlaSeY/AePHyrK1/jVI+xrLa Z3FY3N4R9zzXxjIeVsIlrzIerh2vOchuumnrb50Xm1ALp0fOEtxHZQcT74C+ihgElqzSJf RYhTc+MeoaDneJGOflHdDNZ3LQ8Q0XtI9NWaDWrpjAaqSjjxo+DLkQtJs9PA8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776319588; a=rsa-sha256; cv=none; b=mYysLMGsmMC66Z0LfE/z29nBqu4Jmsug4FRWfNgAxFEAjvDfsl+sk0oqas8eUc7ZO8P+q+ yFb3qd0/z0xCMryIyez2CC6dEQtCdgiViPiy+dWxJPOf6sr4w2qVOYOJV/Jq3bg5AE7glN xe1/L5SM3KjZEFPubdqbE8fEoa82OWPsTBQvkETOHfNdH3jtSjC75GnMf8OkmfcrOH9XU9 4TOBJ6luxIHzz89T0wi/BLmdv7GuR/b+WINR/tze/pyr9+EdiMZCHyNppuTVBkLljax/sd 9JNLvDO9HGvv7K3ty8Jx6tStIAF9DW/1XtyXmaRU6cG3ebK9pEUxUFPxk6NVDw== 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=1776319588; 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=CDBSpzCLZwQfeh3j8+0M9TEvvY3X1h+ECxOk7xIDd/w=; b=TjnFihHVICMfB1wxjYyZDYctqwtktEbBkaeyADsDT4NAysQLhja5tmWkILToQOPsetgPrC clt0Frn4Ci9HbvzmVUOaJ1/cc0OPbS730pRcNgbBlIctSlNBa8CFGfA2eUm4S5YntzzDIB jLB4Nbfa2R47MttpZvWxmh7dcyaSt0lQDOqFEz/2ShENRiAPy9mCl5kkfZx9GP8Si724eC gXpZvgMLUtl/iiLh/+r9LFzQhd4AtUQjJqLaYY41Pna7EM+r31hb9O3XHGAonbH3Z6jNF6 j+Bw99ZxgChWaJE97fDhBTdCOPKDHg8/wr+C0HMuSziaKBijp9W1QDZJb4YIxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fx6w4245rzvwp for ; Thu, 16 Apr 2026 06:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cb89 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 06:06:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Marcus Gartner From: Warner Losh Subject: git: b5b9c65a6894 - main - asmc: add support for MacBookPro13,1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5b9c65a689457e608cc31831ed690d303d63ffa Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 06:06:23 +0000 Message-Id: <69e07c5f.3cb89.756528a9@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b5b9c65a689457e608cc31831ed690d303d63ffa commit b5b9c65a689457e608cc31831ed690d303d63ffa Author: Marcus Gartner AuthorDate: 2026-04-11 02:03:18 +0000 Commit: Warner Losh CommitDate: 2026-04-16 06:05:19 +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 --- 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", \