Commit 73cca2a7 authored by Rob Herring (Arm)'s avatar Rob Herring (Arm) Committed by Greg Kroah-Hartman
Browse files

misc: fastrpc: Use of_reserved_mem_region_to_resource() for "memory-region" 



Use the newly added of_reserved_mem_region_to_resource() function to
handle "memory-region" properties.

The error handling is a bit different. "memory-region" is optional, so
failed lookup is not an error. But then an error in
of_reserved_mem_lookup() is treated as an error. However, that
distinction is not really important. Either the region is available
and usable or it is not. So now, it is just
of_reserved_mem_region_to_resource() which is checked for an error.

Signed-off-by: default avatar"Rob Herring (Arm)" <robh@kernel.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: default avatarSrinivas Kandagatla <srini@kernel.org>
Link: https://lore.kernel.org/r/20250703183455.2074215-1-robh@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 77e49c35

drivers/misc/fastrpc.c

+7 −12
Original line number Diff line number Diff line
@@ -2262,8 +2262,6 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) 
	int i, err, domain_id = -1, vmcount;

	const char *domain;

	bool secure_dsp;

	struct device_node *rmem_node;

	struct reserved_mem *rmem;

	unsigned int vmids[FASTRPC_MAX_VMIDS];



	err = of_property_read_string(rdev->of_node, "label", &domain);
@@ -2306,20 +2304,17 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) 
		}

	}



	rmem_node = of_parse_phandle(rdev->of_node, "memory-region", 0);

	if (domain_id == SDSP_DOMAIN_ID && rmem_node) {

	if (domain_id == SDSP_DOMAIN_ID) {

		struct resource res;

		u64 src_perms;



		rmem = of_reserved_mem_lookup(rmem_node);

		if (!rmem) {

			err = -EINVAL;

			goto err_free_data;

		}



		err = of_reserved_mem_region_to_resource(rdev->of_node, 0, &res);

		if (!err) {

			src_perms = BIT(QCOM_SCM_VMID_HLOS);



		qcom_scm_assign_mem(rmem->base, rmem->size, &src_perms,

			qcom_scm_assign_mem(res.start, resource_size(&res), &src_perms,

				    data->vmperms, data->vmcount);

		}



	}