[PATCH v2 05/12] EDAC/versalnet: Make dwidth per-controller

From: Shubhrajyoti Datta

Date: Wed Nov 18 2026 - 09:23:38 EST


Currently dwidth is a single scalar in mc_priv, so each call to
init_one_mc() overwrites the previous controller's value.

Fix this by converting dwidth to a per-controller array and passing
the device type directly to mc_init() from the detected dt.
This also updates the DIMM device type reported in EDAC.

Fixes: d5fe2fec6c40 ("EDAC: Add a driver for the AMD Versal NET DDR controller")
Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xxxxxxx>
---

Changes in v2:
https://sashiko.dev/#/patchset/20260724171945.2812749-1-shubhrajyoti.datta%40amd.com
New patch to fix shashiko review comment "this is a pre-existing
issue, but is the per-controller width overwriting the shared
state for all controllers?".

drivers/edac/versalnet_edac.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/edac/versalnet_edac.c b/drivers/edac/versalnet_edac.c
index 0364648d91a1..ea90d3ce3e70 100644
--- a/drivers/edac/versalnet_edac.c
+++ b/drivers/edac/versalnet_edac.c
@@ -140,7 +140,7 @@ struct ecc_status {
* @stat: ECC status information.
* @error_id: The error id.
* @error_level: The error level.
- * @dwidth: Width of data bus excluding ECC bits.
+ * @dwidth: Per-controller width of data bus excluding ECC bits.
* @part_len: The support of the message received.
* @regs: The registers sent on the rpmsg.
* @adec: Address decode registers.
@@ -153,7 +153,7 @@ struct mc_priv {
struct ecc_status stat;
u32 error_id;
u32 error_level;
- u32 dwidth;
+ enum dev_type dwidth[NUM_CONTROLLERS];
u32 part_len;
u32 regs[REG_MAX];
u32 adec[ADEC_MAX];
@@ -399,7 +399,7 @@ static unsigned long convert_to_physical(struct mc_priv *priv,
else
ilc_base_ctrl_add = ilcmem_base - low_mem_offset;

- if (priv->dwidth == DEV_X16) {
+ if (priv->dwidth[controller] == DEV_X16) {
blk = err_addr / MC5_X16_SIZE;
rsh_req_addr = (blk << 8) + ilc_base_ctrl_add;
err_addr = rsh_req_addr * interleave * 2;
@@ -473,9 +473,9 @@ static void handle_error(struct mc_priv *priv, struct ecc_status *stat,
}
}

-static void mc_init(struct mem_ctl_info *mci, struct device *dev)
+static void mc_init(struct mem_ctl_info *mci, struct device *dev,
+ enum dev_type dtype)
{
- struct mc_priv *priv = mci->pvt_info;
struct csrow_info *csi;
struct dimm_info *dimm;
u32 row;
@@ -501,7 +501,7 @@ static void mc_init(struct mem_ctl_info *mci, struct device *dev)
dimm->edac_mode = EDAC_SECDED;
dimm->mtype = MEM_DDR5;
dimm->grain = MC5_ERR_GRAIN;
- dimm->dtype = priv->dwidth;
+ dimm->dtype = dtype;
}
}
}
@@ -844,7 +844,7 @@ static int init_one_mc(struct mc_priv *priv, struct platform_device *pdev, int i
}

mci->pdev = dev;
- mc_init(mci, dev);
+ mc_init(mci, dev, dt);

rc = edac_mc_add_mc(mci);
if (rc) {
@@ -853,7 +853,7 @@ static int init_one_mc(struct mc_priv *priv, struct platform_device *pdev, int i
}

priv->mci[i] = mci;
- priv->dwidth = dt;
+ priv->dwidth[i] = dt;

platform_set_drvdata(pdev, priv);

--
2.44.4