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

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



The of_get_memories() implementations in the TI K3 R5, DSP and M4
remoteproc drivers initialize and assign memory regions used by the
remote processor in the same way. Refactor these implementations into
ti_k3_common.c driver as k3_rproc_of_get_memories() use this common
function for mem initialization in R5, DSP and M4 drivers.

Note: The TCM addresses for R5 core are configurable based on the
'loczrama' setting. Therefore, override the bus_addr assignment done by
the common function for TCMs of R5 remote processors by reading the
'loczrama' DT property in k3_r5_core_of_get_internal_memories().

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-34-b-padhi@ti.com


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

drivers/remoteproc/ti_k3_common.c

+53 −0
Original line number Diff line number Diff line
@@ -408,5 +408,58 @@ void *k3_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem) 
}

EXPORT_SYMBOL_GPL(k3_rproc_da_to_va);



int k3_rproc_of_get_memories(struct platform_device *pdev,

			     struct k3_rproc *kproc)

{

	const struct k3_rproc_dev_data *data = kproc->data;

	struct device *dev = &pdev->dev;

	struct resource *res;

	int num_mems = 0;

	int i;



	num_mems = data->num_mems;

	kproc->mem = devm_kcalloc(kproc->dev, num_mems,

				  sizeof(*kproc->mem), GFP_KERNEL);

	if (!kproc->mem)

		return -ENOMEM;



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

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

						   data->mems[i].name);

		if (!res) {

			dev_err(dev, "found no memory resource for %s\n",

				data->mems[i].name);

			return -EINVAL;

		}

		if (!devm_request_mem_region(dev, res->start,

					     resource_size(res),

					     dev_name(dev))) {

			dev_err(dev, "could not request %s region for resource\n",

				data->mems[i].name);

			return -EBUSY;

		}



		kproc->mem[i].cpu_addr = devm_ioremap_wc(dev, res->start,

							 resource_size(res));

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

			dev_err(dev, "failed to map %s memory\n",

				data->mems[i].name);

			return -ENOMEM;

		}

		kproc->mem[i].bus_addr = res->start;

		kproc->mem[i].dev_addr = data->mems[i].dev_addr;

		kproc->mem[i].size = resource_size(res);



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

			data->mems[i].name, &kproc->mem[i].bus_addr,

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

			kproc->mem[i].dev_addr);

	}

	kproc->num_mems = num_mems;



	return 0;

}

EXPORT_SYMBOL_GPL(k3_rproc_of_get_memories);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("TI K3 common Remoteproc code");

drivers/remoteproc/ti_k3_common.h

+2 −0
Original line number Diff line number Diff line
@@ -110,4 +110,6 @@ struct resource_table *k3_get_loaded_rsc_table(struct rproc *rproc, 
					       size_t *rsc_table_sz);

void *k3_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len,

			bool *is_iomem);

int k3_rproc_of_get_memories(struct platform_device *pdev,

			     struct k3_rproc *kproc);

#endif /* REMOTEPROC_TI_K3_COMMON_H */

drivers/remoteproc/ti_k3_dsp_remoteproc.c

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

};



static int k3_dsp_rproc_of_get_memories(struct platform_device *pdev,

					struct k3_rproc *kproc)

{

	const struct k3_rproc_dev_data *data = kproc->data;

	struct device *dev = &pdev->dev;

	struct resource *res;

	int num_mems = 0;

	int i;



	num_mems = kproc->data->num_mems;

	kproc->mem = devm_kcalloc(kproc->dev, num_mems,

				  sizeof(*kproc->mem), GFP_KERNEL);

	if (!kproc->mem)

		return -ENOMEM;



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

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

						   data->mems[i].name);

		if (!res) {

			dev_err(dev, "found no memory resource for %s\n",

				data->mems[i].name);

			return -EINVAL;

		}

		if (!devm_request_mem_region(dev, res->start,

					     resource_size(res),

					     dev_name(dev))) {

			dev_err(dev, "could not request %s region for resource\n",

				data->mems[i].name);

			return -EBUSY;

		}



		kproc->mem[i].cpu_addr = devm_ioremap_wc(dev, res->start,

							 resource_size(res));

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

			dev_err(dev, "failed to map %s memory\n",

				data->mems[i].name);

			return -ENOMEM;

		}

		kproc->mem[i].bus_addr = res->start;

		kproc->mem[i].dev_addr = data->mems[i].dev_addr;

		kproc->mem[i].size = resource_size(res);



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

			data->mems[i].name, &kproc->mem[i].bus_addr,

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

			kproc->mem[i].dev_addr);

	}

	kproc->num_mems = num_mems;



	return 0;

}



static void k3_dsp_mem_release(void *data)

{

	struct device *dev = data;
@@ -269,7 +217,7 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	ret = k3_dsp_rproc_of_get_memories(pdev, kproc);

	ret = k3_rproc_of_get_memories(pdev, kproc);

	if (ret)

		return ret;

drivers/remoteproc/ti_k3_m4_remoteproc.c

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

#include "ti_k3_common.h"



static int k3_m4_rproc_of_get_memories(struct platform_device *pdev,

				       struct k3_rproc *kproc)

{

	const struct k3_rproc_dev_data *data = kproc->data;

	struct device *dev = &pdev->dev;

	struct resource *res;

	int num_mems;

	int i;



	num_mems = data->num_mems;

	kproc->mem = devm_kcalloc(kproc->dev, num_mems,

				  sizeof(*kproc->mem), GFP_KERNEL);

	if (!kproc->mem)

		return -ENOMEM;



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

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

						   data->mems[i].name);

		if (!res) {

			dev_err(dev, "found no memory resource for %s\n",

				data->mems[i].name);

			return -EINVAL;

		}

		if (!devm_request_mem_region(dev, res->start,

					     resource_size(res),

					     dev_name(dev))) {

			dev_err(dev, "could not request %s region for resource\n",

				data->mems[i].name);

			return -EBUSY;

		}



		kproc->mem[i].cpu_addr = devm_ioremap_wc(dev, res->start,

							 resource_size(res));

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

			dev_err(dev, "failed to map %s memory\n",

				data->mems[i].name);

			return -ENOMEM;

		}

		kproc->mem[i].bus_addr = res->start;

		kproc->mem[i].dev_addr = data->mems[i].dev_addr;

		kproc->mem[i].size = resource_size(res);



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

			data->mems[i].name, &kproc->mem[i].bus_addr,

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

			kproc->mem[i].dev_addr);

	}

	kproc->num_mems = num_mems;



	return 0;

}



static void k3_m4_rproc_dev_mem_release(void *data)

{

	struct device *dev = data;
@@ -225,7 +173,7 @@ static int k3_m4_rproc_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	ret = k3_m4_rproc_of_get_memories(pdev, kproc);

	ret = k3_rproc_of_get_memories(pdev, kproc);

	if (ret)

		return ret;

drivers/remoteproc/ti_k3_r5_remoteproc.c

+9 −40
Original line number Diff line number Diff line
@@ -1009,9 +1009,8 @@ static int k3_r5_core_of_get_internal_memories(struct platform_device *pdev, 
	const struct k3_rproc_dev_data *data = kproc->data;

	struct device *dev = &pdev->dev;

	struct k3_r5_core *core = kproc->priv;

	struct resource *res;

	int num_mems;

	int i;

	int i, ret;



	num_mems = data->num_mems;

	kproc->mem = devm_kcalloc(kproc->dev, num_mems, sizeof(*kproc->mem),
@@ -1019,45 +1018,19 @@ static int k3_r5_core_of_get_internal_memories(struct platform_device *pdev, 
	if (!kproc->mem)

		return -ENOMEM;



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

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

						   data->mems[i].name);

		if (!res) {

			dev_err(dev, "found no memory resource for %s\n",

				data->mems[i].name);

			return -EINVAL;

		}

		if (!devm_request_mem_region(dev, res->start,

					     resource_size(res),

					     dev_name(dev))) {

			dev_err(dev, "could not request %s region for resource\n",

				data->mems[i].name);

			return -EBUSY;

		}



		/*

		 * TCMs are designed in general to support RAM-like backing

		 * memories. So, map these as Normal Non-Cached memories. This

		 * also avoids/fixes any potential alignment faults due to

		 * unaligned data accesses when using memcpy() or memset()

		 * functions (normally seen with device type memory).

		 */

		kproc->mem[i].cpu_addr = devm_ioremap_wc(dev, res->start,

							 resource_size(res));

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

			dev_err(dev, "failed to map %s memory\n",

				data->mems[i].name);

			return -ENOMEM;

		}

		kproc->mem[i].bus_addr = res->start;

	ret = k3_rproc_of_get_memories(pdev, kproc);

	if (ret)

		return ret;



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

		/*

		 * TODO:

		 * The R5F cores can place ATCM & BTCM anywhere in its address

		 * based on the corresponding Region Registers in the System

		 * Control coprocessor. For now, place ATCM and BTCM at

		 * addresses 0 and 0x41010000 (same as the bus address on AM65x

		 * SoCs) based on loczrama setting

		 * SoCs) based on loczrama setting overriding default assignment

		 * done by k3_rproc_of_get_memories().

		 */

		if (!strcmp(data->mems[i].name, "atcm")) {

			kproc->mem[i].dev_addr = core->loczrama ?
@@ -1066,14 +1039,10 @@ static int k3_r5_core_of_get_internal_memories(struct platform_device *pdev, 
			kproc->mem[i].dev_addr = core->loczrama ?

							K3_R5_TCM_DEV_ADDR : 0;

		}

		kproc->mem[i].size = resource_size(res);



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

			data->mems[i].name, &kproc->mem[i].bus_addr,

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

			kproc->mem[i].dev_addr);

		dev_dbg(dev, "Updating bus addr %pa of memory %5s\n",

			&kproc->mem[i].bus_addr, data->mems[i].name);

	}

	kproc->num_mems = num_mems;



	return 0;

}