On 7/3/25 7:34 PM, Rob Herring (Arm) wrote:
> 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: Rob Herring (Arm) <r...@kernel.org>
> ---
Reviewed-by: Srinivas Kandagatla <sr...@kernel.org>
Greg, there are no more patches for fastrpc for this cycle, can you
please pick this up via char-misc tree?
thanks,
Srini
> drivers/misc/fastrpc.c | 19 +++++++------------
> 1 file changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
> index 378923594f02..53e88a1bc430 100644
> --- a/drivers/misc/fastrpc.c
> +++ b/drivers/misc/fastrpc.c
> @@ -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);
>
> - 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);
> + }
>
> }
>
