Commit 62a9fc50 authored by Shubhrajyoti Datta's avatar Shubhrajyoti Datta Committed by Borislav Petkov (AMD)
Browse files

EDAC/versalnet: Refactor memory controller initialization and cleanup 



Simplify the initialization and cleanup flow for Versal Net DDRMC
controllers in the EDAC driver by carving out the single controller init
into a separate function which allows for a much better and more
readable error handling and unwinding.

  [ bp:
	- do the kzalloc allocations first
	- "publish" the structures only after they've been initialized
	  properly so that you don't need to unwind unnecessarily when
	  it fails later
	- remove_versalnet() is now trivial
   ]

Signed-off-by: default avatarShubhrajyoti Datta <shubhrajyoti.datta@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://patch.msgid.link/20251104093932.3838876-1-shubhrajyoti.datta@amd.com
parent 6de23f81

drivers/edac/versalnet_edac.c

+97 −77
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ 
#define XDDR5_BUS_WIDTH_32		1

#define XDDR5_BUS_WIDTH_16		2



#define MC_NAME_LEN			32



/**

 * struct ecc_error_info - ECC error log information.

 * @burstpos:		Burst position.
@@ -760,7 +762,17 @@ static void versal_edac_release(struct device *dev) 
	kfree(dev);

}



static int init_versalnet(struct mc_priv *priv, struct platform_device *pdev)

static void remove_one_mc(struct mc_priv *priv, int i)

{

	struct mem_ctl_info *mci;



	mci = priv->mci[i];

	device_unregister(mci->pdev);

	edac_mc_del_mc(mci->pdev);

	edac_mc_free(mci);

}



static int init_one_mc(struct mc_priv *priv, struct platform_device *pdev, int i)

{

	u32 num_chans, rank, dwidth, config;

	struct edac_mc_layer layers[2];
@@ -768,9 +780,8 @@ static int init_versalnet(struct mc_priv *priv, struct platform_device *pdev) 
	struct device *dev;

	enum dev_type dt;

	char *name;

	int rc, i;

	int rc;



	for (i = 0; i < NUM_CONTROLLERS; i++) {

	config = priv->adec[CONF + i * ADEC_NUM];

	num_chans = FIELD_GET(MC5_NUM_CHANS_MASK, config);

	rank = 1 << FIELD_GET(MC5_RANK_MASK, config);
@@ -791,7 +802,7 @@ static int init_versalnet(struct mc_priv *priv, struct platform_device *pdev) 
	}



	if (dt == DEV_UNKNOWN)

			continue;

		return 0;



	/* Find the first enabled device and register that one. */

	layers[0].type = EDAC_MC_LAYER_CHIP_SELECT;
@@ -802,68 +813,77 @@ static int init_versalnet(struct mc_priv *priv, struct platform_device *pdev) 
	layers[1].is_virt_csrow = false;



	rc = -ENOMEM;

		mci = edac_mc_alloc(i, ARRAY_SIZE(layers), layers,

				    sizeof(struct mc_priv));

	name = kzalloc(MC_NAME_LEN, GFP_KERNEL);

	if (!name)

		return rc;



	dev = kzalloc(sizeof(*dev), GFP_KERNEL);

	if (!dev)

		goto err_name_free;



	mci = edac_mc_alloc(i, ARRAY_SIZE(layers), layers, sizeof(struct mc_priv));

	if (!mci) {

		edac_printk(KERN_ERR, EDAC_MC, "Failed memory allocation for MC%d\n", i);

			goto err_alloc;

		goto err_dev_free;

	}



		priv->mci[i] = mci;

		priv->dwidth = dt;



		dev = kzalloc_obj(*dev);

		dev->release = versal_edac_release;

		name = kmalloc(32, GFP_KERNEL);

	sprintf(name, "versal-net-ddrmc5-edac-%d", i);



	dev->init_name = name;

	dev->release = versal_edac_release;



	rc = device_register(dev);

	if (rc)

			goto err_alloc;

		goto err_mc_free;



	mci->pdev = dev;



		platform_set_drvdata(pdev, priv);



	mc_init(mci, dev);



	rc = edac_mc_add_mc(mci);

	if (rc) {

		edac_printk(KERN_ERR, EDAC_MC, "Failed to register MC%d with EDAC core\n", i);

			goto err_alloc;

		}

		goto err_unreg;

	}

	return 0;



err_alloc:

	while (i--) {

		mci = priv->mci[i];

		if (!mci)

			continue;

	priv->mci[i] = mci;

	priv->dwidth = dt;



		if (mci->pdev) {

			device_unregister(mci->pdev);

			edac_mc_del_mc(mci->pdev);

		}

	platform_set_drvdata(pdev, priv);



	return 0;



err_unreg:

	device_unregister(mci->pdev);

err_mc_free:

	edac_mc_free(mci);

	}

err_dev_free:

	kfree(dev);

err_name_free:

	kfree(name);



	return rc;

}



static void remove_versalnet(struct mc_priv *priv)

static int init_versalnet(struct mc_priv *priv, struct platform_device *pdev)

{

	struct mem_ctl_info *mci;

	int i;

	int rc, i;



	for (i = 0; i < NUM_CONTROLLERS; i++) {

		device_unregister(priv->mci[i]->pdev);

		mci = edac_mc_del_mc(priv->mci[i]->pdev);

		if (!mci)

			return;

		rc = init_one_mc(priv, pdev, i);

		if (rc) {

			while (i--)

				remove_one_mc(priv, i);



		edac_mc_free(mci);

			return rc;

		}

	}

	return 0;

}



static void remove_versalnet(struct mc_priv *priv)

{

	for (int i = 0; i < NUM_CONTROLLERS; i++)

		remove_one_mc(priv, i);

}



static int mc_probe(struct platform_device *pdev)