Commit 972361e3 authored by Beleswar Padhi's avatar Beleswar Padhi Committed by Mathieu Poirier
Browse files

remoteproc: k3-r5: Add devm action to release reserved memory 



Use a device lifecycle managed action to release reserved memory. This
helps prevent mistakes like releasing out of order in cleanup functions
and forgetting to release on error paths.

Signed-off-by: default avatarBeleswar Padhi <b-padhi@ti.com>
Reviewed-by: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20241219110545.1898883-2-b-padhi@ti.com


Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent dbb9c372

drivers/remoteproc/ti_k3_r5_remoteproc.c

+13 −8
Original line number Diff line number Diff line
@@ -955,6 +955,13 @@ static int k3_r5_rproc_configure(struct k3_r5_rproc *kproc) 
	return ret;

}



static void k3_r5_mem_release(void *data)

{

	struct device *dev = data;



	of_reserved_mem_device_release(dev);

}



static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc)

{

	struct device *dev = kproc->dev;
@@ -985,12 +992,14 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc) 
		return ret;

	}



	ret = devm_add_action_or_reset(dev, k3_r5_mem_release, dev);

	if (ret)

		return ret;



	num_rmems--;

	kproc->rmem = kcalloc(num_rmems, sizeof(*kproc->rmem), GFP_KERNEL);

	if (!kproc->rmem) {

		ret = -ENOMEM;

		goto release_rmem;

	}

	if (!kproc->rmem)

		return -ENOMEM;



	/* use remaining reserved memory regions for static carveouts */

	for (i = 0; i < num_rmems; i++) {
@@ -1041,8 +1050,6 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc) 
	for (i--; i >= 0; i--)

		iounmap(kproc->rmem[i].cpu_addr);

	kfree(kproc->rmem);

release_rmem:

	of_reserved_mem_device_release(dev);

	return ret;

}
@@ -1053,8 +1060,6 @@ static void k3_r5_reserved_mem_exit(struct k3_r5_rproc *kproc) 
	for (i = 0; i < kproc->num_rmems; i++)

		iounmap(kproc->rmem[i].cpu_addr);

	kfree(kproc->rmem);



	of_reserved_mem_device_release(kproc->dev);

}



/*