misc: fastrpc: Use of_reserved_mem_region_to_resource() for "memory-region"
PATCH 1/1 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.
--- drivers/misc/fastrpc.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
drivers/misc/fastrpc.c +7 -12
@@ -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); + } }
Signature · 1 line
2.47.2
Quoted 10 lines · Rob Herring (Arm)
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 justof_reserved_mem_region_to_resource()which is checked for an error.
Quoted 4 lines
Signed-off-by Rob Herring (Arm) <[email protected]>--- drivers/misc/fastrpc.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
Quoted 1 line
Signature · 2 lines
With best wishes Dmitry
Quoted 10 lines · Rob Herring (Arm)
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 justof_reserved_mem_region_to_resource()which is checked for an error.
Quoted 2 lines
Signed-off-by Rob Herring (Arm) <[email protected]>---
Greg, there are no more patches for fastrpc for this cycle, can you please pick this up via char-misc tree?
thanks,
Srini
Quoted 44 lines
drivers/misc/fastrpc.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)drivers/misc/fastrpc.c +7
-12@@ -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); + } }
Greg Kroah-Hartman
maintainerQuoted 13 lines · Srinivas Kandagatla
Quoted 10 lines · Rob Herring (Arm)
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 justof_reserved_mem_region_to_resource()which is checked for an error.
Quoted 8 lines
Quoted 2 lines
Signed-off-by Rob Herring (Arm) <[email protected]>---
Reviewed-by Srinivas Kandagatla <[email protected]>Greg, there are no more patches for fastrpc for this cycle, can you please pick this up via char-misc tree?
Will do, thanks.
greg k-h