The branch stable/13 has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=1610a56a5636869ffa8c161094d8ec5f5afae38c
commit 1610a56a5636869ffa8c161094d8ec5f5afae38c
Author: Adam S <a...@anschwa.com>
AuthorDate: 2022-05-04 14:42:39 +0000
Commit: Mark Johnston <ma...@freebsd.org>
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" }
