[PATCH v7 2/4] EDAC/loongson: Encode node and MC info into mc_idx
From: Qunqin Zhao
Date: Thu Nov 12 2026 - 02:37:14 EST
From: Wang Jinwei <wangjinwei@xxxxxxxxxxx>
On Loongson multi-node systems, memory controllers are distributed across
multiple nodes. Encode node and MC information into mc_idx so that sysfs
entries uniquely identify each controller.
The driver gets mc-idx from ACPI _DSD property if firmware provides it.
If not, it falls back to edac_device_alloc_index() for legacy firmware
compatibility.
The number of memory controllers per node (mcs-per-node) is obtained
from firmware via ACPI _DSD property, with a default of 4 for backward
compatibility. Validate that the firmware-provided value is non-zero to
prevent division by zero. The node and MC IDs are decoded from mc_idx:
node = mc_idx / mcs_per_node
mc = mc_idx % mcs_per_node
Cc: Yulong Wang <wangyulong@xxxxxxxxxxx>
Cc: Dongyan Qian <qiandongyan@xxxxxxxxxxx>
Cc: Chao Li <lichao@xxxxxxxxxxx>
Signed-off-by: Wang Jinwei <wangjinwei@xxxxxxxxxxx>
Signed-off-by: Qunqin Zhao <zhaoqunqin@xxxxxxxxxxx>
---
drivers/edac/loongson_edac.c | 30 +++++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/drivers/edac/loongson_edac.c b/drivers/edac/loongson_edac.c
index 5dfa41e877..4ee9dcb3d5 100644
--- a/drivers/edac/loongson_edac.c
+++ b/drivers/edac/loongson_edac.c
@@ -9,10 +9,14 @@
#include <linux/io-64-nonatomic-lo-hi.h>
#include <linux/module.h>
#include <linux/platform_device.h>
+#include <linux/property.h>
#include "edac_module.h"
#define ECC_CS_COUNT_REG 0x18
+/* Memory controller index invalid due to inability to read it from ACPI, etc */
+#define MC_IDX_INVALID BIT(16)
+
struct loongson_pvt {
void __iomem *ecc_base;
@@ -23,6 +27,7 @@ struct loongson_pvt {
* register state.
*/
int last_ce_count;
+ u32 mcs_per_node;
};
static int read_ecc(struct mem_ctl_info *mci)
@@ -44,7 +49,8 @@ static int read_ecc(struct mem_ctl_info *mci)
static void loongson_check(struct mem_ctl_info *mci)
{
struct loongson_pvt *pvt = mci->pvt_info;
- int new, add;
+ char other_detail[64] = {0};
+ int new, add, node, mc;
new = read_ecc(mci);
add = new - pvt->last_ce_count;
@@ -52,8 +58,14 @@ static void loongson_check(struct mem_ctl_info *mci)
if (add <= 0)
return;
+ if (mci->mc_idx < MC_IDX_INVALID) {
+ node = mci->mc_idx / pvt->mcs_per_node;
+ mc = mci->mc_idx % pvt->mcs_per_node;
+ snprintf(other_detail, sizeof(other_detail), "node:%d mc:%d", node, mc);
+ }
+
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, add,
- 0, 0, 0, 0, 0, -1, "error", "");
+ 0, 0, 0, 0, 0, -1, "error", other_detail);
}
static void dimm_config_init(struct mem_ctl_info *mci)
@@ -72,19 +84,22 @@ static void dimm_config_init(struct mem_ctl_info *mci)
dimm->grain = 8;
}
-static void pvt_init(struct mem_ctl_info *mci, void __iomem *vbase)
+static void pvt_init(struct mem_ctl_info *mci, void __iomem *vbase, u32 mcs_per_node)
{
struct loongson_pvt *pvt = mci->pvt_info;
pvt->ecc_base = vbase;
pvt->last_ce_count = read_ecc(mci);
+ pvt->mcs_per_node = mcs_per_node;
}
static int loongson_probe(struct platform_device *pdev)
{
struct edac_mc_layer layers[2];
struct mem_ctl_info *mci;
+ struct device *dev = &pdev->dev;
void __iomem *vbase;
+ u32 mcs_per_node;
int ret;
vbase = devm_platform_ioremap_resource(pdev, 0);
@@ -102,7 +117,6 @@ static int loongson_probe(struct platform_device *pdev)
if (mci == NULL)
return -ENOMEM;
- mci->mc_idx = edac_device_alloc_index();
mci->mtype_cap = MEM_FLAG_RDDR4;
mci->edac_ctl_cap = EDAC_FLAG_NONE;
mci->edac_cap = EDAC_FLAG_NONE;
@@ -114,7 +128,13 @@ static int loongson_probe(struct platform_device *pdev)
mci->error_desc.grain = 8;
mci->edac_check = loongson_check;
- pvt_init(mci, vbase);
+ if (device_property_read_u32(dev, "mc-idx", &mci->mc_idx))
+ mci->mc_idx = edac_device_alloc_index() | MC_IDX_INVALID;
+
+ if (device_property_read_u32(dev, "mcs-per-node", &mcs_per_node) || mcs_per_node == 0)
+ mcs_per_node = 4;
+
+ pvt_init(mci, vbase, mcs_per_node);
dimm_config_init(mci);
ret = edac_mc_add_mc(mci);
--
2.47.2