Commit fe6518d5 authored by Ekansh Gupta's avatar Ekansh Gupta Committed by Greg Kroah-Hartman
Browse files

misc: fastrpc: Pass proper scm arguments for static process init 



Memory is allocated for dynamic loading when audio daemon is trying
to attach to audioPD on DSP side. This memory is allocated from
reserved CMA memory region and needs ownership assignment to
new VMID in order to use it from audioPD.

In the current implementation, arguments are not correctly passed
to the scm call which might result in failure of dynamic loading
on audioPD. Added changes to pass correct arguments during daemon
attach request.

Fixes: 08715610 ("misc: fastrpc: Add support for audiopd")
Cc: stable <stable@kernel.org>
Tested-by: default avatarEkansh Gupta <quic_ekangupt@quicinc.com>
Signed-off-by: default avatarEkansh Gupta <quic_ekangupt@quicinc.com>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230811115643.38578-4-srinivas.kandagatla@linaro.org


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

drivers/misc/fastrpc.c

+9 −4
Original line number Diff line number Diff line
@@ -1325,13 +1325,18 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, 
	return 0;

err_invoke:

	if (fl->cctx->vmcount) {

		struct qcom_scm_vmperm perm;

		u64 src_perms = 0;

		struct qcom_scm_vmperm dst_perms;

		u32 i;



		perm.vmid = QCOM_SCM_VMID_HLOS;

		perm.perm = QCOM_SCM_PERM_RWX;

		for (i = 0; i < fl->cctx->vmcount; i++)

			src_perms |= BIT(fl->cctx->vmperms[i].vmid);



		dst_perms.vmid = QCOM_SCM_VMID_HLOS;

		dst_perms.perm = QCOM_SCM_PERM_RWX;

		err = qcom_scm_assign_mem(fl->cctx->remote_heap->phys,

						(u64)fl->cctx->remote_heap->size,

						&fl->cctx->perms, &perm, 1);

						&src_perms, &dst_perms, 1);

		if (err)

			dev_err(fl->sctx->dev, "Failed to assign memory phys 0x%llx size 0x%llx err %d",

				fl->cctx->remote_heap->phys, fl->cctx->remote_heap->size, err);