Commit 81c18e08 authored Mar 10, 2023 by Tanmay Shah Committed by Mathieu Poirier Mar 14, 2023

drivers: remoteproc: xilinx: Fix carveout names



If the unit address is appended to node name of memory-region,
then adding rproc carveouts fails as node name and unit-address
both are passed as carveout name (i.e. vdev0vring0@xxxxxxxx). However,
only node name is expected by remoteproc framework. This patch moves
memory-region node parsing from driver probe to prepare and
only passes node-name and not unit-address

Fixes: 6b291e80 ("drivers: remoteproc: Add Xilinx r5 remoteproc driver")
Signed-off-by: Tanmay Shah <tanmay.shah@amd.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20230311012407.1292118-5-tanmay.shah@amd.com


Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

parent 79963fbf

drivers/remoteproc/xlnx_r5_remoteproc.c

+20 −70

Original line number	Diff line number	Diff line
		@@ -61,8 +61,6 @@ static const struct mem_bank_data zynqmp_tcm_banks[] = {
		* @np: device node of RPU instance
		* @tcm_bank_count: number TCM banks accessible to this RPU
		* @tcm_banks: array of each TCM bank data
		* @rmem_count: Number of reserved mem regions
		* @rmem: reserved memory region nodes from device tree
		* @rproc: rproc handle
		* @pm_domain_id: RPU CPU power domain id
		*/
		@@ -71,8 +69,6 @@ struct zynqmp_r5_core {
		struct device_node *np;
		int tcm_bank_count;
		struct mem_bank_data **tcm_banks;
		int rmem_count;
		struct reserved_mem **rmem;
		struct rproc *rproc;
		u32 pm_domain_id;
		};
		@@ -239,21 +235,29 @@ static int add_mem_regions_carveout(struct rproc *rproc)
		{
		struct rproc_mem_entry *rproc_mem;
		struct zynqmp_r5_core *r5_core;
		struct of_phandle_iterator it;
		struct reserved_mem *rmem;
		int i, num_mem_regions;
		int i = 0;

		r5_core = (struct zynqmp_r5_core *)rproc->priv;
		num_mem_regions = r5_core->rmem_count;

		for (i = 0; i < num_mem_regions; i++) {
		rmem = r5_core->rmem[i];
		/* Register associated reserved memory regions */
		of_phandle_iterator_init(&it, r5_core->np, "memory-region", NULL, 0);

		if (!strncmp(rmem->name, "vdev0buffer", strlen("vdev0buffer"))) {
		while (of_phandle_iterator_next(&it) == 0) {
		rmem = of_reserved_mem_lookup(it.node);
		if (!rmem) {
		of_node_put(it.node);
		dev_err(&rproc->dev, "unable to acquire memory-region\n");
		return -EINVAL;
		}

		if (!strcmp(it.node->name, "vdev0buffer")) {
		/* Init reserved memory for vdev buffer */
		rproc_mem = rproc_of_resm_mem_entry_init(&rproc->dev, i,
		rmem->size,
		rmem->base,
		rmem->name);
		it.node->name);
		} else {
		/* Register associated reserved memory regions */
		rproc_mem = rproc_mem_entry_init(&rproc->dev, NULL,
		@@ -261,16 +265,19 @@ static int add_mem_regions_carveout(struct rproc *rproc)
		rmem->size, rmem->base,
		zynqmp_r5_mem_region_map,
		zynqmp_r5_mem_region_unmap,
		rmem->name);
		it.node->name);
		}

		if (!rproc_mem)
		if (!rproc_mem) {
		of_node_put(it.node);
		return -ENOMEM;
		}

		rproc_add_carveout(rproc, rproc_mem);

		dev_dbg(&rproc->dev, "reserved mem carveout %s addr=%llx, size=0x%llx",
		rmem->name, rmem->base, rmem->size);
		it.node->name, rmem->base, rmem->size);
		i++;
		}

		return 0;
		@@ -726,59 +733,6 @@ static int zynqmp_r5_get_tcm_node(struct zynqmp_r5_cluster *cluster)
		return 0;
		}

		/**
		* zynqmp_r5_get_mem_region_node()
		* parse memory-region property and get reserved mem regions
		*
		* @r5_core: pointer to zynqmp_r5_core type object
		*
		* Return: 0 for success and error code for failure.
		*/
		static int zynqmp_r5_get_mem_region_node(struct zynqmp_r5_core *r5_core)
		{
		struct device_node np, rmem_np;
		struct reserved_mem **rmem;
		int res_mem_count, i;
		struct device *dev;

		dev = r5_core->dev;
		np = r5_core->np;

		res_mem_count = of_property_count_elems_of_size(np, "memory-region",
		sizeof(phandle));
		if (res_mem_count <= 0) {
		dev_warn(dev, "failed to get memory-region property %d\n",
		res_mem_count);
		return 0;
		}

		rmem = devm_kcalloc(dev, res_mem_count,
		sizeof(struct reserved_mem *), GFP_KERNEL);
		if (!rmem)
		return -ENOMEM;

		for (i = 0; i < res_mem_count; i++) {
		rmem_np = of_parse_phandle(np, "memory-region", i);
		if (!rmem_np)
		goto release_rmem;

		rmem[i] = of_reserved_mem_lookup(rmem_np);
		if (!rmem[i]) {
		of_node_put(rmem_np);
		goto release_rmem;
		}

		of_node_put(rmem_np);
		}

		r5_core->rmem_count = res_mem_count;
		r5_core->rmem = rmem;
		return 0;

		release_rmem:
		return -EINVAL;
		}

		/*
		* zynqmp_r5_core_init()
		* Create and initialize zynqmp_r5_core type object
		@@ -806,10 +760,6 @@ static int zynqmp_r5_core_init(struct zynqmp_r5_cluster *cluster,
		for (i = 0; i < cluster->core_count; i++) {
		r5_core = cluster->r5_cores[i];

		ret = zynqmp_r5_get_mem_region_node(r5_core);
		if (ret)
		dev_warn(dev, "memory-region prop failed %d\n", ret);

		/* Initialize r5 cores with power-domains parsed from dts */
		ret = of_property_read_u32_index(r5_core->np, "power-domains",
		1, &r5_core->pm_domain_id);