From nobody Wed May 04 15:33:55 2022 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 8E9CA1AB5BC6; Wed, 4 May 2022 15:33:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ktgpq65KCz3vnr; Wed, 4 May 2022 15:33:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651678436; 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=e8rYkUJMsZxfTNSc86zITQB/mpzdcEn0BgTjETAFFxk=; b=fvEny/dJohMKrsJMc9+yTFgZIKCpNuVMK827v8Tjw47KlrxL+G2O4hqBtj5Su6kKMl4CE+ vlIfbvux908rZxoFBLT0mgGyZj7XQRCtqZiYloICc/yOSEH57W5xKKgB4pIUTvjdRI0NvW YwzAMg9nzu6PdcuWumFYI/wNH0tk0ymj4y5Kltm5gg1NEonxpFnffxziacyEWHMkZx7Hbt RSlKL2EfygBr1trgp2T8A1VgW4UPgVQPfNF9qHhqUrGf6HZz5PY/51nZ4Fwf2vamXBx2hZ VduFUFsL2vQaqShWHCTDJ5WGJG+sALy6LCgOLPDC0mTjrlvHxo3ox54jL5WDZw== 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 84C5E15879; Wed, 4 May 2022 15:33:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 244FXtwJ046350; Wed, 4 May 2022 15:33:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 244FXtU9046349; Wed, 4 May 2022 15:33:55 GMT (envelope-from git) Date: Wed, 4 May 2022 15:33:55 GMT Message-Id: <202205041533.244FXtU9046349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 601abb300ce8 - main - asmc: Add support for Macmini 5,1 (2011) and 5,3 and 7,1 (2014) 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 601abb300ce8b28d84c300e70881039d943c28b9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651678436; 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=e8rYkUJMsZxfTNSc86zITQB/mpzdcEn0BgTjETAFFxk=; b=QXTHF55Hj1wp3AWy2yJPb9KKcax8sqwnDHRa0L1FdBQ21hssLCsIvBRn18n5W7XwK8+JJn r9cPq79Ix26hqC4kXyXCxWeZVXMOM5LqqHRi3CUvmpW0ulpy1byXOy53N9NeQJd2utABxu zZSwUoS/WUTUs9JFWgObpN5ysQMGfnslm0CddY0sMk4sLNibIW9weqJj8NwpDz/xu56uKh Duhz3mMTkis0Vw6FeBHi1J6OO+sRwo7UjRjzt4yxhh2yPn1j7+j3vML1Q7YMwJYvubmcFw L6tel8C8U5kGuQFdY0vI5b9tgtqdC5oSB3hNgn/IBBlHThPyw/ruSj1bYDcoXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651678436; a=rsa-sha256; cv=none; b=QMCvTA1rpmXNjdtU9gnM4bCZh/wtQnqP6//YgGjNh8FteJ7qhDp4HrBDXXBD2IjBDjYlBb S565WCnlflXff5QUPrMU0ayTD/2h5itC+OqwR5lTU5sFvlZWdK3ziL8SvCssawJV8Ggfna w9D1h+ggiwkEID9Mo2PiBydmQuv6t6C+yqVHnwPDl/ZAVntCQ+DzdlxaCL79nzkFNho6Xf 04/HceNQazccTEqjL9P2Q8dnSKYXGlNRFyLUXHXIT3kdQbxvLClZF8V0bJ0/rxqGusI1D7 GpNQnQr0OGdm+xq2zI3x/+94kcsdVy65fmHBJjCP43WsUKXGoV07/WJxHeIXcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=601abb300ce8b28d84c300e70881039d943c28b9 commit 601abb300ce8b28d84c300e70881039d943c28b9 Author: Trev AuthorDate: 2022-05-04 15:00:40 +0000 Commit: Mark Johnston CommitDate: 2022-05-04 15:31:01 +0000 asmc: Add support for Macmini 5,1 (2011) and 5,3 and 7,1 (2014) models PR: 262456 MFC after: 2 weeks --- sys/dev/asmc/asmc.c | 31 ++++++++++++++++++++++++++++++- sys/dev/asmc/asmcvar.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 9f18c7271042..8ca9d1486749 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -298,8 +298,18 @@ static const struct asmc_model asmc_models[] = { ASMC_MM41_TEMPS, ASMC_MM41_TEMPNAMES, ASMC_MM41_TEMPDESCS }, + /* The Mac Mini 5,1 has no SMS */ + /* - same sensors as Mac Mini 5,2 */ + { + "Macmini5,1", "Apple SMC Mac Mini 5,1", + NULL, NULL, NULL, + ASMC_FAN_FUNCS2, + NULL, NULL, NULL, + ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS + }, + /* The Mac Mini 5,2 has no SMS */ - { + { "Macmini5,2", "Apple SMC Mac Mini 5,2", NULL, NULL, NULL, ASMC_FAN_FUNCS2, @@ -307,6 +317,25 @@ static const struct asmc_model asmc_models[] = { ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS }, + /* The Mac Mini 5,3 has no SMS */ + /* - same sensors as Mac Mini 5,2 */ + { + "Macmini5,3", "Apple SMC Mac Mini 5,3", + NULL, NULL, NULL, + ASMC_FAN_FUNCS2, + NULL, NULL, NULL, + ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS + }, + + /* The Mac Mini 7,1 has no SMS */ + { + "Macmini7,1", "Apple SMC Mac Mini 7,1", + NULL, NULL, NULL, + ASMC_FAN_FUNCS2, + NULL, NULL, NULL, + ASMC_MM71_TEMPS, ASMC_MM71_TEMPNAMES, ASMC_MM71_TEMPDESCS + }, + /* Idem for the Mac Pro "Quad Core" (original) */ { "MacPro1,1", "Apple SMC Mac Pro (Quad Core)", diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 55f309208bf2..2b981f1bd6c6 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -475,6 +475,37 @@ struct asmc_softc { "Power Supply Temperature", \ "Wireless Module Proximity Temperature", } +#define ASMC_MM71_TEMPS { "TA0p", "TA1p", \ + "TA2p", "TC0c", \ + "TC0p", "TC1c", \ + "TCGc", "TCSc", \ + "TCXC", "TCXR", \ + "TM0p", "TPCd", \ + "TW0p", "Te0T", \ + "Tm0P", NULL } + +#define ASMC_MM71_TEMPNAMES { "ambient_air1", "ambient_air2", \ + "ambient_air3", "cpu_core1_peci", \ + "cpu_proximity", "cpu_core2_peci", \ + "intel_gpu", "cpu_sa_core_peci", \ + "cpu_core", "cpu_peci_dts", \ + "memory_proximity", "pch_controller_die", \ + "wireless_proximity", "thunderbolt_diode", \ + "logic_board", } + +#define ASMC_MM71_TEMPDESCS { "Ambient Air Temperature 1", \ + "Ambient Air Temperature 2", \ + "Ambient Air Temperature 3", \ + "CPU Core 1 PECI Temperature", "CPU Proximity Temperature", \ + "CPU Core 2 PECI Temperature", "Intel GPU Temperature", \ + "CPU System Agent Core PECI Temperature", \ + "CPU Core Temperature", "CPU PECI DTS Temperature", \ + "Memory Proximity Temperature", \ + "Platform Controller Hub Die Temperature", \ + "Wireless Module Proximity Temperature", \ + "Thunderbolt Diode Temperature", \ + "Logic Board temperature", } + #define ASMC_MP1_TEMPS { "TA0P", \ "TCAH", "TCBH", \ "TC0P", "TC0C", "TC1C", \