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

remoteproc: k3-r5: Use devm_ioremap_wc() helper 



Use a device lifecycle managed ioremap helper function. This helps
prevent mistakes like unmapping out of order in cleanup functions and
forgetting to unmap on all 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-4-b-padhi@ti.com


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

drivers/remoteproc/ti_k3_r5_remoteproc.c

+8 −30
Original line number Diff line number Diff line
@@ -1004,17 +1004,13 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc) 
	/* use remaining reserved memory regions for static carveouts */

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

		rmem_np = of_parse_phandle(np, "memory-region", i + 1);

		if (!rmem_np) {

			ret = -EINVAL;

			goto unmap_rmem;

		}

		if (!rmem_np)

			return -EINVAL;



		rmem = of_reserved_mem_lookup(rmem_np);

		of_node_put(rmem_np);

		if (!rmem) {

			ret = -EINVAL;

			goto unmap_rmem;

		}

		if (!rmem)

			return -EINVAL;



		kproc->rmem[i].bus_addr = rmem->base;

		/*
@@ -1029,12 +1025,11 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc) 
		 */

		kproc->rmem[i].dev_addr = (u32)rmem->base;

		kproc->rmem[i].size = rmem->size;

		kproc->rmem[i].cpu_addr = ioremap_wc(rmem->base, rmem->size);

		kproc->rmem[i].cpu_addr = devm_ioremap_wc(dev, rmem->base, rmem->size);

		if (!kproc->rmem[i].cpu_addr) {

			dev_err(dev, "failed to map reserved memory#%d at %pa of size %pa\n",

				i + 1, &rmem->base, &rmem->size);

			ret = -ENOMEM;

			goto unmap_rmem;

			return -ENOMEM;

		}



		dev_dbg(dev, "reserved memory%d: bus addr %pa size 0x%zx va %pK da 0x%x\n",
@@ -1045,19 +1040,6 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc) 
	kproc->num_rmems = num_rmems;



	return 0;



unmap_rmem:

	for (i--; i >= 0; i--)

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

	return ret;

}



static void k3_r5_reserved_mem_exit(struct k3_r5_rproc *kproc)

{

	int i;



	for (i = 0; i < kproc->num_rmems; i++)

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

}



/*
@@ -1286,8 +1268,8 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) 


		ret = rproc_add(rproc);

		if (ret) {

			dev_err(dev, "rproc_add failed, ret = %d\n", ret);

			goto err_add;

			dev_err_probe(dev, ret, "rproc_add failed\n");

			goto out;

		}



		/* create only one rproc in lockstep, single-cpu or
@@ -1333,8 +1315,6 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) 


err_powerup:

	rproc_del(rproc);

err_add:

	k3_r5_reserved_mem_exit(kproc);

out:

	/* undo core0 upon any failures on core1 in split-mode */

	if (cluster->mode == CLUSTER_MODE_SPLIT && core == core1) {
@@ -1379,8 +1359,6 @@ static void k3_r5_cluster_rproc_exit(void *data) 
		mbox_free_channel(kproc->mbox);



		rproc_del(rproc);



		k3_r5_reserved_mem_exit(kproc);

	}

}