rasdaemon: add Knights Mill model

Knights Mill is similar to Knights Landing and can use the same code.

Signed-off-by: Aristeu Rozanski <aris@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/mce-intel.c b/mce-intel.c
index bf68d9b26bdcb3afeb72f3b05bbf7013efde223e..f70c676ec70fa2991951026c3f59fbdb56f7d301 100644 (file)
--- a/mce-intel.c
+++ b/mce-intel.c
@@ -399,6 +399,7 @@ int parse_intel_event(struct ras_events *ras, struct mce_event *e)
                hsw_decode_model(ras, e);
                break;
        case CPU_KNIGHTS_LANDING:
+       case CPU_KNIGHTS_MILL:
                knl_decode_model(ras, e);
                break;
        case CPU_BROADWELL_DE:
@@ -471,6 +472,7 @@ int set_intel_imc_log(enum cputype cputype, unsigned ncpus)
        case CPU_IVY_BRIDGE_EPEX:
        case CPU_HASWELL_EPEX:
        case CPU_KNIGHTS_LANDING:
+       case CPU_KNIGHTS_MILL:
                msr = 0x17f;    /* MSR_ERROR_CONTROL */
                bit = 0x2;      /* MemError Log Enable */
                break;

diff --git a/ras-mce-handler.c b/ras-mce-handler.c
index b87551225526eac28555dc6a18914d99f77699e4..2e520d3663ac078a41fad2488232b6a88b65cf1a 100644 (file)
--- a/ras-mce-handler.c
+++ b/ras-mce-handler.c
@@ -53,6 +53,7 @@ static char *cputype_name[] = {
        [CPU_BROADWELL_DE] = "Broadwell DE",
        [CPU_BROADWELL_EPEX] = "Broadwell EP/EX",
        [CPU_KNIGHTS_LANDING] = "Knights Landing",
+       [CPU_KNIGHTS_MILL] = "Knights Mill",
 };
 
 static enum cputype select_intel_cputype(struct ras_events *ras)
@@ -100,6 +101,8 @@ static enum cputype select_intel_cputype(struct ras_events *ras)
                        return CPU_BROADWELL;
                else if (mce->model == 0x57)
                        return CPU_KNIGHTS_LANDING;
+               else if (mce->model == 0x85)
+                       return CPU_KNIGHTS_MILL;
 
                if (mce->model > 0x1a) {
                        log(ALL, LOG_INFO,
@@ -229,6 +232,7 @@ int register_mce_handler(struct ras_events *ras, unsigned ncpus)
        case CPU_IVY_BRIDGE_EPEX:
        case CPU_HASWELL_EPEX:
        case CPU_KNIGHTS_LANDING:
+       case CPU_KNIGHTS_MILL:
                set_intel_imc_log(mce->cputype, ncpus);
        default:
                break;

diff --git a/ras-mce-handler.h b/ras-mce-handler.h
index c5a3717bf849267a9e4a8aa4ca85ba42daa875d9..77effc9f8efa231a27e0ff3e3f8d48d677667e19 100644 (file)
--- a/ras-mce-handler.h
+++ b/ras-mce-handler.h
@@ -48,6 +48,7 @@ enum cputype {
        CPU_BROADWELL_DE,
        CPU_BROADWELL_EPEX,
        CPU_KNIGHTS_LANDING,
+       CPU_KNIGHTS_MILL,
 };
 
 struct mce_event {