From nobody Fri Apr 25 05:38:43 2025 X-Original-To: dev-commits-src-main@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 4ZkM8M72ntz5vGY2; Fri, 25 Apr 2025 05:38:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZkM8M4Lp7z4Mrh; Fri, 25 Apr 2025 05:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745559523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2YthJXEA9f0ummWtvuR/iNch2g8y1UxkCPWFCyB2+BQ=; b=MtcQF3zfTAH/CaqW28TopVK3h43leXdh6Uqo6HFF203QSWJLtb8YPSTkqXixVc+lNBMHMD CVeneY7P5tbadDvCjJYj1IUEtNdAjEMurG3TzRkUiHBMu0c/eRkldwsi2au04rWKymCllF xC5Cg0ExO/lc8dhx9lBHGLV4txB5Pu+ILU2QDEfo+7Rr5VkREcdaM4efU+uUveV/SezjV0 2zVqGKX2Yz6bzhzsQhSrOU/BQnctnSFSoxQ/N+qWPM5E5JKdktS40Nfgccjvby0DQD9Hvv E5y/Gjid67D+Pd2WnGIjjpk4ySySWHqXkGbFJpd2b0gr/5hJMjLytmH1sGoBwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745559523; a=rsa-sha256; cv=none; b=RvtanoCjNarO+F6oEtlHo1o7gZJSwB4dSCJPelMvpP2qmZ6pqw+/ysBB1S5Y+3+U8ftcB/ nTfW2ED9LGC0BmKz5reyPQG9cPMYT/RRksTsl2Joq/8pN2jhCLANIXaXu15sWQ+8XY78Ns y/znaI1/B0MqV0gVAfLQ1GAov9D88Vo5JwHF0h6s5Ogm/Ni148pP9dy3EX93+Zva5VsSkC Suy2SumbusGO5YmFL3bNrvSs4v1u3SGUTLDqL4coJF0gvFMvfkKpeopVhUz8+nIa0XCXB5 zc2EUDMCkq8KBmhEmwOTWrlrr3HVOJjTQ0Yn4yt+Oi2lU2LltOkN9Xq2d4gCfg== 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=1745559523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2YthJXEA9f0ummWtvuR/iNch2g8y1UxkCPWFCyB2+BQ=; b=DKFBvEBmHsVWbTn4Tf+gXc+BGS1LBxogIqGxxkVQg80sl/Wlhe/n5qO52veEamoIyB236T Cb2cu3kjPiS3xZC6XwuIzvYEZF7VIRBcipE0PmYaJ6lpDNkcqp6ZZlWLhPM0YkpgnJ0e3y AwWMO/aCmfFnEoit0UGdk2XpGoEe/JHnIiWRZ3p6hkVCN0dVX0nr7uPxkhxD3IwzU8+4iC nFZDkpwKrVBtRcBjE8fg2CHApKC8KI4GNsv8zdM2yeG/8g8YZo2gx8hMYfFbkBdF1/ZtAF RBOEtS0wKXxtkhqM02rvD5LYCTD2sSkJ9v3DLxjdNQ3rtjPquzkWVXBSh8TynQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZkM8M3yN7z64K; Fri, 25 Apr 2025 05:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53P5chq0060841; Fri, 25 Apr 2025 05:38:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53P5chT2060838; Fri, 25 Apr 2025 05:38:43 GMT (envelope-from git) Date: Fri, 25 Apr 2025 05:38:43 GMT Message-Id: <202504250538.53P5chT2060838@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 93ca9e44b752 - main - asmc: Add support for macmini 6,1 and 6,2 (late 2012) models List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93ca9e44b752e6a9aeb0f761a022d14281d1a4e3 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=93ca9e44b752e6a9aeb0f761a022d14281d1a4e3 commit 93ca9e44b752e6a9aeb0f761a022d14281d1a4e3 Author: Hrant Dadivanyan AuthorDate: 2025-04-20 15:07:34 +0000 Commit: Adrian Chadd CommitDate: 2025-04-25 05:35:56 +0000 asmc: Add support for macmini 6,1 and 6,2 (late 2012) models This adds the ASMC support for the macmini 6,1 and 6,2. PR: kern/268141 Differential Revision: https://reviews.freebsd.org/D49929 --- sys/dev/asmc/asmc.c | 18 +++++++++++++++ sys/dev/asmc/asmcvar.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index f321a3cdc5f7..d99c1d56e67c 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -349,6 +349,24 @@ static const struct asmc_model asmc_models[] = { ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS }, + /* The Mac Mini 6,1 has no SMS */ + { + "Macmini6,1", "Apple SMC Mac Mini 6,1", + NULL, NULL, NULL, + ASMC_FAN_FUNCS2, + NULL, NULL, NULL, + ASMC_MM61_TEMPS, ASMC_MM61_TEMPNAMES, ASMC_MM61_TEMPDESCS + }, + + /* The Mac Mini 6,2 has no SMS */ + { + "Macmini6,2", "Apple SMC Mac Mini 6,2", + NULL, NULL, NULL, + ASMC_FAN_FUNCS2, + NULL, NULL, NULL, + ASMC_MM62_TEMPS, ASMC_MM62_TEMPNAMES, ASMC_MM62_TEMPDESCS + }, + /* The Mac Mini 7,1 has no SMS */ { "Macmini7,1", "Apple SMC Mac Mini 7,1", diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 73a8fc449c2c..d40dc1e7c8ff 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -564,6 +564,68 @@ struct asmc_softc { "Power Supply Temperature", \ "Wireless Module Proximity Temperature", } +#define ASMC_MM61_TEMPS { "TA0P", "TA1P", \ + "TC0D", "TC0G", "TC0P", "TCPG", \ + "TI0P", \ + "TM0S", "TMBS", "TM0P", \ + "TP0P", "TPCD", \ + "Tp0C", \ + "TW0P", NULL } + +#define ASMC_MM61_TEMPNAMES { "ambient_air_proximity", "ambient_cpu_pch_wireless_dimm", \ + "cpu_die", "TC0G", "cpu_proximity", "TCPG", \ + "thunderbolt_proximity", \ + "memory_slot1", "memory_slot2", "memory_proximity", \ + "pch_controller_proximity", "pch_controller_die", \ + "pwr_supply", \ + "wireless_proximity", NULL } + +#define ASMC_MM61_TEMPDESCS { "Ambient Air Proximity Temperature", \ + "Combo Ambient CPU PCH Wireless DIMM Temperature", \ + "CPU Die Temperature", \ + NULL, \ + "CPU Proximity Temperature", \ + NULL, \ + "Thunderbolt Proximity Temperature", \ + "Memory Slot 1 Temperature", \ + "Memory Slot 2 Temperature", \ + "Memory Slots Proximity Temperature", \ + "Platform Controller Hub Proximity Temperature", \ + "Platform Controller Hub Die Temperature", \ + "Power Supply Temperature", \ + "Wireless Module Proximity Temperature", NULL } + +#define ASMC_MM62_TEMPS { "TA0P", "TA1P", \ + "TC0D", "TC0G", "TC0P", "TCPG", \ + "TI0P", \ + "TM0S", "TMBS", "TM0P", \ + "TP0P", "TPCD", \ + "Tp0C", \ + "TW0P", NULL } + +#define ASMC_MM62_TEMPNAMES { "ambient_air_proximity", "ambient_cpu_pch_wireless_dimm", \ + "cpu_die", "TC0G", "cpu_proximity", "TCPG", \ + "thunderbolt_proximity", \ + "memory_slot1", "memory_slot2", "memory_proximity", \ + "pch_controller_proximity", "pch_controller_die", \ + "pwr_supply", \ + "wireless_proximity", NULL } + +#define ASMC_MM62_TEMPDESCS { "Ambient Air Proximity Temperature", \ + "Combo Ambient CPU PCH Wireless DIMM Temperature", \ + "CPU Die Temperature", \ + NULL, \ + "CPU Proximity Temperature", \ + NULL, \ + "Thunderbolt Proximity Temperature", \ + "Memory Slot 1 Temperature", \ + "Memory Slot 2 Temperature", \ + "Memory Slots Proximity Temperature", \ + "Platform Controller Hub Proximity Temperature", \ + "Platform Controller Hub Die Temperature", \ + "Power Supply Temperature", \ + "Wireless Module Proximity Temperature", NULL } + #define ASMC_MM71_TEMPS { "TA0p", "TA1p", \ "TA2p", "TC0c", \ "TC0p", "TC1c", \