From fcca61799a8e0d93d44f4c75cb19f6604e3a882f Mon Sep 17 00:00:00 2001 From: Shiraz Hashim Date: Tue, 1 Nov 2016 16:36:49 +0530 Subject: [PATCH] msm: secure_buffer: fix scm call argument layout For hyp_assign calls, dest_vm_and_perm_info wrongly defines ctx as u32 * type, while TZ expects it as u64. This creates an inconsistency on 32bit system. Fix it. Change-Id: I31e8e0b5e9ae240ca031f625cf7c49f1bfe165d4 Signed-off-by: Shiraz Hashim --- drivers/soc/qcom/secure_buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soc/qcom/secure_buffer.c b/drivers/soc/qcom/secure_buffer.c index d9ebc1edda9c..afe6b2309e27 100644 --- a/drivers/soc/qcom/secure_buffer.c +++ b/drivers/soc/qcom/secure_buffer.c @@ -52,7 +52,7 @@ struct mem_prot_info { struct dest_vm_and_perm_info { u32 vm; u32 perm; - u32 *ctx; + u64 ctx; u32 ctx_size; }; @@ -209,7 +209,7 @@ populate_dest_info(int *dest_vmids, int nelements, int *dest_perms, for (i = 0; i < nelements; i++) { dest_info[i].vm = dest_vmids[i]; dest_info[i].perm = dest_perms[i]; - dest_info[i].ctx = NULL; + dest_info[i].ctx = 0x0; dest_info[i].ctx_size = 0; }