rasdaemon: rename CPU_NAPLES cputype

Change CPU_NAPLES to CPU_AMD_SMCA to reflect that it isn't just NAPLES
that is supported, but AMD's Scalable Machine Check Architecture (SMCA).

  [ Yazen: change family check to feature check, and change CPU name. ]

CC: "mchehab+samsung@kernel.org" <mchehab+samsung@kernel.org>, "Namburu, Chandu-babu" <chandu@amd.com> # Thread-Topic: [PATCH 1/2] rasdaemon: rename CPU_NAPLES cputype
Signed-off-by: Brian Woods <brian.woods@amd.com>
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
Cc: Chandu-babu Namburu <chandu@amd.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/ras-mce-handler.c b/ras-mce-handler.c
index fd3ef3bc455b45ecb70b6b259a6dea82f72b4de0..016acae528de4091db79237cd848b436076b0dd1 100644 (file)
--- a/ras-mce-handler.c
+++ b/ras-mce-handler.c
@@ -55,7 +55,7 @@ static char *cputype_name[] = {
        [CPU_KNIGHTS_LANDING] = "Knights Landing",
        [CPU_KNIGHTS_MILL] = "Knights Mill",
        [CPU_SKYLAKE_XEON] = "Skylake server",
-       [CPU_NAPLES] = "AMD Family 17h Zen1",
+       [CPU_AMD_SMCA] = "AMD Scalable MCA",
        [CPU_DHYANA] = "Hygon Family 18h Moksha"
 };
 
@@ -192,8 +192,10 @@ static int detect_cpu(struct ras_events *ras)
        if (!strcmp(mce->vendor, "AuthenticAMD")) {
                if (mce->family == 15)
                        mce->cputype = CPU_K8;
-               if (mce->family == 23)
-                       mce->cputype = CPU_NAPLES;
+               if (strstr(mce->processor_flags, "smca")) {
+                       mce->cputype = CPU_AMD_SMCA;
+                       goto ret;
+               }
                if (mce->family > 23) {
                        log(ALL, LOG_INFO,
                            "Can't parse MCE for this AMD CPU yet %d\n",
@@ -441,7 +443,7 @@ int ras_mce_event_handler(struct trace_seq *s,
        case CPU_K8:
                rc = parse_amd_k8_event(ras, &e);
                break;
-       case CPU_NAPLES:
+       case CPU_AMD_SMCA:
        case CPU_DHYANA:
                rc = parse_amd_smca_event(ras, &e);
                break;

diff --git a/ras-mce-handler.h b/ras-mce-handler.h
index 4d615b430508f711275ee93932251d1ac5dd05e4..ec9a07660e17344c9cabee749d4e1d614f98af25 100644 (file)
--- a/ras-mce-handler.h
+++ b/ras-mce-handler.h
@@ -47,7 +47,7 @@ enum cputype {
        CPU_KNIGHTS_LANDING,
        CPU_KNIGHTS_MILL,
        CPU_SKYLAKE_XEON,
-       CPU_NAPLES,
+       CPU_AMD_SMCA,
        CPU_DHYANA,
 };