From nobody Wed May 18 21:27:27 2022 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 D5DCF1B3073B; Wed, 18 May 2022 21:27:28 +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 4L3R0H4jtBz4ZKt; Wed, 18 May 2022 21:27:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652909248; 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=Yrix66aDsnWB+VubH7F/hI68TSEe5WJ0VviTzQI+cJU=; b=Iss0zAbGaeE9ksPwgqWxQ2v3wRwf/eBhrl+uTRkWMPqulnwoHdvfqOIVxmcDUTG1JK44oq SeLvJ31F986VTfm99MaAnsW6h2gXJtA9pOh6nJPKlxCsXlVdt3verVovxEMlOO9H+o+tTa ne4q4W7jV110featP+0SX6k6t1FehA1SX2K0ZD8VXS0hfeuU+57pPr7jBTTne6Squv+gk1 h6iX1ApJvhzazir9kBIaMsfkUuqdXSeWWF/5DctVrVDePWK6IiQGevgD0ePLPf00uZWR5v fuBVXwzVDrgtjgFvKd9Ej8857pCiEFfE4JwegFRv+aixeQ7tQ5L6AfFAVqVmOw== 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 3E43111010; Wed, 18 May 2022 21:27:27 +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 24ILRRHA079477; Wed, 18 May 2022 21:27:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24ILRR7R079476; Wed, 18 May 2022 21:27:27 GMT (envelope-from git) Date: Wed, 18 May 2022 21:27:27 GMT Message-Id: <202205182127.24ILRR7R079476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d6fe8a8eab18 - stable/13 - asmc: Add support for Macmini 5,1 (2011) and 5,3 and 7,1 (2014) models 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: d6fe8a8eab1891a098a03ea92621c71485f2c2a9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652909248; 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=Yrix66aDsnWB+VubH7F/hI68TSEe5WJ0VviTzQI+cJU=; b=AaA/ntXcmoCtEHpPLVSCLuPJjF9VIzKp0mI8EU484SmwZmieJugpnuTWI6pFoIfIor7o9E JJ6JLkrz6EK7S4nQ/FP2HaXpWxpS3zDdEeBdhG4Hp57iAgTQ8X5gweQbJk/Qet5IpWKoDm +iU/VSzM1gbvaKvf67F2FoeJMaBAkxGCNdbOO+y8rBZsKRDSQLWHhlWxiaeprrmNjYj6Y6 duyQD+v+B1NqLoR4LO+Y7lfxPidaJZNWhVHqKDuDyAobt+J6lzi2TbWqz1NCW28RRFf86m qBjjuWGo/h/HE65WrdvgvRtqS15cBjvVG84t9UVA+1gv5DuDgsH2AHRqQcA1Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652909248; a=rsa-sha256; cv=none; b=ONz+QYYo3+ZfG9qcVEh1MVAGtWsIwKhqGc+MHGlq7THNWbb1rFaMEHpn6apIMiLfV1zaGb z///K9QLPzNHSuwHSHtB/6ya8vEyoLGUZAtD1ngmPWWiPzLWBshtMrkFbF4UL0G9Au/kPV E2yzECqwrSqh/PhFOrhmcF1zLnIFSr8hwMw13znl4hqRncWXdH6MAiufm8wD3k1spb9mCj f2kFyAiTckXqPmqgL4cVuRs4w6bFgAqqJMseCNcmpeJDLKD37VDRM3n1AioAzGM0cG8cWs D7SCbrsZQw9zwyqLaJhKwMsGTSjsZYqB30c7SO9HTG5nAQ7Tn4LzEhHi/5bZ9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d6fe8a8eab1891a098a03ea92621c71485f2c2a9 commit d6fe8a8eab1891a098a03ea92621c71485f2c2a9 Author: Trev AuthorDate: 2022-05-04 15:00:40 +0000 Commit: Mark Johnston CommitDate: 2022-05-18 21:15:58 +0000 asmc: Add support for Macmini 5,1 (2011) and 5,3 and 7,1 (2014) models PR: 262456 (cherry picked from commit 601abb300ce8b28d84c300e70881039d943c28b9) --- 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 c55abe2ab09d..ee6c4b01a141 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", \