lkml.org 
[lkml]   [2023]   [Jul]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH v2] misc: fastrpc: Fix remote heap allocation request
From


On 23/06/2023 15:04, Ekansh Gupta wrote:
> 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: 532ad70c6d44 ("misc: fastrpc: Add mmap request assigning for static PD pool")
> Cc: stable <stable@kernel.org>
> Tested-by: Ekansh Gupta <quic_ekangupt@quicinc.com>
> Signed-off-by: Ekansh Gupta <quic_ekangupt@quicinc.com>
> ---
> Changes in v2:
> - Removed redundant code
>
> drivers/misc/fastrpc.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
> index 30d4d04..87a9096 100644
> --- a/drivers/misc/fastrpc.c
> +++ b/drivers/misc/fastrpc.c
> @@ -1866,7 +1866,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;
> @@ -1905,12 +1909,10 @@ 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;
> + u64 src_perms = BIT(QCOM_SCM_VMID_HLOS);
>
we do not need this, channel context sets perms to this value at probe,
you could just reuse it.


> - 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,
> + &src_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);

\
 
 \ /
  Last update: 2023-07-28 13:10    [W:0.037 / U:0.900 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site