From 2f9f335ff3a7c70d87b435e43df775e3a73606a7 Mon Sep 17 00:00:00 2001
From: "Delgado Vargas, Daniel" <daniel.delgado.vargas@intel.com>
Date: Fri, 20 Oct 2023 10:57:11 -0600
Subject: [PATCH 25/85] rasdaemon: Add Emerald Rapids support

Signed-off-by: Delgado Vargas, Daniel <daniel.delgado.vargas@intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
 mce-intel-i10nm.c | 1 +
 mce-intel.c       | 1 +
 ras-mce-handler.c | 3 +++
 ras-mce-handler.h | 1 +
 4 files changed, 6 insertions(+)

diff --git a/mce-intel-i10nm.c b/mce-intel-i10nm.c
index 3c5d22f..c4ace56 100644
--- a/mce-intel-i10nm.c
+++ b/mce-intel-i10nm.c
@@ -380,6 +380,7 @@ void i10nm_decode_model(enum cputype cputype, struct ras_events *ras,
 		banktype = tremont[e->bank];
 		break;
 	case CPU_SAPPHIRERAPIDS:
+	case CPU_EMERALDRAPIDS:
 		banktype = sapphire[e->bank];
 		break;
 	default:
diff --git a/mce-intel.c b/mce-intel.c
index e083e9c..18a9072 100644
--- a/mce-intel.c
+++ b/mce-intel.c
@@ -415,6 +415,7 @@ int parse_intel_event(struct ras_events *ras, struct mce_event *e)
 	case CPU_ICELAKE_DE:
 	case CPU_TREMONT_D:
 	case CPU_SAPPHIRERAPIDS:
+	case CPU_EMERALDRAPIDS:
 		i10nm_decode_model(mce->cputype, ras, e);
 	default:
 		break;
diff --git a/ras-mce-handler.c b/ras-mce-handler.c
index d09829d..370e68a 100644
--- a/ras-mce-handler.c
+++ b/ras-mce-handler.c
@@ -61,6 +61,7 @@ static char *cputype_name[] = {
 	[CPU_ICELAKE_DE] = "Icelake server D Family",
 	[CPU_TREMONT_D] = "Tremont microserver",
 	[CPU_SAPPHIRERAPIDS] = "Sapphirerapids server",
+	[CPU_EMERALDRAPIDS] = "Emeraldrapids server",
 };
 
 static enum cputype select_intel_cputype(struct mce_priv *mce)
@@ -118,6 +119,8 @@ static enum cputype select_intel_cputype(struct mce_priv *mce)
                         return CPU_TREMONT_D;
 		else if (mce->model == 0x8f)
                         return CPU_SAPPHIRERAPIDS;
+		else if (mce->model == 0xcf)
+			return CPU_EMERALDRAPIDS;
 
 		if (mce->model > 0x1a) {
 			log(ALL, LOG_INFO,
diff --git a/ras-mce-handler.h b/ras-mce-handler.h
index b4babf3..68147f4 100644
--- a/ras-mce-handler.h
+++ b/ras-mce-handler.h
@@ -53,6 +53,7 @@ enum cputype {
 	CPU_ICELAKE_DE,
 	CPU_TREMONT_D,
 	CPU_SAPPHIRERAPIDS,
+	CPU_EMERALDRAPIDS,
 };
 
 struct mce_event {
-- 
2.33.1