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

misc: fastrpc: Fix remote heap allocation request 



Remote heap is used by DSP audioPD on need basis. This memory is
allocated from reserved CMA memory region and is then shared with
audioPD to use it for it's functionality.

Current implementation of remote heap is not allocating the memory
from CMA region, instead it is allocating the memory from SMMU
context bank. The arguments passed to scm call for the reassignment
of ownership is also not correct. Added changes to allocate CMA
memory and have a proper ownership reassignment.

Fixes: 532ad70c ("misc: fastrpc: Add mmap request assigning for static PD pool")
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-2-srinivas.kandagatla@linaro.org


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

drivers/misc/fastrpc.c

+7 −7
Original line number Diff line number Diff line
@@ -1867,7 +1867,11 @@ static int fastrpc_req_mmap(struct fastrpc_user *fl, char __user *argp) 
		return -EINVAL;

	}



	err = fastrpc_buf_alloc(fl, fl->sctx->dev, req.size, &buf);

	if (req.flags == ADSP_MMAP_REMOTE_HEAP_ADDR)

		err = fastrpc_remote_heap_alloc(fl, dev, req.size, &buf);

	else

		err = fastrpc_buf_alloc(fl, dev, req.size, &buf);



	if (err) {

		dev_err(dev, "failed to allocate buffer\n");

		return err;
@@ -1906,12 +1910,8 @@ static int fastrpc_req_mmap(struct fastrpc_user *fl, char __user *argp) 


	/* Add memory to static PD pool, protection thru hypervisor */

	if (req.flags == ADSP_MMAP_REMOTE_HEAP_ADDR && fl->cctx->vmcount) {

		struct qcom_scm_vmperm perm;



		perm.vmid = QCOM_SCM_VMID_HLOS;

		perm.perm = QCOM_SCM_PERM_RWX;

		err = qcom_scm_assign_mem(buf->phys, buf->size,

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

		err = qcom_scm_assign_mem(buf->phys, (u64)buf->size,

			&fl->cctx->perms, fl->cctx->vmperms, fl->cctx->vmcount);

		if (err) {

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

					buf->phys, buf->size, err);