Skip to content

Commit e04a458

Browse files
yghannamjfvogel
authored andcommitted
x86/MCE/AMD, EDAC/mce_amd: Add new error descriptions for some SMCA bank types
Some SMCA bank types on future systems will report new error types even though the bank type is not treated as a new version. These new error types will reported by bits that are reserved in past systems. Add the new error descriptions to the lists in edac_mce_amd. Signed-off-by: Yazen Ghannam <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Kees Cook <[email protected]> Cc: linux-edac <[email protected]> Cc: Mauro Carvalho Chehab <[email protected]> Cc: Shirish S <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Tony Luck <[email protected]> Cc: x86-ml <[email protected]> Link: https://lkml.kernel.org/r/[email protected] (cherry picked from commit 8a5dd2c) Orabug: 29547647 Signed-off-by: Somasundaram Krishnasamy <[email protected]> Reviewed-by: John Donnelly <[email protected]>
1 parent cd6a81d commit e04a458

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

arch/x86/kernel/cpu/mce/amd.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,22 +143,22 @@ static struct smca_hwid smca_hwid_mcatypes[] = {
143143
{ SMCA_RESERVED, HWID_MCATYPE(0x00, 0x0), 0x0 },
144144

145145
/* ZN Core (HWID=0xB0) MCA types */
146-
{ SMCA_LS, HWID_MCATYPE(0xB0, 0x0), 0x1FFFEF },
146+
{ SMCA_LS, HWID_MCATYPE(0xB0, 0x0), 0x1FFFFF },
147147
{ SMCA_IF, HWID_MCATYPE(0xB0, 0x1), 0x3FFF },
148148
{ SMCA_L2_CACHE, HWID_MCATYPE(0xB0, 0x2), 0xF },
149149
{ SMCA_DE, HWID_MCATYPE(0xB0, 0x3), 0x1FF },
150150
/* HWID 0xB0 MCATYPE 0x4 is Reserved */
151-
{ SMCA_EX, HWID_MCATYPE(0xB0, 0x5), 0x7FF },
151+
{ SMCA_EX, HWID_MCATYPE(0xB0, 0x5), 0xFFF },
152152
{ SMCA_FP, HWID_MCATYPE(0xB0, 0x6), 0x7F },
153153
{ SMCA_L3_CACHE, HWID_MCATYPE(0xB0, 0x7), 0xFF },
154154

155155
/* Data Fabric MCA types */
156156
{ SMCA_CS, HWID_MCATYPE(0x2E, 0x0), 0x1FF },
157-
{ SMCA_PIE, HWID_MCATYPE(0x2E, 0x1), 0xF },
157+
{ SMCA_PIE, HWID_MCATYPE(0x2E, 0x1), 0x1F },
158158
{ SMCA_CS_V2, HWID_MCATYPE(0x2E, 0x2), 0x3FFF },
159159

160160
/* Unified Memory Controller MCA type */
161-
{ SMCA_UMC, HWID_MCATYPE(0x96, 0x0), 0x3F },
161+
{ SMCA_UMC, HWID_MCATYPE(0x96, 0x0), 0xFF },
162162

163163
/* Parameter Block MCA type */
164164
{ SMCA_PB, HWID_MCATYPE(0x05, 0x0), 0x1 },

drivers/edac/mce_amd.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ static const char * const smca_ls_mce_desc[] = {
155155
"Store queue parity",
156156
"Miss address buffer payload parity",
157157
"L1 TLB parity",
158-
"Reserved",
158+
"DC Tag error type 5",
159159
"DC tag error type 6",
160160
"DC tag error type 1",
161161
"Internal error type 1",
@@ -222,6 +222,7 @@ static const char * const smca_ex_mce_desc[] = {
222222
"Retire status queue parity error",
223223
"Scheduling queue parity error",
224224
"Branch buffer queue parity error",
225+
"Hardware Assertion error",
225226
};
226227

227228
static const char * const smca_fp_mce_desc[] = {
@@ -279,6 +280,7 @@ static const char * const smca_pie_mce_desc[] = {
279280
"Internal PIE register security violation",
280281
"Error on GMI link",
281282
"Poison data written to internal PIE register",
283+
"A deferred error was detected in the DF"
282284
};
283285

284286
static const char * const smca_umc_mce_desc[] = {
@@ -288,6 +290,8 @@ static const char * const smca_umc_mce_desc[] = {
288290
"Advanced peripheral bus error",
289291
"Command/address parity error",
290292
"Write data CRC error",
293+
"DCQ SRAM ECC error",
294+
"AES SRAM ECC error",
291295
};
292296

293297
static const char * const smca_pb_mce_desc[] = {

0 commit comments

Comments
 (0)