[PATCH v2 0/3] New SMCA bank types

[PATCH v2 0/3] New SMCA bank types

[Yazen Ghannam]

Hi all,

This set does some minor refactoring before adding new SMCA bank types.

Thanks,
Yazen

Link:
https://lore.kernel.org/20260202172158.2455749-1-yazen.ghannam@amd.com

v1->v2:
* Rebase on v7.0-rc2.
* Add pre-patch to reorder the bank type enums.
* Add pre-patch to update "CS" bank type name.

Yazen Ghannam (3):
  x86/mce, EDAC/mce_amd: Reorder SMCA bank type enums
  x86/mce, EDAC/mce_amd: Update CS bank type naming
  x86/mce, EDAC/mce_amd: Add new SMCA bank types

 arch/x86/include/asm/mce.h    |  59 +++++++++------
 arch/x86/kernel/cpu/mce/amd.c | 134 ++++++++++++++++++++--------------
 drivers/edac/mce_amd.c        |  48 +++++++-----
 3 files changed, 147 insertions(+), 94 deletions(-)

-- 
2.53.0

[PATCH v2 1/3] x86/mce, EDAC/mce_amd: Reorder SMCA bank type enums

[Yazen Ghannam]

Originally, the SMCA bank type enums were ordered based on processor
documentation. However, the ordering became inconsistent after new bank
types were added over time.

Sort the bank type enums alphanumerically in most places.  Sort the
"enum to HWID/McaType" mapping by HWID/McaType. Drop redundant code
comments.

Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
 arch/x86/include/asm/mce.h    |  48 ++++++++-------
 arch/x86/kernel/cpu/mce/amd.c | 110 +++++++++++++++++-----------------
 drivers/edac/mce_amd.c        |  38 ++++++------
 3 files changed, 99 insertions(+), 97 deletions(-)

diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index 2d98886de09a..83899711da4e 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -345,42 +345,46 @@ extern void apei_mce_report_mem_error(int corrected,
 
 /* These may be used by multiple smca_hwid_mcatypes */
 enum smca_bank_types {
-	SMCA_LS = 0,	/* Load Store */
-	SMCA_LS_V2,
-	SMCA_IF,	/* Instruction Fetch */
-	SMCA_L2_CACHE,	/* L2 Cache */
+	/*
+	 * Keep in alphanumeric order, numerals before letters.
+	 * Exception: Keep "V2, etc." with their originals.
+	 */
+	SMCA_CS,	/* Coherent Slave */
+	SMCA_CS_V2,
 	SMCA_DE,	/* Decoder Unit */
-	SMCA_RESERVED,	/* Reserved */
 	SMCA_EX,	/* Execution Unit */
 	SMCA_FP,	/* Floating Point */
+	SMCA_GMI_PCS,	/* GMI PCS Unit */
+	SMCA_GMI_PHY,	/* GMI PHY Unit */
+	SMCA_IF,	/* Instruction Fetch */
+	SMCA_L2_CACHE,	/* L2 Cache */
 	SMCA_L3_CACHE,	/* L3 Cache */
-	SMCA_CS,	/* Coherent Slave */
-	SMCA_CS_V2,
-	SMCA_PIE,	/* Power, Interrupts, etc. */
-	SMCA_UMC,	/* Unified Memory Controller */
-	SMCA_UMC_V2,
+	SMCA_LS,	/* Load Store */
+	SMCA_LS_V2,
 	SMCA_MA_LLC,	/* Memory Attached Last Level Cache */
-	SMCA_PB,	/* Parameter Block */
-	SMCA_PSP,	/* Platform Security Processor */
-	SMCA_PSP_V2,
-	SMCA_SMU,	/* System Management Unit */
-	SMCA_SMU_V2,
 	SMCA_MP5,	/* Microprocessor 5 Unit */
 	SMCA_MPDMA,	/* MPDMA Unit */
+	SMCA_NBIF,	/* NBIF Unit */
 	SMCA_NBIO,	/* Northbridge IO Unit */
+	SMCA_PB,	/* Parameter Block */
 	SMCA_PCIE,	/* PCI Express Unit */
 	SMCA_PCIE_V2,
-	SMCA_XGMI_PCS,	/* xGMI PCS Unit */
-	SMCA_NBIF,	/* NBIF Unit */
-	SMCA_SHUB,	/* System HUB Unit */
+	SMCA_PIE,	/* Power, Interrupts, etc. */
+	SMCA_PSP,	/* Platform Security Processor */
+	SMCA_PSP_V2,
+	SMCA_RESERVED,	/* Reserved */
 	SMCA_SATA,	/* SATA Unit */
+	SMCA_SHUB,	/* System HUB Unit */
+	SMCA_SMU,	/* System Management Unit */
+	SMCA_SMU_V2,
+	SMCA_UMC,	/* Unified Memory Controller */
+	SMCA_UMC_V2,
 	SMCA_USB,	/* USB Unit */
-	SMCA_USR_DP,	/* Ultra Short Reach Data Plane Controller */
 	SMCA_USR_CP,	/* Ultra Short Reach Control Plane Controller */
-	SMCA_GMI_PCS,	/* GMI PCS Unit */
-	SMCA_XGMI_PHY,	/* xGMI PHY Unit */
+	SMCA_USR_DP,	/* Ultra Short Reach Data Plane Controller */
 	SMCA_WAFL_PHY,	/* WAFL PHY Unit */
-	SMCA_GMI_PHY,	/* GMI PHY Unit */
+	SMCA_XGMI_PCS,	/* xGMI PCS Unit */
+	SMCA_XGMI_PHY,	/* xGMI PHY Unit */
 	N_SMCA_BANK_TYPES
 };
 
diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
index da13c1e37f87..44e490119b89 100644
--- a/arch/x86/kernel/cpu/mce/amd.c
+++ b/arch/x86/kernel/cpu/mce/amd.c
@@ -95,39 +95,39 @@ static DEFINE_PER_CPU_READ_MOSTLY(struct smca_bank[MAX_NR_BANKS], smca_banks);
 static DEFINE_PER_CPU_READ_MOSTLY(u8[N_SMCA_BANK_TYPES], smca_bank_counts);
 
 static const char * const smca_names[] = {
-	[SMCA_LS ... SMCA_LS_V2]	= "load_store",
-	[SMCA_IF]			= "insn_fetch",
-	[SMCA_L2_CACHE]			= "l2_cache",
+	[SMCA_CS ... SMCA_CS_V2]	= "coherent_slave",
 	[SMCA_DE]			= "decode_unit",
-	[SMCA_RESERVED]			= "reserved",
 	[SMCA_EX]			= "execution_unit",
 	[SMCA_FP]			= "floating_point",
+	[SMCA_GMI_PCS]			= "gmi_pcs",
+	[SMCA_GMI_PHY]			= "gmi_phy",
+	[SMCA_IF]			= "insn_fetch",
+	[SMCA_L2_CACHE]			= "l2_cache",
 	[SMCA_L3_CACHE]			= "l3_cache",
-	[SMCA_CS ... SMCA_CS_V2]	= "coherent_slave",
-	[SMCA_PIE]			= "pie",
-
-	/* UMC v2 is separate because both of them can exist in a single system. */
-	[SMCA_UMC]			= "umc",
-	[SMCA_UMC_V2]			= "umc_v2",
+	[SMCA_LS ... SMCA_LS_V2]	= "load_store",
 	[SMCA_MA_LLC]			= "ma_llc",
-	[SMCA_PB]			= "param_block",
-	[SMCA_PSP ... SMCA_PSP_V2]	= "psp",
-	[SMCA_SMU ... SMCA_SMU_V2]	= "smu",
 	[SMCA_MP5]			= "mp5",
 	[SMCA_MPDMA]			= "mpdma",
+	[SMCA_NBIF]			= "nbif",
 	[SMCA_NBIO]			= "nbio",
+	[SMCA_PB]			= "param_block",
 	[SMCA_PCIE ... SMCA_PCIE_V2]	= "pcie",
-	[SMCA_XGMI_PCS]			= "xgmi_pcs",
-	[SMCA_NBIF]			= "nbif",
-	[SMCA_SHUB]			= "shub",
+	[SMCA_PIE]			= "pie",
+	[SMCA_PSP ... SMCA_PSP_V2]	= "psp",
+	[SMCA_RESERVED]			= "reserved",
 	[SMCA_SATA]			= "sata",
+	[SMCA_SHUB]			= "shub",
+	[SMCA_SMU ... SMCA_SMU_V2]	= "smu",
+
+	/* UMC v2 is separate because both of them can exist in a single system. */
+	[SMCA_UMC]			= "umc",
+	[SMCA_UMC_V2]			= "umc_v2",
 	[SMCA_USB]			= "usb",
-	[SMCA_USR_DP]			= "usr_dp",
 	[SMCA_USR_CP]			= "usr_cp",
-	[SMCA_GMI_PCS]			= "gmi_pcs",
-	[SMCA_XGMI_PHY]			= "xgmi_phy",
+	[SMCA_USR_DP]			= "usr_dp",
 	[SMCA_WAFL_PHY]			= "wafl_phy",
-	[SMCA_GMI_PHY]			= "gmi_phy",
+	[SMCA_XGMI_PCS]			= "xgmi_pcs",
+	[SMCA_XGMI_PHY]			= "xgmi_phy",
 };
 
 static const char *smca_get_name(enum smca_bank_types t)
@@ -153,67 +153,65 @@ enum smca_bank_types smca_get_bank_type(unsigned int cpu, unsigned int bank)
 }
 EXPORT_SYMBOL_GPL(smca_get_bank_type);
 
+/* Order by HWID then McaType with newline between HWID groups. */
 static const struct smca_hwid smca_hwid_mcatypes[] = {
 	/* { bank_type, hwid_mcatype } */
 
-	/* Reserved type */
 	{ SMCA_RESERVED, HWID_MCATYPE(0x00, 0x0)	},
 
-	/* ZN Core (HWID=0xB0) MCA types */
-	{ SMCA_LS,	 HWID_MCATYPE(0xB0, 0x0)	},
-	{ SMCA_LS_V2,	 HWID_MCATYPE(0xB0, 0x10)	},
-	{ SMCA_IF,	 HWID_MCATYPE(0xB0, 0x1)	},
-	{ SMCA_L2_CACHE, HWID_MCATYPE(0xB0, 0x2)	},
-	{ SMCA_DE,	 HWID_MCATYPE(0xB0, 0x3)	},
-	/* HWID 0xB0 MCATYPE 0x4 is Reserved */
-	{ SMCA_EX,	 HWID_MCATYPE(0xB0, 0x5)	},
-	{ SMCA_FP,	 HWID_MCATYPE(0xB0, 0x6)	},
-	{ SMCA_L3_CACHE, HWID_MCATYPE(0xB0, 0x7)	},
-
-	/* Data Fabric MCA types */
-	{ SMCA_CS,	 HWID_MCATYPE(0x2E, 0x0)	},
-	{ SMCA_PIE,	 HWID_MCATYPE(0x2E, 0x1)	},
-	{ SMCA_CS_V2,	 HWID_MCATYPE(0x2E, 0x2)	},
-	{ SMCA_MA_LLC,	 HWID_MCATYPE(0x2E, 0x4)	},
-
-	/* Unified Memory Controller MCA type */
-	{ SMCA_UMC,	 HWID_MCATYPE(0x96, 0x0)	},
-	{ SMCA_UMC_V2,	 HWID_MCATYPE(0x96, 0x1)	},
-
-	/* Parameter Block MCA type */
-	{ SMCA_PB,	 HWID_MCATYPE(0x05, 0x0)	},
-
-	/* Platform Security Processor MCA type */
-	{ SMCA_PSP,	 HWID_MCATYPE(0xFF, 0x0)	},
-	{ SMCA_PSP_V2,	 HWID_MCATYPE(0xFF, 0x1)	},
-
-	/* System Management Unit MCA type */
 	{ SMCA_SMU,	 HWID_MCATYPE(0x01, 0x0)	},
 	{ SMCA_SMU_V2,	 HWID_MCATYPE(0x01, 0x1)	},
-
-	/* Microprocessor 5 Unit MCA type */
 	{ SMCA_MP5,	 HWID_MCATYPE(0x01, 0x2)	},
-
-	/* MPDMA MCA type */
 	{ SMCA_MPDMA,	 HWID_MCATYPE(0x01, 0x3)	},
 
-	/* Northbridge IO Unit MCA type */
+	{ SMCA_PB,	 HWID_MCATYPE(0x05, 0x0)	},
+
 	{ SMCA_NBIO,	 HWID_MCATYPE(0x18, 0x0)	},
 
-	/* PCI Express Unit MCA type */
+	{ SMCA_CS,	 HWID_MCATYPE(0x2E, 0x0)	},
+	{ SMCA_PIE,	 HWID_MCATYPE(0x2E, 0x1)	},
+	{ SMCA_CS_V2,	 HWID_MCATYPE(0x2E, 0x2)	},
+	{ SMCA_MA_LLC,	 HWID_MCATYPE(0x2E, 0x4)	},
+
 	{ SMCA_PCIE,	 HWID_MCATYPE(0x46, 0x0)	},
 	{ SMCA_PCIE_V2,	 HWID_MCATYPE(0x46, 0x1)	},
 
 	{ SMCA_XGMI_PCS, HWID_MCATYPE(0x50, 0x0)	},
+
 	{ SMCA_NBIF,	 HWID_MCATYPE(0x6C, 0x0)	},
+
 	{ SMCA_SHUB,	 HWID_MCATYPE(0x80, 0x0)	},
+
+	{ SMCA_UMC,	 HWID_MCATYPE(0x96, 0x0)	},
+	{ SMCA_UMC_V2,	 HWID_MCATYPE(0x96, 0x1)	},
+
 	{ SMCA_SATA,	 HWID_MCATYPE(0xA8, 0x0)	},
+
 	{ SMCA_USB,	 HWID_MCATYPE(0xAA, 0x0)	},
+
+	{ SMCA_LS,	 HWID_MCATYPE(0xB0, 0x0)	},
+	{ SMCA_IF,	 HWID_MCATYPE(0xB0, 0x1)	},
+	{ SMCA_L2_CACHE, HWID_MCATYPE(0xB0, 0x2)	},
+	{ SMCA_DE,	 HWID_MCATYPE(0xB0, 0x3)	},
+	/* HWID 0xB0 MCATYPE 0x4 is Reserved */
+	{ SMCA_EX,	 HWID_MCATYPE(0xB0, 0x5)	},
+	{ SMCA_FP,	 HWID_MCATYPE(0xB0, 0x6)	},
+	{ SMCA_L3_CACHE, HWID_MCATYPE(0xB0, 0x7)	},
+	{ SMCA_LS_V2,	 HWID_MCATYPE(0xB0, 0x10)	},
+
+	{ SMCA_PSP,	 HWID_MCATYPE(0xFF, 0x0)	},
+	{ SMCA_PSP_V2,	 HWID_MCATYPE(0xFF, 0x1)	},
+
 	{ SMCA_USR_DP,	 HWID_MCATYPE(0x170, 0x0)	},
+
 	{ SMCA_USR_CP,	 HWID_MCATYPE(0x180, 0x0)	},
+
 	{ SMCA_GMI_PCS,  HWID_MCATYPE(0x241, 0x0)	},
+
 	{ SMCA_XGMI_PHY, HWID_MCATYPE(0x259, 0x0)	},
+
 	{ SMCA_WAFL_PHY, HWID_MCATYPE(0x267, 0x0)	},
+
 	{ SMCA_GMI_PHY,	 HWID_MCATYPE(0x269, 0x0)	},
 };
 
diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index af3c12284a1e..7fba230cb9e1 100644
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -689,36 +689,36 @@ static void decode_mc6_mce(struct mce *m)
 }
 
 static const char * const smca_long_names[] = {
-	[SMCA_LS ... SMCA_LS_V2]	= "Load Store Unit",
-	[SMCA_IF]			= "Instruction Fetch Unit",
-	[SMCA_L2_CACHE]			= "L2 Cache",
+	[SMCA_CS ... SMCA_CS_V2]	= "Coherent Slave",
 	[SMCA_DE]			= "Decode Unit",
-	[SMCA_RESERVED]			= "Reserved",
 	[SMCA_EX]			= "Execution Unit",
 	[SMCA_FP]			= "Floating Point Unit",
+	[SMCA_GMI_PCS]			= "Global Memory Interconnect PCS Unit",
+	[SMCA_GMI_PHY]			= "Global Memory Interconnect PHY Unit",
+	[SMCA_IF]			= "Instruction Fetch Unit",
+	[SMCA_L2_CACHE]			= "L2 Cache",
 	[SMCA_L3_CACHE]			= "L3 Cache",
-	[SMCA_CS ... SMCA_CS_V2]	= "Coherent Slave",
-	[SMCA_PIE]			= "Power, Interrupts, etc.",
-
-	/* UMC v2 is separate because both of them can exist in a single system. */
-	[SMCA_UMC]			= "Unified Memory Controller",
-	[SMCA_UMC_V2]			= "Unified Memory Controller v2",
-	[SMCA_PB]			= "Parameter Block",
-	[SMCA_PSP ... SMCA_PSP_V2]	= "Platform Security Processor",
-	[SMCA_SMU ... SMCA_SMU_V2]	= "System Management Unit",
+	[SMCA_LS ... SMCA_LS_V2]	= "Load Store Unit",
 	[SMCA_MP5]			= "Microprocessor 5 Unit",
 	[SMCA_MPDMA]			= "MPDMA Unit",
+	[SMCA_NBIF]			= "NBIF Unit",
 	[SMCA_NBIO]			= "Northbridge IO Unit",
+	[SMCA_PB]			= "Parameter Block",
 	[SMCA_PCIE ... SMCA_PCIE_V2]	= "PCI Express Unit",
-	[SMCA_XGMI_PCS]			= "Ext Global Memory Interconnect PCS Unit",
-	[SMCA_NBIF]			= "NBIF Unit",
-	[SMCA_SHUB]			= "System Hub Unit",
+	[SMCA_PIE]			= "Power, Interrupts, etc.",
+	[SMCA_PSP ... SMCA_PSP_V2]	= "Platform Security Processor",
+	[SMCA_RESERVED]			= "Reserved",
 	[SMCA_SATA]			= "SATA Unit",
+	[SMCA_SHUB]			= "System Hub Unit",
+	[SMCA_SMU ... SMCA_SMU_V2]	= "System Management Unit",
+
+	/* UMC v2 is separate because both of them can exist in a single system. */
+	[SMCA_UMC]			= "Unified Memory Controller",
+	[SMCA_UMC_V2]			= "Unified Memory Controller v2",
 	[SMCA_USB]			= "USB Unit",
-	[SMCA_GMI_PCS]			= "Global Memory Interconnect PCS Unit",
-	[SMCA_XGMI_PHY]			= "Ext Global Memory Interconnect PHY Unit",
 	[SMCA_WAFL_PHY]			= "WAFL PHY Unit",
-	[SMCA_GMI_PHY]			= "Global Memory Interconnect PHY Unit",
+	[SMCA_XGMI_PCS]			= "Ext Global Memory Interconnect PCS Unit",
+	[SMCA_XGMI_PHY]			= "Ext Global Memory Interconnect PHY Unit",
 };
 
 static const char *smca_get_long_name(enum smca_bank_types t)
-- 
2.53.0

[PATCH v2 2/3] x86/mce, EDAC/mce_amd: Update CS bank type naming

[Yazen Ghannam]

Recent documentation updated the "CS" bank type name from "Coherent
Slave" to "Coherent Station".

Apply this change in the kernel also.

Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
 arch/x86/include/asm/mce.h    | 2 +-
 arch/x86/kernel/cpu/mce/amd.c | 2 +-
 drivers/edac/mce_amd.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index 83899711da4e..576a4b6e83ea 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -349,7 +349,7 @@ enum smca_bank_types {
 	 * Keep in alphanumeric order, numerals before letters.
 	 * Exception: Keep "V2, etc." with their originals.
 	 */
-	SMCA_CS,	/* Coherent Slave */
+	SMCA_CS,	/* Coherent Station */
 	SMCA_CS_V2,
 	SMCA_DE,	/* Decoder Unit */
 	SMCA_EX,	/* Execution Unit */
diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
index 44e490119b89..86f51415283c 100644
--- a/arch/x86/kernel/cpu/mce/amd.c
+++ b/arch/x86/kernel/cpu/mce/amd.c
@@ -95,7 +95,7 @@ static DEFINE_PER_CPU_READ_MOSTLY(struct smca_bank[MAX_NR_BANKS], smca_banks);
 static DEFINE_PER_CPU_READ_MOSTLY(u8[N_SMCA_BANK_TYPES], smca_bank_counts);
 
 static const char * const smca_names[] = {
-	[SMCA_CS ... SMCA_CS_V2]	= "coherent_slave",
+	[SMCA_CS ... SMCA_CS_V2]	= "coherent_station",
 	[SMCA_DE]			= "decode_unit",
 	[SMCA_EX]			= "execution_unit",
 	[SMCA_FP]			= "floating_point",
diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index 7fba230cb9e1..54ad56f2a9e0 100644
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -689,7 +689,7 @@ static void decode_mc6_mce(struct mce *m)
 }
 
 static const char * const smca_long_names[] = {
-	[SMCA_CS ... SMCA_CS_V2]	= "Coherent Slave",
+	[SMCA_CS ... SMCA_CS_V2]	= "Coherent Station",
 	[SMCA_DE]			= "Decode Unit",
 	[SMCA_EX]			= "Execution Unit",
 	[SMCA_FP]			= "Floating Point Unit",
-- 
2.53.0

[PATCH v2 3/3] x86/mce, EDAC/mce_amd: Add new SMCA bank types

[Yazen Ghannam]

Recognize new SMCA bank types and include their short names for sysfs
and long names for decoding.

Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
 arch/x86/include/asm/mce.h    | 11 +++++++++++
 arch/x86/kernel/cpu/mce/amd.c | 30 ++++++++++++++++++++++++++++++
 drivers/edac/mce_amd.c        | 10 ++++++++++
 3 files changed, 51 insertions(+)

diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index 576a4b6e83ea..e4d0fc0978ac 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -351,7 +351,10 @@ enum smca_bank_types {
 	 */
 	SMCA_CS,	/* Coherent Station */
 	SMCA_CS_V2,
+	SMCA_DACC_BE,	/* Data Acceleration Back-end */
+	SMCA_DACC_FE,	/* Data Acceleration Front-end */
 	SMCA_DE,	/* Decoder Unit */
+	SMCA_EDDR5CMN,	/* eDDR5 CMN */
 	SMCA_EX,	/* Execution Unit */
 	SMCA_FP,	/* Floating Point */
 	SMCA_GMI_PCS,	/* GMI PCS Unit */
@@ -363,12 +366,19 @@ enum smca_bank_types {
 	SMCA_LS_V2,
 	SMCA_MA_LLC,	/* Memory Attached Last Level Cache */
 	SMCA_MP5,	/* Microprocessor 5 Unit */
+	SMCA_MPART,	/* AMD Root of Trust Microprocessor */
+	SMCA_MPASP,	/* AMD Secure Processor */
+	SMCA_MPASP_V2,
+	SMCA_MPDACC,	/* MP for Data Acceleration */
 	SMCA_MPDMA,	/* MPDMA Unit */
+	SMCA_MPM,	/* Microprocessor Manageability Core */
+	SMCA_MPRAS,	/* MP for RAS */
 	SMCA_NBIF,	/* NBIF Unit */
 	SMCA_NBIO,	/* Northbridge IO Unit */
 	SMCA_PB,	/* Parameter Block */
 	SMCA_PCIE,	/* PCI Express Unit */
 	SMCA_PCIE_V2,
+	SMCA_PCIE_PL,	/* PCIe Link */
 	SMCA_PIE,	/* Power, Interrupts, etc. */
 	SMCA_PSP,	/* Platform Security Processor */
 	SMCA_PSP_V2,
@@ -377,6 +387,7 @@ enum smca_bank_types {
 	SMCA_SHUB,	/* System HUB Unit */
 	SMCA_SMU,	/* System Management Unit */
 	SMCA_SMU_V2,
+	SMCA_SSBDCI,	/* Die to Die Interconnect */
 	SMCA_UMC,	/* Unified Memory Controller */
 	SMCA_UMC_V2,
 	SMCA_USB,	/* USB Unit */
diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
index 86f51415283c..fc1513f8d180 100644
--- a/arch/x86/kernel/cpu/mce/amd.c
+++ b/arch/x86/kernel/cpu/mce/amd.c
@@ -96,7 +96,10 @@ static DEFINE_PER_CPU_READ_MOSTLY(u8[N_SMCA_BANK_TYPES], smca_bank_counts);
 
 static const char * const smca_names[] = {
 	[SMCA_CS ... SMCA_CS_V2]	= "coherent_station",
+	[SMCA_DACC_BE]			= "dacc_be",
+	[SMCA_DACC_FE]			= "dacc_fe",
 	[SMCA_DE]			= "decode_unit",
+	[SMCA_EDDR5CMN]			= "eddr5_cmn",
 	[SMCA_EX]			= "execution_unit",
 	[SMCA_FP]			= "floating_point",
 	[SMCA_GMI_PCS]			= "gmi_pcs",
@@ -107,17 +110,24 @@ static const char * const smca_names[] = {
 	[SMCA_LS ... SMCA_LS_V2]	= "load_store",
 	[SMCA_MA_LLC]			= "ma_llc",
 	[SMCA_MP5]			= "mp5",
+	[SMCA_MPART]			= "mpart",
+	[SMCA_MPASP ... SMCA_MPASP_V2]	= "mpasp",
+	[SMCA_MPDACC]			= "mpdacc",
 	[SMCA_MPDMA]			= "mpdma",
+	[SMCA_MPM]			= "mpm",
+	[SMCA_MPRAS]			= "mpras",
 	[SMCA_NBIF]			= "nbif",
 	[SMCA_NBIO]			= "nbio",
 	[SMCA_PB]			= "param_block",
 	[SMCA_PCIE ... SMCA_PCIE_V2]	= "pcie",
+	[SMCA_PCIE_PL]			= "pcie_pl",
 	[SMCA_PIE]			= "pie",
 	[SMCA_PSP ... SMCA_PSP_V2]	= "psp",
 	[SMCA_RESERVED]			= "reserved",
 	[SMCA_SATA]			= "sata",
 	[SMCA_SHUB]			= "shub",
 	[SMCA_SMU ... SMCA_SMU_V2]	= "smu",
+	[SMCA_SSBDCI]			= "ssbdci",
 
 	/* UMC v2 is separate because both of them can exist in a single system. */
 	[SMCA_UMC]			= "umc",
@@ -166,6 +176,8 @@ static const struct smca_hwid smca_hwid_mcatypes[] = {
 
 	{ SMCA_PB,	 HWID_MCATYPE(0x05, 0x0)	},
 
+	{ SMCA_MPRAS,	 HWID_MCATYPE(0x12, 0x0)	},
+
 	{ SMCA_NBIO,	 HWID_MCATYPE(0x18, 0x0)	},
 
 	{ SMCA_CS,	 HWID_MCATYPE(0x2E, 0x0)	},
@@ -178,6 +190,8 @@ static const struct smca_hwid smca_hwid_mcatypes[] = {
 
 	{ SMCA_XGMI_PCS, HWID_MCATYPE(0x50, 0x0)	},
 
+	{ SMCA_SSBDCI,	 HWID_MCATYPE(0x5C, 0x0)	},
+
 	{ SMCA_NBIF,	 HWID_MCATYPE(0x6C, 0x0)	},
 
 	{ SMCA_SHUB,	 HWID_MCATYPE(0x80, 0x0)	},
@@ -199,13 +213,29 @@ static const struct smca_hwid smca_hwid_mcatypes[] = {
 	{ SMCA_L3_CACHE, HWID_MCATYPE(0xB0, 0x7)	},
 	{ SMCA_LS_V2,	 HWID_MCATYPE(0xB0, 0x10)	},
 
+	{ SMCA_MPDACC,	 HWID_MCATYPE(0xBE, 0x0)	},
+
+	{ SMCA_MPM,	 HWID_MCATYPE(0xF9, 0x0)	},
+
+	{ SMCA_MPASP,	 HWID_MCATYPE(0xFD, 0x0)	},
+	{ SMCA_MPASP_V2, HWID_MCATYPE(0xFD, 0x1)	},
+
 	{ SMCA_PSP,	 HWID_MCATYPE(0xFF, 0x0)	},
 	{ SMCA_PSP_V2,	 HWID_MCATYPE(0xFF, 0x1)	},
+	{ SMCA_MPART,	 HWID_MCATYPE(0xFF, 0x2)	},
+
+	{ SMCA_DACC_FE,	 HWID_MCATYPE(0x157, 0x0)	},
+
+	{ SMCA_DACC_BE,	 HWID_MCATYPE(0x164, 0x0)	},
 
 	{ SMCA_USR_DP,	 HWID_MCATYPE(0x170, 0x0)	},
 
 	{ SMCA_USR_CP,	 HWID_MCATYPE(0x180, 0x0)	},
 
+	{ SMCA_EDDR5CMN, HWID_MCATYPE(0x1E0, 0x0)	},
+
+	{ SMCA_PCIE_PL,	 HWID_MCATYPE(0x1E1, 0x0)	},
+
 	{ SMCA_GMI_PCS,  HWID_MCATYPE(0x241, 0x0)	},
 
 	{ SMCA_XGMI_PHY, HWID_MCATYPE(0x259, 0x0)	},
diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index 54ad56f2a9e0..bd252cb3c38e 100644
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -690,7 +690,10 @@ static void decode_mc6_mce(struct mce *m)
 
 static const char * const smca_long_names[] = {
 	[SMCA_CS ... SMCA_CS_V2]	= "Coherent Station",
+	[SMCA_DACC_BE]			= "DACC Back-end Unit",
+	[SMCA_DACC_FE]			= "DACC Front-end Unit",
 	[SMCA_DE]			= "Decode Unit",
+	[SMCA_EDDR5CMN]			= "eDDR5 CMN Unit",
 	[SMCA_EX]			= "Execution Unit",
 	[SMCA_FP]			= "Floating Point Unit",
 	[SMCA_GMI_PCS]			= "Global Memory Interconnect PCS Unit",
@@ -700,17 +703,24 @@ static const char * const smca_long_names[] = {
 	[SMCA_L3_CACHE]			= "L3 Cache",
 	[SMCA_LS ... SMCA_LS_V2]	= "Load Store Unit",
 	[SMCA_MP5]			= "Microprocessor 5 Unit",
+	[SMCA_MPART]			= "MPART Unit",
+	[SMCA_MPASP ... SMCA_MPASP_V2]	= "MPASP Unit",
+	[SMCA_MPDACC]			= "MPDACC Unit",
 	[SMCA_MPDMA]			= "MPDMA Unit",
+	[SMCA_MPM]			= "MPM Unit",
+	[SMCA_MPRAS]			= "MPRAS Unit",
 	[SMCA_NBIF]			= "NBIF Unit",
 	[SMCA_NBIO]			= "Northbridge IO Unit",
 	[SMCA_PB]			= "Parameter Block",
 	[SMCA_PCIE ... SMCA_PCIE_V2]	= "PCI Express Unit",
+	[SMCA_PCIE_PL]			= "PCIe Link Unit",
 	[SMCA_PIE]			= "Power, Interrupts, etc.",
 	[SMCA_PSP ... SMCA_PSP_V2]	= "Platform Security Processor",
 	[SMCA_RESERVED]			= "Reserved",
 	[SMCA_SATA]			= "SATA Unit",
 	[SMCA_SHUB]			= "System Hub Unit",
 	[SMCA_SMU ... SMCA_SMU_V2]	= "System Management Unit",
+	[SMCA_SSBDCI]			= "Die to Die Interconnect Unit",
 
 	/* UMC v2 is separate because both of them can exist in a single system. */
 	[SMCA_UMC]			= "Unified Memory Controller",
-- 
2.53.0

Re: [PATCH v2 1/3] x86/mce, EDAC/mce_amd: Reorder SMCA bank type enums

[Borislav Petkov]

On Sat, Mar 07, 2026 at 11:33:14AM -0500, Yazen Ghannam wrote:
> +/* Order by HWID then McaType with newline between HWID groups. */

So I would argue that keeping them *all* sorted the same makes reading and
touching that code the simplest. Because you will have to modify the same
spots when you add new ones and the hwid number doesn't really matter for
humans.

IOW, this:

/*
 * Format:
 * { bank_type, hwid_mcatype }
 *
 * alphanumerically sorted by bank type.
 */
static const struct smca_hwid smca_hwid_mcatypes[] = {
        { SMCA_CS,       HWID_MCATYPE(0x2E, 0x0)        },
        { SMCA_CS_V2,    HWID_MCATYPE(0x2E, 0x2)        },
        { SMCA_DE,       HWID_MCATYPE(0xB0, 0x3)        },
        { SMCA_EX,       HWID_MCATYPE(0xB0, 0x5)        },
        { SMCA_FP,       HWID_MCATYPE(0xB0, 0x6)        },
        { SMCA_GMI_PCS,  HWID_MCATYPE(0x241, 0x0)       },
        { SMCA_GMI_PHY,  HWID_MCATYPE(0x269, 0x0)       },
        { SMCA_IF,       HWID_MCATYPE(0xB0, 0x1)        },
        { SMCA_L2_CACHE, HWID_MCATYPE(0xB0, 0x2)        },
        { SMCA_L3_CACHE, HWID_MCATYPE(0xB0, 0x7)        },
        { SMCA_LS,       HWID_MCATYPE(0xB0, 0x0)        },
        { SMCA_LS_V2,    HWID_MCATYPE(0xB0, 0x10)       },
        { SMCA_MA_LLC,   HWID_MCATYPE(0x2E, 0x4)        },
        { SMCA_MP5,      HWID_MCATYPE(0x01, 0x2)        },
        { SMCA_MPDMA,    HWID_MCATYPE(0x01, 0x3)        },
        { SMCA_NBIF,     HWID_MCATYPE(0x6C, 0x0)        },
        { SMCA_NBIO,     HWID_MCATYPE(0x18, 0x0)        },
        { SMCA_PB,       HWID_MCATYPE(0x05, 0x0)        },
        { SMCA_PCIE,     HWID_MCATYPE(0x46, 0x0)        },
        { SMCA_PCIE_V2,  HWID_MCATYPE(0x46, 0x1)        },
        { SMCA_PIE,      HWID_MCATYPE(0x2E, 0x1)        },
        { SMCA_PSP,      HWID_MCATYPE(0xFF, 0x0)        },
        { SMCA_PSP_V2,   HWID_MCATYPE(0xFF, 0x1)        },
        { SMCA_RESERVED, HWID_MCATYPE(0x00, 0x0)        },
        { SMCA_SATA,     HWID_MCATYPE(0xA8, 0x0)        },
        { SMCA_SHUB,     HWID_MCATYPE(0x80, 0x0)        },
        { SMCA_SMU,      HWID_MCATYPE(0x01, 0x0)        },
        { SMCA_SMU_V2,   HWID_MCATYPE(0x01, 0x1)        },
        { SMCA_UMC,      HWID_MCATYPE(0x96, 0x0)        },
        { SMCA_UMC_V2,   HWID_MCATYPE(0x96, 0x1)        },
        { SMCA_USB,      HWID_MCATYPE(0xAA, 0x0)        },
        { SMCA_USR_CP,   HWID_MCATYPE(0x180, 0x0)       },
        { SMCA_USR_DP,   HWID_MCATYPE(0x170, 0x0)       },
        { SMCA_WAFL_PHY, HWID_MCATYPE(0x267, 0x0)       },
        { SMCA_XGMI_PCS, HWID_MCATYPE(0x50, 0x0)        },
        { SMCA_XGMI_PHY, HWID_MCATYPE(0x259, 0x0)       },
};

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

Re: [PATCH v2 1/3] x86/mce, EDAC/mce_amd: Reorder SMCA bank type enums

[Yazen Ghannam]

On Sun, Mar 08, 2026 at 11:20:46AM +0100, Borislav Petkov wrote:
> On Sat, Mar 07, 2026 at 11:33:14AM -0500, Yazen Ghannam wrote:
> > +/* Order by HWID then McaType with newline between HWID groups. */
> 
> So I would argue that keeping them *all* sorted the same makes reading and
> touching that code the simplest. Because you will have to modify the same
> spots when you add new ones and the hwid number doesn't really matter for
> humans.
> 
> IOW, this:
> 
> /*
>  * Format:
>  * { bank_type, hwid_mcatype }
>  *
>  * alphanumerically sorted by bank type.
>  */
> static const struct smca_hwid smca_hwid_mcatypes[] = {
>         { SMCA_CS,       HWID_MCATYPE(0x2E, 0x0)        },
>         { SMCA_CS_V2,    HWID_MCATYPE(0x2E, 0x2)        },
>         { SMCA_DE,       HWID_MCATYPE(0xB0, 0x3)        },
>         { SMCA_EX,       HWID_MCATYPE(0xB0, 0x5)        },
>         { SMCA_FP,       HWID_MCATYPE(0xB0, 0x6)        },
>         { SMCA_GMI_PCS,  HWID_MCATYPE(0x241, 0x0)       },
>         { SMCA_GMI_PHY,  HWID_MCATYPE(0x269, 0x0)       },
>         { SMCA_IF,       HWID_MCATYPE(0xB0, 0x1)        },
>         { SMCA_L2_CACHE, HWID_MCATYPE(0xB0, 0x2)        },
>         { SMCA_L3_CACHE, HWID_MCATYPE(0xB0, 0x7)        },
>         { SMCA_LS,       HWID_MCATYPE(0xB0, 0x0)        },
>         { SMCA_LS_V2,    HWID_MCATYPE(0xB0, 0x10)       },
>         { SMCA_MA_LLC,   HWID_MCATYPE(0x2E, 0x4)        },
>         { SMCA_MP5,      HWID_MCATYPE(0x01, 0x2)        },
>         { SMCA_MPDMA,    HWID_MCATYPE(0x01, 0x3)        },
>         { SMCA_NBIF,     HWID_MCATYPE(0x6C, 0x0)        },
>         { SMCA_NBIO,     HWID_MCATYPE(0x18, 0x0)        },
>         { SMCA_PB,       HWID_MCATYPE(0x05, 0x0)        },
>         { SMCA_PCIE,     HWID_MCATYPE(0x46, 0x0)        },
>         { SMCA_PCIE_V2,  HWID_MCATYPE(0x46, 0x1)        },
>         { SMCA_PIE,      HWID_MCATYPE(0x2E, 0x1)        },
>         { SMCA_PSP,      HWID_MCATYPE(0xFF, 0x0)        },
>         { SMCA_PSP_V2,   HWID_MCATYPE(0xFF, 0x1)        },
>         { SMCA_RESERVED, HWID_MCATYPE(0x00, 0x0)        },
>         { SMCA_SATA,     HWID_MCATYPE(0xA8, 0x0)        },
>         { SMCA_SHUB,     HWID_MCATYPE(0x80, 0x0)        },
>         { SMCA_SMU,      HWID_MCATYPE(0x01, 0x0)        },
>         { SMCA_SMU_V2,   HWID_MCATYPE(0x01, 0x1)        },
>         { SMCA_UMC,      HWID_MCATYPE(0x96, 0x0)        },
>         { SMCA_UMC_V2,   HWID_MCATYPE(0x96, 0x1)        },
>         { SMCA_USB,      HWID_MCATYPE(0xAA, 0x0)        },
>         { SMCA_USR_CP,   HWID_MCATYPE(0x180, 0x0)       },
>         { SMCA_USR_DP,   HWID_MCATYPE(0x170, 0x0)       },
>         { SMCA_WAFL_PHY, HWID_MCATYPE(0x267, 0x0)       },
>         { SMCA_XGMI_PCS, HWID_MCATYPE(0x50, 0x0)        },
>         { SMCA_XGMI_PHY, HWID_MCATYPE(0x259, 0x0)       },
> };
> 

Yeah, I see your point. This didn't sit right with me at first, but it
feels better after looking at it longer.

Want me to send another revision?

Thanks,
Yazen

Re: [PATCH v2 1/3] x86/mce, EDAC/mce_amd: Reorder SMCA bank type enums

[Borislav Petkov]

On Tue, Mar 10, 2026 at 08:46:49AM -0400, Yazen Ghannam wrote:
> Yeah, I see your point. This didn't sit right with me at first, but it
> feels better after looking at it longer.

Ok, I hope you'll see the full usefulness soon. :-)

> Want me to send another revision?

Nah, no need.

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

Re: [PATCH v2 0/3] New SMCA bank types

[Borislav Petkov]

On Sat, Mar 07, 2026 at 11:33:13AM -0500, Yazen Ghannam wrote:
> Hi all,
> 
> This set does some minor refactoring before adding new SMCA bank types.
> 
> Thanks,
> Yazen
> 
> Link:
> https://lore.kernel.org/20260202172158.2455749-1-yazen.ghannam@amd.com
> 
> v1->v2:
> * Rebase on v7.0-rc2.
> * Add pre-patch to reorder the bank type enums.
> * Add pre-patch to update "CS" bank type name.
> 
> Yazen Ghannam (3):
>   x86/mce, EDAC/mce_amd: Reorder SMCA bank type enums
>   x86/mce, EDAC/mce_amd: Update CS bank type naming
>   x86/mce, EDAC/mce_amd: Add new SMCA bank types
> 
>  arch/x86/include/asm/mce.h    |  59 +++++++++------
>  arch/x86/kernel/cpu/mce/amd.c | 134 ++++++++++++++++++++--------------
>  drivers/edac/mce_amd.c        |  48 +++++++-----
>  3 files changed, 147 insertions(+), 94 deletions(-)

Ok,

check here pls whether I've botched anything:

https://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git/log/?h=tip-ras-core

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

Re: [PATCH v2 0/3] New SMCA bank types

[Yazen Ghannam]

On Wed, Mar 11, 2026 at 02:19:38PM +0100, Borislav Petkov wrote:
> On Sat, Mar 07, 2026 at 11:33:13AM -0500, Yazen Ghannam wrote:
> > Hi all,
> > 
> > This set does some minor refactoring before adding new SMCA bank types.
> > 
> > Thanks,
> > Yazen
> > 
> > Link:
> > https://lore.kernel.org/20260202172158.2455749-1-yazen.ghannam@amd.com
> > 
> > v1->v2:
> > * Rebase on v7.0-rc2.
> > * Add pre-patch to reorder the bank type enums.
> > * Add pre-patch to update "CS" bank type name.
> > 
> > Yazen Ghannam (3):
> >   x86/mce, EDAC/mce_amd: Reorder SMCA bank type enums
> >   x86/mce, EDAC/mce_amd: Update CS bank type naming
> >   x86/mce, EDAC/mce_amd: Add new SMCA bank types
> > 
> >  arch/x86/include/asm/mce.h    |  59 +++++++++------
> >  arch/x86/kernel/cpu/mce/amd.c | 134 ++++++++++++++++++++--------------
> >  drivers/edac/mce_amd.c        |  48 +++++++-----
> >  3 files changed, 147 insertions(+), 94 deletions(-)
> 
> Ok,
> 
> check here pls whether I've botched anything:
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git/log/?h=tip-ras-core
> 

Looks good to me.

Thanks,
Yazen