In the SDSP probe path, qcom_scm_assign_mem() is used to assign the
reserved memory to the configured VMIDs, but its return value was not
checked.
Fail the probe if the SCM call fails to avoid continuing with an
unexpected/incorrect memory permission configuration
Fixes: c3c0363bc72d4 ("misc: fastrpc: support complete DMA pool access to the
DSP")
Cc: [email protected] # 6.11-rc1
Signed-off-by: Xingjing Deng <[email protected]>
---
v4:
- Format the indentation
- Link to v3:
https://lore.kernel.org/linux-arm-msm/[email protected]/T/#t
v3:
- Add missing [email protected] to cc list.
- Standarlize changelog placement/format.
- Link to v2:
https://lore.kernel.org/linux-arm-msm/[email protected]/T/#t
v2:
- Add Fixes: and Cc: stable tags.
- Link to v1:
https://lore.kernel.org/linux-arm-msm/[email protected]/T/#u
Signed-off-by: Xingjing Deng <[email protected]>
---
drivers/misc/fastrpc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index cbb12db110b3..9c41b51d80ee 100644
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -2339,10 +2339,10 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device
*rpdev)
src_perms = BIT(QCOM_SCM_VMID_HLOS);
err = qcom_scm_assign_mem(res.start,
resource_size(&res), &src_perms,
- data->vmperms, data->vmcount);
+ data->vmperms,
data->vmcount);
if (err) {
dev_err(rdev, "Failed to assign memory phys
0x%llx size 0x%llx err %d",
- res.start, resource_size(&res), err);
+ res.start, resource_size(&res),
err);
goto err_free_data;
}
}
--
2.25.1
