From c1ad4beb324fff7a48cd02f3a9fc1f1523d36ccb Mon Sep 17 00:00:00 2001
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 5 Mar 2017 07:46:48 +0000
Subject: [PATCH] mca: fix up couple of issues introduced with amd thresholding
 in r314636

1. There a was a typo in one place where the processor family is
   checked (16 vs 0x16).  Now the checks are consolidated in a single
   function.
2. Instead of an array of struct amd_et_state objects the code allocated
   an array of pointers.  That was no problem on amd64 where the sizes
   are the same, but could be a problem on i386.

Reported by:	tuexen and others
Tested by:	tuexen (earlier version of the fix)
Pointyhat to:	avg
MFC after:	5 days
X-MFC with:	r314636
---
 sys/x86/x86/mca.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c
index 507d2040bc75..bc63ae9423f4 100644
--- a/sys/x86/x86/mca.c
+++ b/sys/x86/x86/mca.c
@@ -128,6 +128,13 @@ static struct amd_et_state *amd_et_state;	/* Indexed by cpuid. */
 static int cmc_throttle = 60;	/* Time in seconds to throttle CMCI. */
 
 static int amd_elvt = -1;
+
+static inline bool
+amd_thresholding_supported(void)
+{
+	return (cpu_vendor_id == CPU_VENDOR_AMD &&
+	    CPUID_TO_FAMILY(cpu_id) >= 0x10 && CPUID_TO_FAMILY(cpu_id) <= 0x16);
+}
 #endif
 
 static int
@@ -809,7 +816,7 @@ static void
 amd_thresholding_setup(void)
 {
 
-	amd_et_state = malloc((mp_maxid + 1) * sizeof(struct amd_et_state *),
+	amd_et_state = malloc((mp_maxid + 1) * sizeof(struct amd_et_state),
 	    M_MCA, M_WAITOK | M_ZERO);
 	SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_mca), OID_AUTO,
 	    "cmc_throttle", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE,
@@ -854,8 +861,7 @@ mca_setup(uint64_t mcg_cap)
 #ifdef DEV_APIC
 	if (mcg_cap & MCG_CAP_CMCI_P)
 		cmci_setup();
-	else if (cpu_vendor_id == CPU_VENDOR_AMD &&
-	    CPUID_TO_FAMILY(cpu_id) >= 0x10 && CPUID_TO_FAMILY(cpu_id) <= 16)
+	else if (amd_thresholding_supported())
 		amd_thresholding_setup();
 #endif
 }
@@ -1095,9 +1101,7 @@ _mca_init(int boot)
 		 * At the moment only the DRAM Error Threshold Group is
 		 * supported.
 		 */
-		if (cpu_vendor_id == CPU_VENDOR_AMD &&
-		    CPUID_TO_FAMILY(cpu_id) >= 0x10 &&
-		    CPUID_TO_FAMILY(cpu_id) <= 0x16 &&
+		if (amd_thresholding_supported() &&
 		    (mcg_cap & MCG_CAP_COUNT) >= 4) {
 			if (boot)
 				amd_thresholding_init();