From nobody Sun Feb 22 04:32:40 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 4fJWLJ6qfVz6SwFZ for ; Sun, 22 Feb 2026 04:32:40 +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 4fJWLJ5Zn4z3fMm for ; Sun, 22 Feb 2026 04:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771734760; 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=xjuwR4Pr+AW7sd6WRcj7hzhcyGkLECCsX3B53NdlO0Y=; b=r+gO7iR1/HypTRxMkj/ZpxMmfJhkQ6ygCpfgS0A4Plo6LMhWH9kztledt9QXusv3/HzNtH uFNTTZwGGFmFTkg3VEU+qCJMOdSjw0s80IBb/PlTE3IWgeMdHBgkoGDPbAg728+3Q2nxNq g+Tg0NPwOV5T/VMrdAIyi3kroierBjtMM9GqyzOivoi6iAc325ZKmIAk8VvaB1CyR7uYGn 9PTq/YVgAtkWSA+VCaREJOM6WnVkxLn465TjxZq85wY51/ChxTpS9T/J7OlGQsFd4DlFuz LKxIPmaBS+9FUebvZ2QikHlVZY3BnWjx2DiPjLzcx70mHR/x1Rz2gGKgcC8L2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771734760; a=rsa-sha256; cv=none; b=Iluj1WraRvezcg4magAv1xXj/IHE0oMyr1UVquDn2xXdGN8n2ZzxvnJk5FCIA0hJsNL7iV 9UWSos3hv34mLBBx1Lb1EpmbwZkpyvuZd92l/Jp5kXQSMWJwuTg6DbY6LTLI8gsireUWt/ Am9ntcfNEGp9LKgbj0HvrYR2lWIRFf1q8eo69duDMeU1u3ok2AzkigcCuw+0uOH2wxt+Vj tXx72yBR+If11erMkwGzsIkzQi3Lc+czoDf2cDBE1+Gc6I/+XVRKxLfMLbLfpWXRq1lNAn 3U2OJcPfWxxoHIRqPuXrxcG0e1HAOmJfVj/nW+VGM4Q8PP35fK5RJmql0wZ1ZQ== 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=1771734760; 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=xjuwR4Pr+AW7sd6WRcj7hzhcyGkLECCsX3B53NdlO0Y=; b=gdQ7a4B5RXFOXKWR597yuiIQk/PKFXzDnYkeTWZrySk5j16K43VJITTI69MZcgfYWJLc08 BLQQv5Y/l0l2m/yafGAM9oEgrU/DSeIyOmeGgWmE1QjFcXXCCDutp+e1exNyRLaHTkq3B7 9Q3LArZFfteBzek1jD4ZjDbPIU5ZRGGpNbMpF4JMMR/OPivh7G8zw7qEAS8KkRshll2SwN JdHPLZz79QF3qJGBG6vbtdX58Kg5eH0rVfxs3z/nKlaS15Mg6Th9GUWgxwMLvvqAxYOoex kStnNO5/2oLWRDt1ZQLZzAhsgACmkFUouHLXXBDJk74JPj9RmY8WNBCtGuk/NQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJWLJ5BDRzDVg for ; Sun, 22 Feb 2026 04:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27549 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 04:32:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Hrant Dadivanyan From: Enji Cooper Subject: git: dbeb51347afa - stable/14 - asmc: Add support for macmini 6,1 and 6,2 (late 2012) models 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 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: dbeb51347afaf910d1962d263da7a0e54d6343f3 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 04:32:40 +0000 Message-Id: <699a86e8.27549.276b46e3@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=dbeb51347afaf910d1962d263da7a0e54d6343f3 commit dbeb51347afaf910d1962d263da7a0e54d6343f3 Author: Hrant Dadivanyan AuthorDate: 2025-04-20 15:07:34 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 04:31:33 +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 (cherry picked from commit 93ca9e44b752e6a9aeb0f761a022d14281d1a4e3) --- 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 2a973be2e95c..d845ea7d669c 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -359,6 +359,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 c5ef84519742..102bee8a15b7 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -600,6 +600,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", \