The following commit has been merged into the ras/core branch of tip:
Commit-ID: b595a009726b706fdadedace90c54831e19188e2
Gitweb: https://git.kernel.org/tip/b595a009726b706fdadedace90c54831e19188e2
Author: Yazen Ghannam <yazen.ghannam@amd.com>
AuthorDate: Sat, 07 Mar 2026 11:33:15 -05:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Wed, 11 Mar 2026 13:51:59 +01:00
x86/mce, EDAC/mce_amd: Update CS bank type naming
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>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://patch.msgid.link/20260307163316.345923-3-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 6e15205..af05ae8 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -350,7 +350,7 @@ extern void apei_mce_report_mem_error(int corrected,
* Exception: Keep "V2, etc." with their originals.
*/
enum smca_bank_types {
- 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 71bfe37..829a9b6 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 7fba230..54ad56f 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",