Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

* freebsd/12-stable/master: MFC r342822: MFC r342770:
HardenedBSD · Jan 18, 2019 · 999c74f · 999c74f
2 parents ff054c8 + 9d5388f
commit 999c74f
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 0 deletions.
diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c
@@ -151,6 +151,8 @@ static struct asmc_model *asmc_match(device_t dev);
 			 asmc_mbp_sysctl_light_right, \
 			 asmc_mbp_sysctl_light_control
 
+#define ASMC_LIGHT_FUNCS_DISABLED NULL, NULL, NULL
+
 struct asmc_model asmc_models[] = {
 	{
 	  "MacBook1,1", "Apple SMC MacBook Core Duo",
@@ -230,6 +232,12 @@ struct asmc_model asmc_models[] = {
 	  ASMC_MBP82_TEMPS, ASMC_MBP82_TEMPNAMES, ASMC_MBP82_TEMPDESCS
 	},
 
+	{
+	 "MacBookPro9,2", "Apple SMC MacBook Pro (mid 2012)",
+	  ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS,
+	  ASMC_MBP9_TEMPS, ASMC_MBP9_TEMPNAMES, ASMC_MBP9_TEMPDESCS
+	},
+
 	{
 	  "MacBookPro11,2", "Apple SMC MacBook Pro Retina Core i7 (2013/2014)",
 	  ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS,
@@ -260,6 +268,15 @@ struct asmc_model asmc_models[] = {
 	  ASMC_MM31_TEMPS, ASMC_MM31_TEMPNAMES, ASMC_MM31_TEMPDESCS
 	},
 
+	/* The Mac Mini 4,1 (Mid-2010) has no SMS */
+	{ 
+	  "Macmini4,1", "Apple SMC Mac mini 4,1 (Mid-2010)",
+	  ASMC_SMS_FUNCS_DISABLED,
+	  ASMC_FAN_FUNCS,
+	  ASMC_LIGHT_FUNCS_DISABLED,
+	  ASMC_MM41_TEMPS, ASMC_MM41_TEMPNAMES, ASMC_MM41_TEMPDESCS
+	},
+
 	/* The Mac Mini 5,2 has no SMS */
 	{ 
 	  "Macmini5,2", "Apple SMC Mac Mini 5,2",

diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h
@@ -257,6 +257,27 @@ struct asmc_softc {
 				  "TMBS", "TP0P", "TPCD", "TW0P", "Th1H", \
 				  "Th2H", "Tm0P", "Ts0P", "Ts0S" }
 
+#define ASMC_MBP9_TEMPS		{ "Ts0P", "Ts0S", "TA0P", "TB1T", "TB2T", \
+				  "TB0T", "TC1C", "TC2C", "TC0E", "TC0F", \
+				  "TC0J", "TC0P", "TCFC", "TCGC", "TCSA", \
+				  "TCTD", "TCXC", "TG1D", "TM0P", "TM0S", \
+				  "TPCD", NULL }
+
+#define ASMC_MBP9_TEMPNAMES	{ "Ts0P", "Ts0S", "TA0P", "TB1T", "TB2T", \
+				  "TB0T", "TC1C", "TC2C", "TC0E", "TC0F", \
+				  "TC0J", "TC0P", "TCFC", "TCGC", "TCSA", \
+				  "TCTD", "TCXC", "TG1D", "TM0P", "TM0S", \
+				  "TPCD" }
+
+#define ASMC_MBP9_TEMPDESCS	{ "Palm Rest", "Memory Proximity", "Airflow 1", \
+				  "Battery 1", "Battery 2", "Battery TS_MAX", \
+				  "CPU Core 1", "CPU Core 2", "CPU1", "CPU1", \
+				  "TC0J", "CPU 1 Proximity", "TCFC", \
+				  "PECI GPU", "PECI SA", "TCTD", "PECI CPU", \
+				  "GPU Die", "Memory Bank A1", "Memory Module A1", \
+				  "PCH Die" }
+
+
 #define ASMC_MBP112_TEMPS	{ "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \
 				  "TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \
 				  "TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \
@@ -339,6 +360,27 @@ struct asmc_softc {
 				  "Northbridge Proximity Temperature", \
 				  "Wireless Module Proximity Temperature", }
 
+#define ASMC_MM41_TEMPS		{ "TA0P", "TC0D", "TC0G", "TC0H", "TC0P", \
+				  "TC0p", "TCPG", "TH0G", "TH0P", "TH0p", \
+				  "TM0G", "TM0P", "TM0p", "TN0D", "TN0G", \
+				  "TN0P", "TN0p", "TN1D", "TN1E", "TN1F", \
+				  "TN1G", "TN1S", "TNPG", "TO0P", "TO0p", \
+				  "TW0P", "Tm0P", "Tp0C", NULL }
+
+#define ASMC_MM41_TEMPNAMES	{ "TA0P", "TC0D", "TC0G", "TC0H", "TC0P", \
+				  "TC0p", "TCPG", "TH0G", "TH0P", "TH0p", \
+				  "TM0G", "TM0P", "TM0p", "TN0D", "TN0G", \
+				  "TN0P", "TN0p", "TN1D", "TN1E", "TN1F", \
+				  "TN1G", "TN1S", "TNPG", "TO0P", "TO0p", \
+				  "TW0P", "Tm0P", "Tp0C", NULL }
+
+#define ASMC_MM41_TEMPDESCS	{ "TA0P", "TC0D", "TC0G", "TC0H", "TC0P", \
+				  "TC0p", "TCPG", "TH0G", "TH0P", "TH0p", \
+				  "TM0G", "TM0P", "TM0p", "TN0D", "TN0G", \
+				  "TN0P", "TN0p", "TN1D", "TN1E", "TN1F", \
+				  "TN1G", "TN1S", "TNPG", "TO0P", "TO0p", \
+				  "TW0P", "Tm0P", "Tp0C", NULL }
+
 #define ASMC_MM52_TEMPS		{ "TA0P", "TA1P", \
 				  "TC0D", "TC0P", \
 				  "TG0D", "TG1D", \