From e88247afe7cc1c3cb8bc3db53592260dbb38131d Mon Sep 17 00:00:00 2001 From: Anmolpreet Kaur Date: Thu, 23 Jul 2020 11:17:30 +0530 Subject: [PATCH] qseecom : Fixes to enable shmbridge Fixes in qseecom driver to support shmbridge and change parameters as hypervisor expects them to be. Change-Id: I57dc5d6fe7b74b45da2dee6de32c1251d77275ee Signed-off-by: Anmolpreet Kaur --- drivers/misc/qseecom.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c index 199e919a5930..ddab0b8f0eb3 100644 --- a/drivers/misc/qseecom.c +++ b/drivers/misc/qseecom.c @@ -1286,14 +1286,14 @@ static int qseecom_create_bridge_for_secbuf(int ion_fd, struct dma_buf *dmabuf, pr_debug("bridge exists\n"); return 0; } -/* - * nelems = ion_get_flags_num_vm_elems(dma_buf_flags); - * if (nelems == 0) { - * pr_err("failed to get vm num from flag = %x\n", dma_buf_flags); - * ret = -EINVAL; - * goto exit; - * } - */ + + nelems = ion_get_flags_num_vm_elems(dma_buf_flags); + if (nelems == 0) { + pr_err("failed to get vm num from flag = %x\n", dma_buf_flags); + ret = -EINVAL; + goto exit; + } + vmid_list = kcalloc(nelems, sizeof(*vmid_list), GFP_KERNEL); if (!vmid_list) { @@ -1301,11 +1301,11 @@ static int qseecom_create_bridge_for_secbuf(int ion_fd, struct dma_buf *dmabuf, goto exit; } -/* - * ret = ion_populate_vm_list(dma_buf_flags, vmid_list, nelems); - * if (ret) - * goto exit_free_vmid_list; - */ + + ret = ion_populate_vm_list(dma_buf_flags, vmid_list, nelems); + if (ret) + goto exit_free_vmid_list; + perms_list = kcalloc(nelems, sizeof(*perms_list), GFP_KERNEL); if (!perms_list) {