[PATCH v2 12/12] EDAC/versalnet: Make get_ddr_config() return errors

From: Shubhrajyoti Datta

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


get_ddr_config() invokes cdx_mcdi_rpc() but ignores its return value,
and proceeds even if the cdx_mcdi_rpc returned errors. Also it
copies the data out of the response buffer without checking that
the firmware actually returned that much data.

Make get_ddr_config() return an int: propagate cdx_mcdi_rpc()'s
return code on failure, and return -EIO if the response is shorter
than expected. Update mc_probe() to check the return value and bail
out through the existing error path on failure.

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

Changes in v2:
New patch added to bailout if the cdx_mcdi_rpc fails.

drivers/edac/versalnet_edac.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/drivers/edac/versalnet_edac.c b/drivers/edac/versalnet_edac.c
index c2025f5744cc..ac6e926a1918 100644
--- a/drivers/edac/versalnet_edac.c
+++ b/drivers/edac/versalnet_edac.c
@@ -587,7 +587,7 @@ static const struct cdx_mcdi_ops mcdi_ops = {
.mcdi_request = mcdi_request,
};

-static void get_ddr_config(u32 index, u32 *buffer, struct cdx_mcdi *amd_mcdi)
+static int get_ddr_config(u32 index, u32 *buffer, struct cdx_mcdi *amd_mcdi)
{
size_t outlen;
int ret;
@@ -599,9 +599,15 @@ static void get_ddr_config(u32 index, u32 *buffer, struct cdx_mcdi *amd_mcdi)

ret = cdx_mcdi_rpc(amd_mcdi, MC_CMD_EDAC_GET_DDR_CONFIG, inbuf, sizeof(inbuf),
outbuf, sizeof(outbuf), &outlen);
- if (!ret)
- memcpy(buffer, MCDI_PTR(outbuf, GET_DDR_CONFIG),
- (ADEC_NUM * 4));
+ if (ret)
+ return ret;
+
+ if (outlen < MC_CMD_GET_DDR_CONFIG_OFST + ADEC_NUM * 4)
+ return -EIO;
+
+ memcpy(buffer, MCDI_PTR(outbuf, GET_DDR_CONFIG), (ADEC_NUM * 4));
+
+ return 0;
}

static int setup_mcdi(struct mc_priv *mc_priv)
@@ -1043,8 +1049,11 @@ static int mc_probe(struct platform_device *pdev)

priv->mcdi->r5_rproc = rp;

- for (i = 0; i < priv->num_ctrl; i++)
- get_ddr_config(i, &priv->adec[ADEC_NUM * i], priv->mcdi);
+ for (i = 0; i < priv->num_ctrl; i++) {
+ rc = get_ddr_config(i, &priv->adec[ADEC_NUM * i], priv->mcdi);
+ if (rc)
+ goto err_init;
+ }

rc = init_versalnet(priv);
if (rc)
--
2.44.4