From nobody Wed May 04 15:33:50 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 4567D1AB5A95; Wed, 4 May 2022 15:33:51 +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 4Ktgpl156Rz3vl5; Wed, 4 May 2022 15:33:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651678431; 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=CMoaU7HVpplZPJL75EEIYiib04MNQFXSe9X8/tyD2lQ=; b=xeELL02Crklh2buFd0xXyWIurQsqUTCHhHuGxnwPRnLkT/ouQv4pvTe5YlRI3SG4X9qBf6 97rRKRSycNXFsdn5BFgSsPf2Xx51gbFK99SUUQnNAtFDcMfuvaw+JZ9IYEol5FvfSa2MsF OuThDFUSEWwDC7MmskZm2oDuFydlH5qT7BN20UhHdiczUEifrC7H9hC1YfbbrHrYEoGNps 6VFQDwZVE94VDdAH0qHH5PJiJDo0p0WyEEs5j6X/YW8kJdidZXSOtDCCkDLqDirJfLJ+7Y cdsTPDmZ9YZ4KQFsfvYkRp/VnKDgY8jhrLavpi2i9momGp+HxGPZMXoAxt0w8Q== 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 016DF154E5; Wed, 4 May 2022 15:33:51 +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 244FXoaR046247; Wed, 4 May 2022 15:33:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 244FXoRL046246; Wed, 4 May 2022 15:33:50 GMT (envelope-from git) Date: Wed, 4 May 2022 15:33:50 GMT Message-Id: <202205041533.244FXoRL046246@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: 7d5fef1837ef - main - asmc: Add support for MacPro 6,1 (2013) 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: 7d5fef1837ef4741244e6009dfe42835deab369b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651678431; 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=CMoaU7HVpplZPJL75EEIYiib04MNQFXSe9X8/tyD2lQ=; b=eeBdavjBRwfSbGO1JXleOsG0+edFkvfDWmSs4y5m2Rw1QQEUn/Cu8TWZRTrJtsTz5J7ouq LjQ3bVVJXprjyNVAJ0A4GUxkVi7LLz52OhMBEntT9QrWJDAhY6Q7HG2Rx+hIa3hMgDcA0Y syCPE4TkjYvc4zTAZsCAXzh4oMmo1wPSx5yErf3wD3Xu9MhxCpHtPVj/laIeboNZJjud/e BR7+9jVEXp4L0HgNtfbWvy7Gg1vwVAsKw7YLJYodWdTomUlBbvqstRy60E1qBDqW3R7csx M0oerhnuoThRyzkQmAx6cS672uZfmzNTj6D2x1kPEJm7DqjtmRZEcW1p9+KEdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651678431; a=rsa-sha256; cv=none; b=Jrw1jwk44a7t0tNbWJwlfGO0W6xOoGW9Lh3VLn24JotLhPHrtiCp0QQo0vdLUJm7CY+IYE LFxRId0s+6m1/AnjIFm81W8cbchZPwK3pUqI27EaF75zEKNP/ZN0KAnCWh2DgU5/8HSKI7 UIVGR3ULkVKXGk4BXHGgDaQ31QBiUeAy1vO/bAsUwbh6jiRbYs7OZm5MHEJbx2FQbS2DcE vqNhc2iTTItABHBDLMSRg06y1MwBNXe6jPuipSedoUSxl1S8nj7phg2Qws/CF1wGfvjREE yDXpAT7MLDN8G4M9rt5y2RSJQqhAT0zV46HxLBbYonD/8v6gHqLIHE5SOFx+QQ== 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=7d5fef1837ef4741244e6009dfe42835deab369b commit 7d5fef1837ef4741244e6009dfe42835deab369b Author: Adam S AuthorDate: 2022-05-04 14:42:39 +0000 Commit: Mark Johnston CommitDate: 2022-05-04 15:31:01 +0000 asmc: Add support for MacPro 6,1 (2013) PR: 260781 MFC after: 2 weeks --- 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 b8884f7f6d64..9b94150a2593 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" }