From 7b0b276d760147c38553d0015ce3a9fe13841b18 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Thu, 2 Apr 2020 10:22:14 -0700 Subject: [PATCH] haven: Fix buffer calculations for MEM_SHARE and MEM_LEND The logic for calculating the request buffer sizes for the MEM_SHARE and MEM_LEND resource manager calls is not present, so add it. Change-Id: I804ee108565733b0e4b376b5fd31abdb3d359c1f Signed-off-by: Isaac J. Manjarres --- drivers/virt/haven/hh_rm_iface.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/virt/haven/hh_rm_iface.c b/drivers/virt/haven/hh_rm_iface.c index c7c88c03b98c..4d155bf971fc 100644 --- a/drivers/virt/haven/hh_rm_iface.c +++ b/drivers/virt/haven/hh_rm_iface.c @@ -629,6 +629,10 @@ static void hh_rm_populate_mem_request(void *req_buf, u32 fn_id, u32 n_sgl_entries = src_sgl_desc ? src_sgl_desc->n_sgl_entries : 0; switch (fn_id) { + case HH_RM_RPC_MSG_ID_CALL_MEM_LEND: + case HH_RM_RPC_MSG_ID_CALL_MEM_SHARE: + req_hdr_size = sizeof(struct hh_mem_share_req_payload_hdr); + break; case HH_RM_RPC_MSG_ID_CALL_MEM_QCOM_LOOKUP_SGL: req_hdr_size = sizeof(struct hh_mem_qcom_lookup_sgl_req_payload_hdr); @@ -663,6 +667,10 @@ static void *hh_rm_alloc_mem_request_buf(u32 fn_id, size_t n_acl_entries, switch (fn_id) { + case HH_RM_RPC_MSG_ID_CALL_MEM_LEND: + case HH_RM_RPC_MSG_ID_CALL_MEM_SHARE: + req_payload_size = sizeof(struct hh_mem_share_req_payload_hdr); + break; case HH_RM_RPC_MSG_ID_CALL_MEM_QCOM_LOOKUP_SGL: req_payload_size = sizeof(struct hh_mem_qcom_lookup_sgl_req_payload_hdr);