Skip to content

Commit 47b744e

Browse files
Muralidhara M Kbp3tk0v
authored andcommitted
x86/MCE/AMD: Add new MA_LLC, USR_DP, and USR_CP bank types
Add HWID and McaType values for new SMCA bank types. Signed-off-by: Muralidhara M K <muralidhara.mk@amd.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20231102114225.2006878-3-muralimk@amd.com
1 parent 9f98803 commit 47b744e

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

arch/x86/include/asm/mce.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ enum smca_bank_types {
311311
SMCA_PIE, /* Power, Interrupts, etc. */
312312
SMCA_UMC, /* Unified Memory Controller */
313313
SMCA_UMC_V2,
314+
SMCA_MA_LLC, /* Memory Attached Last Level Cache */
314315
SMCA_PB, /* Parameter Block */
315316
SMCA_PSP, /* Platform Security Processor */
316317
SMCA_PSP_V2,
@@ -326,6 +327,8 @@ enum smca_bank_types {
326327
SMCA_SHUB, /* System HUB Unit */
327328
SMCA_SATA, /* SATA Unit */
328329
SMCA_USB, /* USB Unit */
330+
SMCA_USR_DP, /* Ultra Short Reach Data Plane Controller */
331+
SMCA_USR_CP, /* Ultra Short Reach Control Plane Controller */
329332
SMCA_GMI_PCS, /* GMI PCS Unit */
330333
SMCA_XGMI_PHY, /* xGMI PHY Unit */
331334
SMCA_WAFL_PHY, /* WAFL PHY Unit */

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ static const char * const smca_names[] = {
102102
/* UMC v2 is separate because both of them can exist in a single system. */
103103
[SMCA_UMC] = "umc",
104104
[SMCA_UMC_V2] = "umc_v2",
105+
[SMCA_MA_LLC] = "ma_llc",
105106
[SMCA_PB] = "param_block",
106107
[SMCA_PSP ... SMCA_PSP_V2] = "psp",
107108
[SMCA_SMU ... SMCA_SMU_V2] = "smu",
@@ -114,6 +115,8 @@ static const char * const smca_names[] = {
114115
[SMCA_SHUB] = "shub",
115116
[SMCA_SATA] = "sata",
116117
[SMCA_USB] = "usb",
118+
[SMCA_USR_DP] = "usr_dp",
119+
[SMCA_USR_CP] = "usr_cp",
117120
[SMCA_GMI_PCS] = "gmi_pcs",
118121
[SMCA_XGMI_PHY] = "xgmi_phy",
119122
[SMCA_WAFL_PHY] = "wafl_phy",
@@ -164,6 +167,7 @@ static const struct smca_hwid smca_hwid_mcatypes[] = {
164167
{ SMCA_CS, HWID_MCATYPE(0x2E, 0x0) },
165168
{ SMCA_PIE, HWID_MCATYPE(0x2E, 0x1) },
166169
{ SMCA_CS_V2, HWID_MCATYPE(0x2E, 0x2) },
170+
{ SMCA_MA_LLC, HWID_MCATYPE(0x2E, 0x4) },
167171

168172
/* Unified Memory Controller MCA type */
169173
{ SMCA_UMC, HWID_MCATYPE(0x96, 0x0) },
@@ -198,6 +202,8 @@ static const struct smca_hwid smca_hwid_mcatypes[] = {
198202
{ SMCA_SHUB, HWID_MCATYPE(0x80, 0x0) },
199203
{ SMCA_SATA, HWID_MCATYPE(0xA8, 0x0) },
200204
{ SMCA_USB, HWID_MCATYPE(0xAA, 0x0) },
205+
{ SMCA_USR_DP, HWID_MCATYPE(0x170, 0x0) },
206+
{ SMCA_USR_CP, HWID_MCATYPE(0x180, 0x0) },
201207
{ SMCA_GMI_PCS, HWID_MCATYPE(0x241, 0x0) },
202208
{ SMCA_XGMI_PHY, HWID_MCATYPE(0x259, 0x0) },
203209
{ SMCA_WAFL_PHY, HWID_MCATYPE(0x267, 0x0) },

0 commit comments

Comments
 (0)