d9e469
---
d9e469
 mce-intel.c       |    3 +++
d9e469
 ras-mce-handler.c |    5 +++++
d9e469
 ras-mce-handler.h |    1 +
d9e469
 3 files changed, 9 insertions(+)
d9e469
d9e469
--- rasdaemon-0.4.1.orig/mce-intel.c	2017-05-30 12:04:54.440167730 -0400
d9e469
+++ rasdaemon-0.4.1/mce-intel.c	2017-05-30 12:06:51.705755469 -0400
d9e469
@@ -399,6 +399,7 @@ if (test_prefix(11, (e->status & 0xffffL
d9e469
 		hsw_decode_model(ras, e);
d9e469
 		break;
d9e469
 	case CPU_KNIGHTS_LANDING:
d9e469
+	case CPU_KNIGHTS_MILL:
d9e469
 		knl_decode_model(ras, e);
d9e469
 		break;
d9e469
 	case CPU_BROADWELL_DE:
d9e469
@@ -470,6 +471,8 @@ int set_intel_imc_log(enum cputype cputy
d9e469
 	case CPU_SANDY_BRIDGE_EP:
d9e469
 	case CPU_IVY_BRIDGE_EPEX:
d9e469
 	case CPU_HASWELL_EPEX:
d9e469
+	case CPU_KNIGHTS_LANDING:
d9e469
+	case CPU_KNIGHTS_MILL:
d9e469
 		msr = 0x17f;	/* MSR_ERROR_CONTROL */
d9e469
 		bit = 0x2;	/* MemError Log Enable */
d9e469
 		break;
d9e469
--- rasdaemon-0.4.1.orig/ras-mce-handler.c	2017-05-30 12:04:54.440167730 -0400
d9e469
+++ rasdaemon-0.4.1/ras-mce-handler.c	2017-05-30 12:07:59.850934779 -0400
d9e469
@@ -53,6 +53,7 @@ [CPU_XEON75XX] = "Intel Xeon 7500 series
d9e469
 	[CPU_BROADWELL_DE] = "Broadwell DE",
d9e469
 	[CPU_BROADWELL_EPEX] = "Broadwell EP/EX",
d9e469
 	[CPU_KNIGHTS_LANDING] = "Knights Landing",
d9e469
+	[CPU_KNIGHTS_MILL] = "Knights Mill",
d9e469
 };
d9e469
 
d9e469
 static enum cputype select_intel_cputype(struct ras_events *ras)
d9e469
@@ -100,6 +101,8 @@ else if (mce->model == 0x3d)
d9e469
 			return CPU_BROADWELL;
d9e469
 		else if (mce->model == 0x57)
d9e469
 			return CPU_KNIGHTS_LANDING;
d9e469
+		else if (mce->model == 0x85)
d9e469
+			return CPU_KNIGHTS_MILL;
d9e469
 
d9e469
 		if (mce->model > 0x1a) {
d9e469
 			log(ALL, LOG_INFO,
d9e469
@@ -228,6 +231,8 @@ int register_mce_handler(struct ras_even
d9e469
 	case CPU_SANDY_BRIDGE_EP:
d9e469
 	case CPU_IVY_BRIDGE_EPEX:
d9e469
 	case CPU_HASWELL_EPEX:
d9e469
+	case CPU_KNIGHTS_LANDING:
d9e469
+	case CPU_KNIGHTS_MILL:
d9e469
 		set_intel_imc_log(mce->cputype, ncpus);
d9e469
 	default:
d9e469
 		break;
d9e469
--- rasdaemon-0.4.1.orig/ras-mce-handler.h	2017-05-30 12:04:54.440167730 -0400
d9e469
+++ rasdaemon-0.4.1/ras-mce-handler.h	2017-05-30 12:04:58.976113103 -0400
d9e469
@@ -48,6 +48,7 @@ enum cputype {
d9e469
 	CPU_BROADWELL_DE,
d9e469
 	CPU_BROADWELL_EPEX,
d9e469
 	CPU_KNIGHTS_LANDING,
d9e469
+	CPU_KNIGHTS_MILL,
d9e469
 };
d9e469
 
d9e469
 struct mce_event {