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

remoteproc: k3: Refactor reserved_mem_init() functions into common driver 



The reserved_mem_init() implementations in the R5, DSP and M4 remoteproc
drivers initialize the reserved memory regions associated with the
remote processor.

Refactor these functions into the ti_k3_common.c driver as
k3_reserved_mem_init() and use this common function throughout in R5,
DSP and M4 drivers.

Signed-off-by: default avatarBeleswar Padhi <b-padhi@ti.com>
Tested-by: default avatarJudith Mendez <jm@ti.com>
Reviewed-by: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20250513054510.3439842-36-b-padhi@ti.com


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

drivers/remoteproc/ti_k3_common.c

+70 −0
Original line number Diff line number Diff line
@@ -469,5 +469,75 @@ void k3_mem_release(void *data) 
}

EXPORT_SYMBOL_GPL(k3_mem_release);



int k3_reserved_mem_init(struct k3_rproc *kproc)

{

	struct device *dev = kproc->dev;

	struct device_node *np = dev->of_node;

	struct device_node *rmem_np;

	struct reserved_mem *rmem;

	int num_rmems;

	int ret, i;



	num_rmems = of_property_count_elems_of_size(np, "memory-region",

						    sizeof(phandle));

	if (num_rmems < 0) {

		dev_err(dev, "device does not reserved memory regions (%d)\n",

			num_rmems);

		return -EINVAL;

	}

	if (num_rmems < 2) {

		dev_err(dev, "device needs at least two memory regions to be defined, num = %d\n",

			num_rmems);

		return -EINVAL;

	}



	/* use reserved memory region 0 for vring DMA allocations */

	ret = of_reserved_mem_device_init_by_idx(dev, np, 0);

	if (ret) {

		dev_err(dev, "device cannot initialize DMA pool (%d)\n", ret);

		return ret;

	}

	ret = devm_add_action_or_reset(dev, k3_mem_release, dev);

	if (ret)

		return ret;



	num_rmems--;

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

	if (!kproc->rmem)

		return -ENOMEM;



	/* 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)

			return -EINVAL;



		rmem = of_reserved_mem_lookup(rmem_np);

		of_node_put(rmem_np);

		if (!rmem)

			return -EINVAL;



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

		/* 64-bit address regions currently not supported */

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

		kproc->rmem[i].size = 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);

			return -ENOMEM;

		}



		dev_dbg(dev, "reserved memory%d: bus addr %pa size 0x%zx va %pK da 0x%x\n",

			i + 1, &kproc->rmem[i].bus_addr,

			kproc->rmem[i].size, kproc->rmem[i].cpu_addr,

			kproc->rmem[i].dev_addr);

	}

	kproc->num_rmems = num_rmems;



	return 0;

}

EXPORT_SYMBOL_GPL(k3_reserved_mem_init);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("TI K3 common Remoteproc code");

drivers/remoteproc/ti_k3_common.h

+1 −0
Original line number Diff line number Diff line
@@ -113,4 +113,5 @@ void *k3_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, 
int k3_rproc_of_get_memories(struct platform_device *pdev,

			     struct k3_rproc *kproc);

void k3_mem_release(void *data);

int k3_reserved_mem_init(struct k3_rproc *kproc);

#endif /* REMOTEPROC_TI_K3_COMMON_H */

drivers/remoteproc/ti_k3_dsp_remoteproc.c

+1 −71
Original line number Diff line number Diff line
@@ -66,76 +66,6 @@ static const struct rproc_ops k3_dsp_rproc_ops = { 
	.get_loaded_rsc_table	= k3_get_loaded_rsc_table,

};



static int k3_dsp_reserved_mem_init(struct k3_rproc *kproc)

{

	struct device *dev = kproc->dev;

	struct device_node *np = dev->of_node;

	struct device_node *rmem_np;

	struct reserved_mem *rmem;

	int num_rmems;

	int ret, i;



	num_rmems = of_property_count_elems_of_size(np, "memory-region",

						    sizeof(phandle));

	if (num_rmems < 0) {

		dev_err(dev, "device does not reserved memory regions (%pe)\n",

			ERR_PTR(num_rmems));

		return -EINVAL;

	}

	if (num_rmems < 2) {

		dev_err(dev, "device needs at least two memory regions to be defined, num = %d\n",

			num_rmems);

		return -EINVAL;

	}



	/* use reserved memory region 0 for vring DMA allocations */

	ret = of_reserved_mem_device_init_by_idx(dev, np, 0);

	if (ret) {

		dev_err(dev, "device cannot initialize DMA pool (%pe)\n",

			ERR_PTR(ret));

		return ret;

	}

	ret = devm_add_action_or_reset(dev, k3_mem_release, dev);

	if (ret)

		return ret;



	num_rmems--;

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

	if (!kproc->rmem)

		return -ENOMEM;



	/* 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)

			return -EINVAL;



		rmem = of_reserved_mem_lookup(rmem_np);

		of_node_put(rmem_np);

		if (!rmem)

			return -EINVAL;



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

		/* 64-bit address regions currently not supported */

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

		kproc->rmem[i].size = 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);

			return -ENOMEM;

		}



		dev_dbg(dev, "reserved memory%d: bus addr %pa size 0x%zx va %pK da 0x%x\n",

			i + 1, &kproc->rmem[i].bus_addr,

			kproc->rmem[i].size, kproc->rmem[i].cpu_addr,

			kproc->rmem[i].dev_addr);

	}

	kproc->num_rmems = num_rmems;



	return 0;

}



static void k3_dsp_release_tsp(void *data)

{

	struct ti_sci_proc *tsp = data;
@@ -214,7 +144,7 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	ret = k3_dsp_reserved_mem_init(kproc);

	ret = k3_reserved_mem_init(kproc);

	if (ret)

		return dev_err_probe(dev, ret, "reserved memory init failed\n");

drivers/remoteproc/ti_k3_m4_remoteproc.c

+1 −70
Original line number Diff line number Diff line
@@ -21,75 +21,6 @@ 
#include "ti_sci_proc.h"

#include "ti_k3_common.h"



static int k3_m4_reserved_mem_init(struct k3_rproc *kproc)

{

	struct device *dev = kproc->dev;

	struct device_node *np = dev->of_node;

	struct device_node *rmem_np;

	struct reserved_mem *rmem;

	int num_rmems;

	int ret, i;



	num_rmems = of_property_count_elems_of_size(np, "memory-region",

						    sizeof(phandle));

	if (num_rmems < 0) {

		dev_err(dev, "device does not reserved memory regions (%d)\n",

			num_rmems);

		return -EINVAL;

	}

	if (num_rmems < 2) {

		dev_err(dev, "device needs at least two memory regions to be defined, num = %d\n",

			num_rmems);

		return -EINVAL;

	}



	/* use reserved memory region 0 for vring DMA allocations */

	ret = of_reserved_mem_device_init_by_idx(dev, np, 0);

	if (ret) {

		dev_err(dev, "device cannot initialize DMA pool (%d)\n", ret);

		return ret;

	}

	ret = devm_add_action_or_reset(dev, k3_mem_release, dev);

	if (ret)

		return ret;



	num_rmems--;

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

	if (!kproc->rmem)

		return -ENOMEM;



	/* 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)

			return -EINVAL;



		rmem = of_reserved_mem_lookup(rmem_np);

		of_node_put(rmem_np);

		if (!rmem)

			return -EINVAL;



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

		/* 64-bit address regions currently not supported */

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

		kproc->rmem[i].size = 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);

			return -ENOMEM;

		}



		dev_dbg(dev, "reserved memory%d: bus addr %pa size 0x%zx va %pK da 0x%x\n",

			i + 1, &kproc->rmem[i].bus_addr,

			kproc->rmem[i].size, kproc->rmem[i].cpu_addr,

			kproc->rmem[i].dev_addr);

	}

	kproc->num_rmems = num_rmems;



	return 0;

}



static void k3_m4_release_tsp(void *data)

{

	struct ti_sci_proc *tsp = data;
@@ -170,7 +101,7 @@ static int k3_m4_rproc_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	ret = k3_m4_reserved_mem_init(kproc);

	ret = k3_reserved_mem_init(kproc);

	if (ret)

		return dev_err_probe(dev, ret, "reserved memory init failed\n");

drivers/remoteproc/ti_k3_r5_remoteproc.c

+1 −81
Original line number Diff line number Diff line
@@ -761,86 +761,6 @@ static int k3_r5_rproc_configure(struct k3_rproc *kproc) 
	return ret;

}



static int k3_r5_reserved_mem_init(struct k3_rproc *kproc)

{

	struct device *dev = kproc->dev;

	struct device_node *np = dev_of_node(dev);

	struct device_node *rmem_np;

	struct reserved_mem *rmem;

	int num_rmems;

	int ret, i;



	num_rmems = of_property_count_elems_of_size(np, "memory-region",

						    sizeof(phandle));

	if (num_rmems <= 0) {

		dev_err(dev, "device does not have reserved memory regions, ret = %d\n",

			num_rmems);

		return -EINVAL;

	}

	if (num_rmems < 2) {

		dev_err(dev, "device needs at least two memory regions to be defined, num = %d\n",

			num_rmems);

		return -EINVAL;

	}



	/* use reserved memory region 0 for vring DMA allocations */

	ret = of_reserved_mem_device_init_by_idx(dev, np, 0);

	if (ret) {

		dev_err(dev, "device cannot initialize DMA pool, ret = %d\n",

			ret);

		return ret;

	}



	ret = devm_add_action_or_reset(dev, k3_mem_release, dev);

	if (ret)

		return ret;



	num_rmems--;

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

	if (!kproc->rmem)

		return -ENOMEM;



	/* 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)

			return -EINVAL;



		rmem = of_reserved_mem_lookup(rmem_np);

		of_node_put(rmem_np);

		if (!rmem)

			return -EINVAL;



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

		/*

		 * R5Fs do not have an MMU, but have a Region Address Translator

		 * (RAT) module that provides a fixed entry translation between

		 * the 32-bit processor addresses to 64-bit bus addresses. The

		 * RAT is programmable only by the R5F cores. Support for RAT

		 * is currently not supported, so 64-bit address regions are not

		 * supported. The absence of MMUs implies that the R5F device

		 * addresses/supported memory regions are restricted to 32-bit

		 * bus addresses, and are identical

		 */

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

		kproc->rmem[i].size = 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);

			return -ENOMEM;

		}



		dev_dbg(dev, "reserved memory%d: bus addr %pa size 0x%zx va %pK da 0x%x\n",

			i + 1, &kproc->rmem[i].bus_addr,

			kproc->rmem[i].size, kproc->rmem[i].cpu_addr,

			kproc->rmem[i].dev_addr);

	}

	kproc->num_rmems = num_rmems;



	return 0;

}



/*

 * Each R5F core within a typical R5FSS instance has a total of 64 KB of TCMs,

 * split equally into two 32 KB banks between ATCM and BTCM. The TCMs from both
@@ -1219,7 +1139,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) 
init_rmem:

		k3_r5_adjust_tcm_sizes(kproc);



		ret = k3_r5_reserved_mem_init(kproc);

		ret = k3_reserved_mem_init(kproc);

		if (ret) {

			dev_err(cdev, "reserved memory init failed, ret = %d\n",

				ret);