From nobody Wed May 18 21:27:28 2022 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 16E201B30565; Wed, 18 May 2022 21:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L3R0J4Vtfz4ZJ6; Wed, 18 May 2022 21:27:28 +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=5bD6AghQseI8vX0wCowHrDJkIMgo7yFWzf2xpQoq0x0=; b=YCb7nnEy4DJgLWccVkQKTI3NYDWZ3w8WQouUn/BEx8Ny/LIjS1SEdQ7t8X7mqi5uDoYtDM z6RMBtO0NZk7UTlgzDwMr44+bBSFpuZ0yiGmgM+7EhHmt1WH2jIaxgc1M2qHPcbGR4v4Tx s+4HKW3QfBjf2UyORJFlDf8r7pAHo+ZZIKzSkSPC55vWvYtTpU0Z+/eQDoRz3EPwPQIC9q enG1RdYN6vzucSG5mBlJdN1+tCWjhLYoEfny51mLIc+N21VE0Btrr92bGY4/zE6ErKWMsV ZQq21+DqQ1ySqU//2DVPkq3xPJUYIY87SPHfEme8nTJ9VNgjXd0FYzvFKFYFjg== 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 6B0B010CE6; Wed, 18 May 2022 21:27:28 +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 24ILRS3F079501; Wed, 18 May 2022 21:27:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24ILRSjs079500; Wed, 18 May 2022 21:27:28 GMT (envelope-from git) Date: Wed, 18 May 2022 21:27:28 GMT Message-Id: <202205182127.24ILRSjs079500@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: d7417aa55e73 - stable/13 - asmc: Update Mac Pro 6 sensor definitions 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: d7417aa55e73a4c3019901095371e34cc00b99f7 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=5bD6AghQseI8vX0wCowHrDJkIMgo7yFWzf2xpQoq0x0=; b=Q1F9w87+QrooYP+R9e33XVVyLm57hX+MGu6eXvnERDw/z1iAbbY4HwoDV1YhkVaHgvECKt n+x8HKgNG+1mxbb4NRmT8Ii108hca/CeXgwIOmcOAbidP+jEQtUJo5i18822pqMJstctYm rDwINyQq2mRCbkuISI4sqKZEqicuDdstiYSjzwyENSww0xqehOD7yBf7WrrzeKvEPD1fXg S9BiZi8Kp7LsWLq7ij4SOSbxivZBDqTeyyMIaNWIdeHpRv7naVAhmmd+3zxxDtZIpOrAKX W131GJxMffzhWteYrgGGGX6cAAT20Hyl1+6lRR8EE3nyX4uuXu367TzLOf6kkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652909248; a=rsa-sha256; cv=none; b=tHlxe/RIAxj+sUrvzDMFNpSwRsxc0NRxlgX+IkUEL+2zeYE2a+n8VycRtCGG42G/3wi4Nv qQ6PCqOibc2J2F9W2wXkFZHf8odCKSOcut878NnH1xEkpZMJTVHjKPtazkLdNzIVFyMgr4 uKJ4B0a8joBoOEEtJ42h96cD/0Pqnv2BkKrEW6GlzuEwg2Kfp+kbUnxNmgLf7m7C1bE3Ky pykJ48LFAiLWdLD3nDfoK18BDWCnRo97jIKnPKpYnaaWbONGmbjPR/S4EKvHP41OFOlq2E T3S+Su0LRuF5SO1Evct/S6afNIIYA5KoPJXlnSmhCAVCVz6+HfC2KFSFlVH1Vw== 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=d7417aa55e73a4c3019901095371e34cc00b99f7 commit d7417aa55e73a4c3019901095371e34cc00b99f7 Author: Adam S AuthorDate: 2022-05-09 12:44:09 +0000 Commit: Mark Johnston CommitDate: 2022-05-18 21:16:01 +0000 asmc: Update Mac Pro 6 sensor definitions - Make descriptions a bit more human-friendly. - Don't attempt to probe fan safe speeds, this model does not provide one. PR: 260781 (cherry picked from commit dc484aed0a014de0fdf33d972c36413da6903a2e) --- sys/dev/asmc/asmc.c | 6 +++--- sys/dev/asmc/asmcvar.h | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index ee6c4b01a141..2e824602b98c 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -363,11 +363,11 @@ static const struct asmc_model asmc_models[] = { ASMC_MP5_TEMPS, ASMC_MP5_TEMPNAMES, ASMC_MP5_TEMPDESCS }, - /* Idem for the MacPro 2013 (cylinder) */ + /* Idem for the Mac Pro 2013 (cylinder) */ { - "MacPro6,1", "Apple SMC MacPro (2013)", + "MacPro6,1", "Apple SMC Mac Pro (2013)", ASMC_SMS_FUNCS_DISABLED, - ASMC_FAN_FUNCS, + ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS_DISABLED, ASMC_MP6_TEMPS, ASMC_MP6_TEMPNAMES, ASMC_MP6_TEMPDESCS }, diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 2b981f1bd6c6..533686d0c56b 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -646,17 +646,17 @@ struct asmc_softc { #define ASMC_MP6_TEMPS { "TA0P", "TA1P", "TC0P", "TG0D", "TG0P", \ "TG1D", "TG1P", "TM0P", "TM1P", NULL } -#define ASMC_MP6_TEMPNAMES { "AMBIENT_AIR_0", "AMBIENT_AIR_1", \ - "CPU_0_PROXIMITY", "GPU_0_DIODE", \ - "GPU_0_PROXIMITY", "GPU_1_DIODE", \ - "GPU_1_PROXIMITY", "MEM_SLOTS_0_PROXIMITY", \ - "MEM_SLOTS_1_PROXIMITY" } - -#define ASMC_MP6_TEMPDESCS { "Ambient Air 0", "Ambient Air 1", \ - "CPU Proximity 0", "GPU Diode 0", \ - "GPU Proximity 0", "GPU Diode 1", \ - "GPU Proximity 1", "Memory Proximity 0", \ - "Memory Proximity 1" } +#define ASMC_MP6_TEMPNAMES { "ambient_air_1", "ambient_air_2", \ + "cpu_proximity", "gpu_diode_1", \ + "gpu_proximity_1", "gpu_diode_2", \ + "gpu_proximity_2", "mem_proximity_1", \ + "mem_proximity_2" } + +#define ASMC_MP6_TEMPDESCS { "Ambient Air 1", "Ambient Air 2", \ + "CPU Proximity", "GPU Diode 1", \ + "GPU Proximity 1", "GPU Diode 2", \ + "GPU Proximity 2", "Memory Bank A", \ + "Memory Bank B" } #define ASMC_MBA_TEMPS { "TB0T", NULL } #define ASMC_MBA_TEMPNAMES { "enclosure" }