* [PATCH v6 1/3] EDAC: Remove fake_inject debugfs interface
2026-06-29 15:07 [PATCH v6 0/3] Incorporate DRAM address in EDAC messages Yazen Ghannam
@ 2026-06-29 15:07 ` Yazen Ghannam
2026-06-30 5:30 ` Borislav Petkov
2026-06-29 15:07 ` [PATCH v6 2/3] RAS/AMD/ATL: Translate UMC normalized address to DRAM address using PRM Yazen Ghannam
2026-06-29 15:07 ` [PATCH v6 3/3] EDAC/amd64: Include DRAM address in output Yazen Ghannam
2 siblings, 1 reply; 8+ messages in thread
From: Yazen Ghannam @ 2026-06-29 15:07 UTC (permalink / raw)
To: bp, linux-edac; +Cc: linux-kernel, Avadhut Naik, Yazen Ghannam
The interface has a potential race condition between a real and fake
error when updating the memory controller's error descriptor.
There doesn't seem to be an active user base for this interface, so
remove it.
Reported-by: sashiko-bot <sashiko-bot@kernel.org>
Closes: https://sashiko.dev/#/patchset/20260518160716.171578-1-yazen.ghannam%40amd.com
Suggested-by: Borislav Petkov <bp@alien8.de>
Assisted-by: Claude:claude-opus-4-6
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
Link: https://lore.kernel.org/linux-edac/20260611012336.GHaioOGB0NBxv5BZXS@fat_crate.local/
---
drivers/edac/debugfs.c | 65 +-----------------------------------------
include/linux/edac.h | 3 --
2 files changed, 1 insertion(+), 67 deletions(-)
diff --git a/drivers/edac/debugfs.c b/drivers/edac/debugfs.c
index 8195fc9c9354..447d0c620082 100644
--- a/drivers/edac/debugfs.c
+++ b/drivers/edac/debugfs.c
@@ -1,50 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-only
-#include <linux/string_choices.h>
-
#include "edac_module.h"
static struct dentry *edac_debugfs;
-static ssize_t edac_fake_inject_write(struct file *file,
- const char __user *data,
- size_t count, loff_t *ppos)
-{
- struct device *dev = file->private_data;
- struct mem_ctl_info *mci = to_mci(dev);
- static enum hw_event_mc_err_type type;
- u16 errcount = mci->fake_inject_count;
-
- if (!errcount)
- errcount = 1;
-
- type = mci->fake_inject_ue ? HW_EVENT_ERR_UNCORRECTED
- : HW_EVENT_ERR_CORRECTED;
-
- printk(KERN_DEBUG
- "Generating %d %s fake error%s to %d.%d.%d to test core handling. NOTE: this won't test the driver-specific decoding logic.\n",
- errcount,
- (type == HW_EVENT_ERR_UNCORRECTED) ? "UE" : "CE",
- str_plural(errcount),
- mci->fake_inject_layer[0],
- mci->fake_inject_layer[1],
- mci->fake_inject_layer[2]
- );
- edac_mc_handle_error(type, mci, errcount, 0, 0, 0,
- mci->fake_inject_layer[0],
- mci->fake_inject_layer[1],
- mci->fake_inject_layer[2],
- "FAKE ERROR", "for EDAC testing only");
-
- return count;
-}
-
-static const struct file_operations debug_fake_inject_fops = {
- .open = simple_open,
- .write = edac_fake_inject_write,
- .llseek = generic_file_llseek,
-};
-
void __init edac_debugfs_init(void)
{
edac_debugfs = debugfs_create_dir("edac", NULL);
@@ -57,29 +16,7 @@ void edac_debugfs_exit(void)
void edac_create_debugfs_nodes(struct mem_ctl_info *mci)
{
- struct dentry *parent;
- char name[80];
- int i;
-
- parent = debugfs_create_dir(mci->dev.kobj.name, edac_debugfs);
-
- for (i = 0; i < mci->n_layers; i++) {
- sprintf(name, "fake_inject_%s",
- edac_layer_name[mci->layers[i].type]);
- debugfs_create_u8(name, S_IRUGO | S_IWUSR, parent,
- &mci->fake_inject_layer[i]);
- }
-
- debugfs_create_bool("fake_inject_ue", S_IRUGO | S_IWUSR, parent,
- &mci->fake_inject_ue);
-
- debugfs_create_u16("fake_inject_count", S_IRUGO | S_IWUSR, parent,
- &mci->fake_inject_count);
-
- debugfs_create_file("fake_inject", S_IWUSR, parent, &mci->dev,
- &debug_fake_inject_fops);
-
- mci->debugfs = parent;
+ mci->debugfs = debugfs_create_dir(mci->dev.kobj.name, edac_debugfs);
}
/* Create a toplevel dir under EDAC's debugfs hierarchy */
diff --git a/include/linux/edac.h b/include/linux/edac.h
index e6b4e51130e5..f7a8218f9cc0 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -598,9 +598,6 @@ struct mem_ctl_info {
int op_state;
struct dentry *debugfs;
- u8 fake_inject_layer[EDAC_MAX_LAYERS];
- bool fake_inject_ue;
- u16 fake_inject_count;
/*
* Memory Controller hierarchy
--
2.53.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v6 1/3] EDAC: Remove fake_inject debugfs interface
2026-06-29 15:07 ` [PATCH v6 1/3] EDAC: Remove fake_inject debugfs interface Yazen Ghannam
@ 2026-06-30 5:30 ` Borislav Petkov
0 siblings, 0 replies; 8+ messages in thread
From: Borislav Petkov @ 2026-06-30 5:30 UTC (permalink / raw)
To: Yazen Ghannam; +Cc: linux-edac, linux-kernel, Avadhut Naik
On Mon, Jun 29, 2026 at 11:07:29AM -0400, Yazen Ghannam wrote:
> The interface has a potential race condition between a real and fake
> error when updating the memory controller's error descriptor.
>
> There doesn't seem to be an active user base for this interface, so
> remove it.
>
> Reported-by: sashiko-bot <sashiko-bot@kernel.org>
> Closes: https://sashiko.dev/#/patchset/20260518160716.171578-1-yazen.ghannam%40amd.com
> Suggested-by: Borislav Petkov <bp@alien8.de>
> Assisted-by: Claude:claude-opus-4-6
> Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
> Link: https://lore.kernel.org/linux-edac/20260611012336.GHaioOGB0NBxv5BZXS@fat_crate.local/
> ---
> drivers/edac/debugfs.c | 65 +-----------------------------------------
> include/linux/edac.h | 3 --
> 2 files changed, 1 insertion(+), 67 deletions(-)
Applied, thanks.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v6 2/3] RAS/AMD/ATL: Translate UMC normalized address to DRAM address using PRM
2026-06-29 15:07 [PATCH v6 0/3] Incorporate DRAM address in EDAC messages Yazen Ghannam
2026-06-29 15:07 ` [PATCH v6 1/3] EDAC: Remove fake_inject debugfs interface Yazen Ghannam
@ 2026-06-29 15:07 ` Yazen Ghannam
2026-06-30 5:33 ` Borislav Petkov
2026-06-29 15:07 ` [PATCH v6 3/3] EDAC/amd64: Include DRAM address in output Yazen Ghannam
2 siblings, 1 reply; 8+ messages in thread
From: Yazen Ghannam @ 2026-06-29 15:07 UTC (permalink / raw)
To: bp, linux-edac; +Cc: linux-kernel, Avadhut Naik, Yazen Ghannam
From: Avadhut Naik <avadhut.naik@amd.com>
Modern AMD SOCs provide UEFI PRM module that implements various address
translation PRM handlers.[1] These handlers can be invoked by the OS or
hypervisor at runtime to perform address translations.
On AMD's Zen-based SOCs, Unified Memory Controller (UMC) relative
"normalized" address is reported through MCA_ADDR of UMC SMCA bank type
on occurrence of a DRAM ECC error. This address must be converted into
system physical address and DRAM address to export additional information
about the error.
Add support to convert normalized address into DRAM address through the
appropriate PRM handler. Instead of logging the translated DRAM address
locally, register the translating function when the Address Translation
library is initialized. Modules like amd64_edac can then invoke the PRM
handler to add the DRAM address to their error records. Additionally, it
can also be exported through the RAS tracepont.
[1] https://bugzilla.kernel.org/show_bug.cgi?id=220577
[Yazen: Remove 'handler available' check]
Signed-off-by: Avadhut Naik <avadhut.naik@amd.com>
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
drivers/ras/amd/atl/core.c | 3 ++-
drivers/ras/amd/atl/internal.h | 11 ++++++++++-
drivers/ras/amd/atl/prm.c | 32 ++++++++++++++++++++++++++++----
drivers/ras/amd/atl/system.c | 3 +++
drivers/ras/amd/atl/umc.c | 9 +++++++++
drivers/ras/ras.c | 18 ++++++++++++++++--
include/linux/ras.h | 19 ++++++++++++++++++-
7 files changed, 86 insertions(+), 9 deletions(-)
diff --git a/drivers/ras/amd/atl/core.c b/drivers/ras/amd/atl/core.c
index 0f7cd6dab0b0..3d622e6a6cc5 100644
--- a/drivers/ras/amd/atl/core.c
+++ b/drivers/ras/amd/atl/core.c
@@ -210,7 +210,8 @@ static int __init amd_atl_init(void)
/* Increment this module's recount so that it can't be easily unloaded. */
__module_get(THIS_MODULE);
- amd_atl_register_decoder(convert_umc_mca_addr_to_sys_addr);
+ amd_atl_register_decoder(convert_umc_mca_addr_to_sys_addr,
+ convert_umc_mca_addr_to_dram_addr);
pr_info("AMD Address Translation Library initialized\n");
return 0;
diff --git a/drivers/ras/amd/atl/internal.h b/drivers/ras/amd/atl/internal.h
index 82a56d9c2be1..b6ca5fef6ec7 100644
--- a/drivers/ras/amd/atl/internal.h
+++ b/drivers/ras/amd/atl/internal.h
@@ -280,23 +280,32 @@ int dehash_address(struct addr_ctx *ctx);
unsigned long norm_to_sys_addr(u8 socket_id, u8 die_id, u8 coh_st_inst_id, unsigned long addr);
unsigned long convert_umc_mca_addr_to_sys_addr(struct atl_err *err);
+int convert_umc_mca_addr_to_dram_addr(struct atl_err *err, struct atl_dram_addr *dram_addr);
u64 add_base_and_hole(struct addr_ctx *ctx, u64 addr);
u64 remove_base_and_hole(struct addr_ctx *ctx, u64 addr);
/* GUIDs for PRM handlers */
extern const guid_t norm_to_sys_guid;
+extern const guid_t norm_to_dram_guid;
#ifdef CONFIG_AMD_ATL_PRM
unsigned long prm_umc_norm_to_sys_addr(u8 socket_id, u64 umc_bank_inst_id, unsigned long addr);
+int prm_umc_norm_to_dram_addr(u8 socket_id, u64 bank_id,
+ unsigned long addr, struct atl_dram_addr *dram_addr);
#else
static inline unsigned long prm_umc_norm_to_sys_addr(u8 socket_id, u64 umc_bank_inst_id,
unsigned long addr)
{
return -ENODEV;
}
-#endif
+static inline int prm_umc_norm_to_dram_addr(u8 socket_id, u64 bank_id,
+ unsigned long addr, struct atl_dram_addr *dram_addr)
+{
+ return -ENODEV;
+}
+#endif
/*
* Make a gap in @data that is @num_bits long starting at @bit_num.
* e.g. data = 11111111'b
diff --git a/drivers/ras/amd/atl/prm.c b/drivers/ras/amd/atl/prm.c
index 0f9bfa96e16a..c69158f66639 100644
--- a/drivers/ras/amd/atl/prm.c
+++ b/drivers/ras/amd/atl/prm.c
@@ -19,10 +19,11 @@
#include <linux/prmt.h>
/*
- * PRM parameter buffer - normalized to system physical address, as described
- * in the "PRM Parameter Buffer" section of the AMD ACPI Porting Guide.
+ * PRM parameter buffer - normalized to system physical address and normalized
+ * to DRAM address, as described in the "PRM Parameter Buffer" section of the
+ * AMD ACPI Porting Guide.
*/
-struct norm_to_sys_param_buf {
+struct prm_parameter_buffer {
u64 norm_addr;
u8 socket;
u64 bank_id;
@@ -31,7 +32,7 @@ struct norm_to_sys_param_buf {
unsigned long prm_umc_norm_to_sys_addr(u8 socket_id, u64 bank_id, unsigned long addr)
{
- struct norm_to_sys_param_buf p_buf;
+ struct prm_parameter_buffer p_buf;
unsigned long ret_addr;
int ret;
@@ -51,3 +52,26 @@ unsigned long prm_umc_norm_to_sys_addr(u8 socket_id, u64 bank_id, unsigned long
return ret;
}
+
+int prm_umc_norm_to_dram_addr(u8 socket_id, u64 bank_id,
+ unsigned long addr, struct atl_dram_addr *dram_addr)
+{
+ struct prm_parameter_buffer p_buf;
+ int ret;
+
+ p_buf.norm_addr = addr;
+ p_buf.socket = socket_id;
+ p_buf.bank_id = bank_id;
+ p_buf.out_buf = dram_addr;
+
+ ret = acpi_call_prm_handler(norm_to_dram_guid, &p_buf);
+ if (!ret)
+ return ret;
+
+ if (ret == -ENODEV)
+ pr_debug("PRM module/handler not available.\n");
+ else
+ pr_notice_once("PRM DRAM Address Translation failed.\n");
+
+ return ret;
+}
diff --git a/drivers/ras/amd/atl/system.c b/drivers/ras/amd/atl/system.c
index 812a30e21d3a..33a04f3e7da8 100644
--- a/drivers/ras/amd/atl/system.c
+++ b/drivers/ras/amd/atl/system.c
@@ -17,6 +17,9 @@
const guid_t norm_to_sys_guid = GUID_INIT(0xE7180659, 0xA65D, 0x451D,
0x92, 0xCD, 0x2B, 0x56, 0xF1,
0x2B, 0xEB, 0xA6);
+const guid_t norm_to_dram_guid = GUID_INIT(0x7626C6AE, 0xF973, 0x429C,
+ 0xA9, 0x1C, 0x10, 0x7D, 0x7B,
+ 0xE2, 0x98, 0xB0);
int determine_node_id(struct addr_ctx *ctx, u8 socket_id, u8 die_id)
{
diff --git a/drivers/ras/amd/atl/umc.c b/drivers/ras/amd/atl/umc.c
index befc616d5e8a..b48c0fe97bf2 100644
--- a/drivers/ras/amd/atl/umc.c
+++ b/drivers/ras/amd/atl/umc.c
@@ -416,3 +416,12 @@ unsigned long convert_umc_mca_addr_to_sys_addr(struct atl_err *err)
return norm_to_sys_addr(socket_id, die_id, coh_st_inst_id, addr);
}
+
+int convert_umc_mca_addr_to_dram_addr(struct atl_err *err, struct atl_dram_addr *dram_addr)
+{
+ u8 socket_id = topology_physical_package_id(err->cpu);
+ unsigned long addr = get_addr(err->addr);
+ u64 bank_id = err->ipid;
+
+ return prm_umc_norm_to_dram_addr(socket_id, bank_id, addr, dram_addr);
+}
diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c
index 03df3db62334..582aa2b93e81 100644
--- a/drivers/ras/ras.c
+++ b/drivers/ras/ras.c
@@ -19,15 +19,20 @@
*/
static unsigned long (*amd_atl_umc_na_to_spa)(struct atl_err *err);
-void amd_atl_register_decoder(unsigned long (*f)(struct atl_err *))
+static int (*amd_atl_umc_na_to_dram_addr)(struct atl_err *err, struct atl_dram_addr *dram_addr);
+
+void amd_atl_register_decoder(unsigned long (*f1)(struct atl_err *),
+ int (*f2)(struct atl_err *, struct atl_dram_addr *))
{
- amd_atl_umc_na_to_spa = f;
+ amd_atl_umc_na_to_spa = f1;
+ amd_atl_umc_na_to_dram_addr = f2;
}
EXPORT_SYMBOL_GPL(amd_atl_register_decoder);
void amd_atl_unregister_decoder(void)
{
amd_atl_umc_na_to_spa = NULL;
+ amd_atl_umc_na_to_dram_addr = NULL;
}
EXPORT_SYMBOL_GPL(amd_atl_unregister_decoder);
@@ -39,6 +44,15 @@ unsigned long amd_convert_umc_mca_addr_to_sys_addr(struct atl_err *err)
return amd_atl_umc_na_to_spa(err);
}
EXPORT_SYMBOL_GPL(amd_convert_umc_mca_addr_to_sys_addr);
+
+int amd_convert_umc_mca_addr_to_dram_addr(struct atl_err *err, struct atl_dram_addr *dram_addr)
+{
+ if (!amd_atl_umc_na_to_dram_addr)
+ return -EINVAL;
+
+ return amd_atl_umc_na_to_dram_addr(err, dram_addr);
+}
+EXPORT_SYMBOL_GPL(amd_convert_umc_mca_addr_to_dram_addr);
#endif /* CONFIG_AMD_ATL */
#define CREATE_TRACE_POINTS
diff --git a/include/linux/ras.h b/include/linux/ras.h
index 468941bfe855..1e82a94b0db0 100644
--- a/include/linux/ras.h
+++ b/include/linux/ras.h
@@ -41,15 +41,32 @@ struct atl_err {
u32 cpu;
};
+struct atl_dram_addr {
+ u8 chip_select;
+ u8 bank_group;
+ u8 bank_addr;
+ u32 row_addr;
+ u16 col_addr;
+ u8 rank_mul;
+ u8 sub_ch;
+} __packed;
+
#if IS_ENABLED(CONFIG_AMD_ATL)
-void amd_atl_register_decoder(unsigned long (*f)(struct atl_err *));
+void amd_atl_register_decoder(unsigned long (*f1)(struct atl_err *),
+ int (*f2)(struct atl_err *, struct atl_dram_addr *));
void amd_atl_unregister_decoder(void);
void amd_retire_dram_row(struct atl_err *err);
unsigned long amd_convert_umc_mca_addr_to_sys_addr(struct atl_err *err);
+int amd_convert_umc_mca_addr_to_dram_addr(struct atl_err *err, struct atl_dram_addr *dram_addr);
#else
static inline void amd_retire_dram_row(struct atl_err *err) { }
static inline unsigned long
amd_convert_umc_mca_addr_to_sys_addr(struct atl_err *err) { return -EINVAL; }
+static inline int amd_convert_umc_mca_addr_to_dram_addr(struct atl_err *err,
+ struct atl_dram_addr *dram_addr)
+{
+ return -EINVAL;
+}
#endif /* CONFIG_AMD_ATL */
#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)
--
2.53.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v6 2/3] RAS/AMD/ATL: Translate UMC normalized address to DRAM address using PRM
2026-06-29 15:07 ` [PATCH v6 2/3] RAS/AMD/ATL: Translate UMC normalized address to DRAM address using PRM Yazen Ghannam
@ 2026-06-30 5:33 ` Borislav Petkov
2026-06-30 14:48 ` Yazen Ghannam
0 siblings, 1 reply; 8+ messages in thread
From: Borislav Petkov @ 2026-06-30 5:33 UTC (permalink / raw)
To: Yazen Ghannam; +Cc: linux-edac, linux-kernel, Avadhut Naik
On Mon, Jun 29, 2026 at 11:07:30AM -0400, Yazen Ghannam wrote:
> @@ -210,7 +210,8 @@ static int __init amd_atl_init(void)
>
> /* Increment this module's recount so that it can't be easily unloaded. */
> __module_get(THIS_MODULE);
> - amd_atl_register_decoder(convert_umc_mca_addr_to_sys_addr);
> + amd_atl_register_decoder(convert_umc_mca_addr_to_sys_addr,
> + convert_umc_mca_addr_to_dram_addr);
This thing with passing in a function pointer from mce_amd was a hack back
then. Now we're doing this here and we're passing in another pointer too.
Yeah, let's rip it out and have users of the decoding library call the library
directly.
Oh, and let's shorten those function names somewhat:
amd_convert_umc_mca_addr_to_dram_addr is an unreadable mouthful.
Diff ontop:
---
diff --git a/drivers/ras/amd/atl/core.c b/drivers/ras/amd/atl/core.c
index 3d622e6a6cc5..96189915b47e 100644
--- a/drivers/ras/amd/atl/core.c
+++ b/drivers/ras/amd/atl/core.c
@@ -192,6 +192,18 @@ static const struct x86_cpu_id amd_atl_cpuids[] = {
};
MODULE_DEVICE_TABLE(x86cpu, amd_atl_cpuids);
+unsigned long amd_convert_umc_addr_to_sys_addr(struct atl_err *err)
+{
+ return convert_umc_mca_addr_to_sys_addr(err);
+}
+EXPORT_SYMBOL_GPL(amd_convert_umc_addr_to_sys_addr);
+
+int amd_convert_umc_addr_to_dram_addr(struct atl_err *err, struct atl_dram_addr *dram_addr)
+{
+ return convert_umc_mca_addr_to_dram_addr(err, dram_addr);
+}
+EXPORT_SYMBOL_GPL(amd_convert_umc_addr_to_dram_addr);
+
static int __init amd_atl_init(void)
{
int ret;
@@ -210,24 +222,12 @@ static int __init amd_atl_init(void)
/* Increment this module's recount so that it can't be easily unloaded. */
__module_get(THIS_MODULE);
- amd_atl_register_decoder(convert_umc_mca_addr_to_sys_addr,
- convert_umc_mca_addr_to_dram_addr);
pr_info("AMD Address Translation Library initialized\n");
return 0;
}
-/*
- * Exit function is only needed for testing and debug. Module unload must be
- * forced to override refcount check.
- */
-static void __exit amd_atl_exit(void)
-{
- amd_atl_unregister_decoder();
-}
-
module_init(amd_atl_init);
-module_exit(amd_atl_exit);
MODULE_DESCRIPTION("AMD Address Translation Library");
MODULE_LICENSE("GPL");
diff --git a/drivers/ras/amd/atl/umc.c b/drivers/ras/amd/atl/umc.c
index b48c0fe97bf2..f8470d74a9b0 100644
--- a/drivers/ras/amd/atl/umc.c
+++ b/drivers/ras/amd/atl/umc.c
@@ -318,7 +318,7 @@ static void _retire_row_mi300(struct atl_err *a_err)
a_err->addr &= ~MI300_UMC_MCA_COL;
a_err->addr |= FIELD_PREP(MI300_UMC_MCA_COL, col);
- addr = amd_convert_umc_mca_addr_to_sys_addr(a_err);
+ addr = amd_convert_umc_addr_to_sys_addr(a_err);
if (IS_ERR_VALUE(addr))
continue;
diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c
index 582aa2b93e81..011de2c257b1 100644
--- a/drivers/ras/ras.c
+++ b/drivers/ras/ras.c
@@ -10,51 +10,6 @@
#include <linux/ras.h>
#include <linux/uuid.h>
-#if IS_ENABLED(CONFIG_AMD_ATL)
-/*
- * Once set, this function pointer should never be unset.
- *
- * The library module will set this pointer if it successfully loads. The module
- * should not be unloaded except for testing and debug purposes.
- */
-static unsigned long (*amd_atl_umc_na_to_spa)(struct atl_err *err);
-
-static int (*amd_atl_umc_na_to_dram_addr)(struct atl_err *err, struct atl_dram_addr *dram_addr);
-
-void amd_atl_register_decoder(unsigned long (*f1)(struct atl_err *),
- int (*f2)(struct atl_err *, struct atl_dram_addr *))
-{
- amd_atl_umc_na_to_spa = f1;
- amd_atl_umc_na_to_dram_addr = f2;
-}
-EXPORT_SYMBOL_GPL(amd_atl_register_decoder);
-
-void amd_atl_unregister_decoder(void)
-{
- amd_atl_umc_na_to_spa = NULL;
- amd_atl_umc_na_to_dram_addr = NULL;
-}
-EXPORT_SYMBOL_GPL(amd_atl_unregister_decoder);
-
-unsigned long amd_convert_umc_mca_addr_to_sys_addr(struct atl_err *err)
-{
- if (!amd_atl_umc_na_to_spa)
- return -EINVAL;
-
- return amd_atl_umc_na_to_spa(err);
-}
-EXPORT_SYMBOL_GPL(amd_convert_umc_mca_addr_to_sys_addr);
-
-int amd_convert_umc_mca_addr_to_dram_addr(struct atl_err *err, struct atl_dram_addr *dram_addr)
-{
- if (!amd_atl_umc_na_to_dram_addr)
- return -EINVAL;
-
- return amd_atl_umc_na_to_dram_addr(err, dram_addr);
-}
-EXPORT_SYMBOL_GPL(amd_convert_umc_mca_addr_to_dram_addr);
-#endif /* CONFIG_AMD_ATL */
-
#define CREATE_TRACE_POINTS
#define TRACE_INCLUDE_PATH ../../include/ras
#include <ras/ras_event.h>
diff --git a/include/linux/ras.h b/include/linux/ras.h
index 1e82a94b0db0..ce2327229515 100644
--- a/include/linux/ras.h
+++ b/include/linux/ras.h
@@ -52,18 +52,14 @@ struct atl_dram_addr {
} __packed;
#if IS_ENABLED(CONFIG_AMD_ATL)
-void amd_atl_register_decoder(unsigned long (*f1)(struct atl_err *),
- int (*f2)(struct atl_err *, struct atl_dram_addr *));
-void amd_atl_unregister_decoder(void);
void amd_retire_dram_row(struct atl_err *err);
-unsigned long amd_convert_umc_mca_addr_to_sys_addr(struct atl_err *err);
-int amd_convert_umc_mca_addr_to_dram_addr(struct atl_err *err, struct atl_dram_addr *dram_addr);
+unsigned long amd_convert_umc_addr_to_sys_addr(struct atl_err *err);
+int amd_convert_umc_addr_to_dram_addr(struct atl_err *err, struct atl_dram_addr *dram_addr);
#else
static inline void amd_retire_dram_row(struct atl_err *err) { }
static inline unsigned long
-amd_convert_umc_mca_addr_to_sys_addr(struct atl_err *err) { return -EINVAL; }
-static inline int amd_convert_umc_mca_addr_to_dram_addr(struct atl_err *err,
- struct atl_dram_addr *dram_addr)
+amd_convert_umc_addr_to_sys_addr(struct atl_err *err) { return -EINVAL; }
+static inline int amd_convert_umc_addr_to_dram_addr(struct atl_err *err, struct atl_dram_addr *dram_addr)
{
return -EINVAL;
}
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v6 2/3] RAS/AMD/ATL: Translate UMC normalized address to DRAM address using PRM
2026-06-30 5:33 ` Borislav Petkov
@ 2026-06-30 14:48 ` Yazen Ghannam
2026-06-30 18:55 ` Borislav Petkov
0 siblings, 1 reply; 8+ messages in thread
From: Yazen Ghannam @ 2026-06-30 14:48 UTC (permalink / raw)
To: Borislav Petkov; +Cc: linux-edac, linux-kernel, Avadhut Naik
On Mon, Jun 29, 2026 at 10:33:39PM -0700, Borislav Petkov wrote:
> On Mon, Jun 29, 2026 at 11:07:30AM -0400, Yazen Ghannam wrote:
> > @@ -210,7 +210,8 @@ static int __init amd_atl_init(void)
> >
> > /* Increment this module's recount so that it can't be easily unloaded. */
> > __module_get(THIS_MODULE);
> > - amd_atl_register_decoder(convert_umc_mca_addr_to_sys_addr);
> > + amd_atl_register_decoder(convert_umc_mca_addr_to_sys_addr,
> > + convert_umc_mca_addr_to_dram_addr);
>
> This thing with passing in a function pointer from mce_amd was a hack back
> then. Now we're doing this here and we're passing in another pointer too.
> Yeah, let's rip it out and have users of the decoding library call the library
> directly.
>
> Oh, and let's shorten those function names somewhat:
> amd_convert_umc_mca_addr_to_dram_addr is an unreadable mouthful.
>
> Diff ontop:
Overall, looks good.
There are some minor formatting and build issues. I can send a v7 with
those fixed.
Thanks,
Yazen
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v6 3/3] EDAC/amd64: Include DRAM address in output
2026-06-29 15:07 [PATCH v6 0/3] Incorporate DRAM address in EDAC messages Yazen Ghannam
2026-06-29 15:07 ` [PATCH v6 1/3] EDAC: Remove fake_inject debugfs interface Yazen Ghannam
2026-06-29 15:07 ` [PATCH v6 2/3] RAS/AMD/ATL: Translate UMC normalized address to DRAM address using PRM Yazen Ghannam
@ 2026-06-29 15:07 ` Yazen Ghannam
2 siblings, 0 replies; 8+ messages in thread
From: Yazen Ghannam @ 2026-06-29 15:07 UTC (permalink / raw)
To: bp, linux-edac; +Cc: linux-kernel, Avadhut Naik, Yazen Ghannam
From: Avadhut Naik <avadhut.naik@amd.com>
The DRAM address of an error is used by tooling to find failure
patterns. This information can be used for general analysis off system.
And it can be used on system to take action like offline a page affected
by a bad row.
Other EDAC modules (GHES and SKX) provide this information in their
output. The AMD64 EDAC module was not able to provide this information,
because system-specific translation is needed.
Recent AMD systems provide a PRM handler for DRAM address translation.
Use this PRM handler to get the DRAM address of an error. Include this
in the EDAC "other_detail" field.
Also include the Socket and IPID in the EDAC "other_detail" field. These
are needed by tooling to translate a DRAM address to a System Physical
Address.
[Yazen: Reformat other_detail string]
Signed-off-by: Avadhut Naik <avadhut.naik@amd.com>
Co-developed-by: Yazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
drivers/edac/amd64_edac.c | 32 +++++++++++++++++++++++++++++++-
drivers/edac/amd64_edac.h | 3 +++
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index c6aa69dbd9fb..ed5e71e3c6a2 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -2704,11 +2704,16 @@ static int get_channel_from_ecc_syndrome(struct mem_ctl_info *mci, u16 syndrome)
return map_err_sym_to_channel(err_sym, pvt->ecc_sym_sz);
}
+#define MSG_SIZE 512
+
static void __log_ecc_error(struct mem_ctl_info *mci, struct err_info *err,
u8 ecc_type)
{
enum hw_event_mc_err_type err_type;
const char *string;
+ char s[MSG_SIZE];
+
+ memset(s, 0, sizeof(s));
if (ecc_type == 2)
err_type = HW_EVENT_ERR_CORRECTED;
@@ -2721,6 +2726,23 @@ static void __log_ecc_error(struct mem_ctl_info *mci, struct err_info *err,
return;
}
+ if (err->dram_addr) {
+ struct atl_dram_addr *da = err->dram_addr;
+ char *p = s, *end = p + sizeof(s);
+
+ /* Include a version prefix in case the format needs to change later. */
+ p += scnprintf(p, end - p, " [AMDv1]");
+ p += scnprintf(p, end - p, " %s:0x%x", "SocketId", err->socketid);
+ p += scnprintf(p, end - p, " %s:0x%llx", "IPID", err->ipid);
+ p += scnprintf(p, end - p, " %s:0x%x", "ChipSelect", da->chip_select);
+ p += scnprintf(p, end - p, " %s:0x%x", "Row", da->row_addr);
+ p += scnprintf(p, end - p, " %s:0x%x", "Column", da->col_addr);
+ p += scnprintf(p, end - p, " %s:0x%x", "Bank", da->bank_addr);
+ p += scnprintf(p, end - p, " %s:0x%x", "BankGroup", da->bank_group);
+ p += scnprintf(p, end - p, " %s:0x%x", "RankMul", da->rank_mul);
+ p += scnprintf(p, end - p, " %s:0x%x", "SubChannel", da->sub_ch);
+ }
+
switch (err->err_code) {
case DECODE_OK:
string = "";
@@ -2748,7 +2770,7 @@ static void __log_ecc_error(struct mem_ctl_info *mci, struct err_info *err,
edac_mc_handle_error(err_type, mci, 1,
err->page, err->offset, err->syndrome,
err->csrow, err->channel, -1,
- string, "");
+ string, s);
}
static inline void decode_bus_error(int node_id, struct mce *m)
@@ -2808,6 +2830,7 @@ static void umc_get_err_info(struct mce *m, struct err_info *err)
static void decode_umc_error(int node_id, struct mce *m)
{
u8 ecc_type = (m->status >> 45) & 0x3;
+ struct atl_dram_addr dram_addr;
struct mem_ctl_info *mci;
unsigned long sys_addr;
struct amd64_pvt *pvt;
@@ -2822,8 +2845,12 @@ static void decode_umc_error(int node_id, struct mce *m)
pvt = mci->pvt_info;
+ memset(&dram_addr, 0, sizeof(dram_addr));
memset(&err, 0, sizeof(err));
+ err.socketid = m->socketid;
+ err.ipid = m->ipid;
+
if (m->status & MCI_STATUS_DEFERRED)
ecc_type = 3;
@@ -2853,6 +2880,9 @@ static void decode_umc_error(int node_id, struct mce *m)
goto log_error;
}
+ if (!amd_convert_umc_mca_addr_to_dram_addr(&a_err, &dram_addr))
+ err.dram_addr = &dram_addr;
+
error_address_to_page_and_offset(sys_addr, &err);
log_error:
diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h
index 1757c1b99fc8..39c1b6471909 100644
--- a/drivers/edac/amd64_edac.h
+++ b/drivers/edac/amd64_edac.h
@@ -400,6 +400,9 @@ struct err_info {
u16 syndrome;
u32 page;
u32 offset;
+ struct atl_dram_addr *dram_addr;
+ u32 socketid;
+ u64 ipid;
};
static inline u32 get_umc_base(u8 channel)
--
2.53.0
^ permalink raw reply related [flat|nested] 8+ messages in thread