From nobody Wed May 18 21:27:22 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 2CA1F1B302FA; Wed, 18 May 2022 21:27:23 +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 4L3R0B6s5qz4ZBp; Wed, 18 May 2022 21:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652909243; 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=6Ms6b356qKirfstX9/izPIUki++dft9l00ABS5R4H7o=; b=YCJBamCDTyg2baSWFh8S2GtZSib7AYZV7WeXgO+vxKTWoRuWH/qQTMEFH55mTPkF0QS3H8 Z65YQCLjjoyTz0eMo4Tfz/0+XkIhya8DF7dp48kCT9uPu3z2wlKyUKSH9AFaLr78rcVBkv UVyzyk3QspCXvgpQtHJabjcLRGpUCc+NGMH6x9QrgWmzunE7TRSqo3rBj3o2lGkXMY3pDM MJQcY+XujycV2pQElb14PRfRtkGaAqPR+e5wwZDC3xvGj0UaTIt7JT8Htu7TpzR8rIXq/5 6NServZgRb1Hev2AQSzWwz0KPi4UFJF534gBZ6B03/CzUpMVV+PhYYTW7RGAYg== 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 BDB9A1100F; Wed, 18 May 2022 21:27:22 +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 24ILRM6s079374; Wed, 18 May 2022 21:27:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24ILRMNM079373; Wed, 18 May 2022 21:27:22 GMT (envelope-from git) Date: Wed, 18 May 2022 21:27:22 GMT Message-Id: <202205182127.24ILRMNM079373@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: 1610a56a5636 - stable/13 - asmc: Add support for MacPro 6,1 (2013) 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: 1610a56a5636869ffa8c161094d8ec5f5afae38c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652909243; 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=6Ms6b356qKirfstX9/izPIUki++dft9l00ABS5R4H7o=; b=V7bLGzHYwet+Hf9Pl2sKpkho06hGixI/LJu3cHjkAnGY8Yaca09tfAYB6NgFyHW8LEz8rM /RN0/VHVE5e7Qp/NN4A6TYtjikouXYb97AmE4hA1ZkHTTd2toIb2HE2AuIYkS+G1BEklE9 1M4zMpseae8aI4RYQuIyCSUfurQdZ2pp6BygsFYPkeQ/8kMtfRlE84ZQ/UJRcGBKEDtls/ l0GtQR9ZJOXFTTEEr2E/6Mzs79tdnwoiiDVt0dsDCBhlwqBdtdEgJPiQAlzNPacDdNou70 QJnUZBImHqEzBweOr+A1he8BmV3YTqLDHWVY0SD19FzWybTlEHKHkMRBy4ufZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652909243; a=rsa-sha256; cv=none; b=w2DGesj+ZmLulvy2aZ3mAQ+Ji8Usyvy+y/Gg5X5POyTr/EYbquGY+dtKp6JsVQN97aS8OQ g4fnejn69CS5rsiJ6+sCKO2uQDiGqXSZUjOGeiKQ5vAr3/tGf1fJ7XvkGfgAYS3GYoqR0n EnJtxJQCkpz7oH48I2NtAE19UT8d/a8ObrElftURiUBQ/5lX0Gq9z1gC1Hq3TBQAwyECTw +HyUvcmzuI4vwEDiUzy+SoRoCRLBAe+TYcf4XxDleK8brQF5feSg5f+CQvKLN4GnNRU0nX LjJL4YkH8X/XwpoZjLZodRWaSOGp8LUq7ucD2rT+OT/mj/Fn9mBaBFiGWPYGhA== 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=1610a56a5636869ffa8c161094d8ec5f5afae38c commit 1610a56a5636869ffa8c161094d8ec5f5afae38c Author: Adam S AuthorDate: 2022-05-04 14:42:39 +0000 Commit: Mark Johnston CommitDate: 2022-05-18 21:15:47 +0000 asmc: Add support for MacPro 6,1 (2013) PR: 260781 (cherry picked from commit 7d5fef1837ef4741244e6009dfe42835deab369b) --- sys/dev/asmc/asmc.c | 9 +++++++++ sys/dev/asmc/asmcvar.h | 16 ++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 732bea5384c6..b10c16ffbed0 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -328,6 +328,15 @@ struct asmc_model asmc_models[] = { ASMC_MP5_TEMPS, ASMC_MP5_TEMPNAMES, ASMC_MP5_TEMPDESCS }, + /* Idem for the MacPro 2013 (cylinder) */ + { + "MacPro6,1", "Apple SMC MacPro (2013)", + ASMC_SMS_FUNCS_DISABLED, + ASMC_FAN_FUNCS, + ASMC_LIGHT_FUNCS_DISABLED, + ASMC_MP6_TEMPS, ASMC_MP6_TEMPNAMES, ASMC_MP6_TEMPDESCS + }, + { "MacBookAir1,1", "Apple SMC MacBook Air", ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, NULL, diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 0c5714f97806..70a2b24889c7 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -581,6 +581,22 @@ struct asmc_softc { "Te3F", "Te3S", "Te4F", "Te4S", "Te5F", \ "Te5S", "TeGG", "TeGP", "TeRG", "TeRP", \ "TeRV", "Tp0C", "Tp1C", "TpPS", "TpTG", } + +#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_MBA_TEMPS { "TB0T", NULL } #define ASMC_MBA_TEMPNAMES { "enclosure" } #define ASMC_MBA_TEMPDESCS { "Enclosure Bottom" }