[ Upstream commit 80f3afd72bd4149c57daf852905476b43bb47647 ]

While passing address phy address to DSP, take care of the offset
calculated from virtual address vma.

Fixes: c68cfb718c8f ("misc: fastrpc: Add support for context Invoke method")
Signed-off-by: Srinivas Kandagatla <srinivas.kandaga...@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/misc/fastrpc.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index 36d0d5c9cfbad..9996c83ba5cb9 100644
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -667,8 +667,16 @@ static int fastrpc_get_args(u32 kernel, struct 
fastrpc_invoke_ctx *ctx)
                pages[i].size = roundup(len, PAGE_SIZE);
 
                if (ctx->maps[i]) {
+                       struct vm_area_struct *vma = NULL;
+
                        rpra[i].pv = (u64) ctx->args[i].ptr;
                        pages[i].addr = ctx->maps[i]->phys;
+
+                       vma = find_vma(current->mm, ctx->args[i].ptr);
+                       if (vma)
+                               pages[i].addr += ctx->args[i].ptr -
+                                                vma->vm_start;
+
                } else {
                        rlen -= ALIGN(args, FASTRPC_ALIGN) - args;
                        args = ALIGN(args, FASTRPC_ALIGN);
-- 
2.20.1



Reply via email to