From d63be4bfc3b41e962310446e56dc8ce0864cf0bc Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:49:16 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Handle FFA_MEM_RECLAIM calls from the host" This reverts commit 08be3bcb7e0851c6eb67d0cb256ca1b2615029e7. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: Iba02b0f85cc97c32994a5c72345535a9f970f7b6 --- arch/arm64/kvm/hyp/nvhe/ffa.c | 81 +---------------------------------- 1 file changed, 1 insertion(+), 80 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index d882edb3db49..7fe3bfd1bdb5 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -122,23 +122,6 @@ static void spmd_mem_share(struct arm_smccc_res *res, u32 len, u32 fraglen) res); } -static void spmd_mem_reclaim(struct arm_smccc_res *res, u32 handle_lo, - u32 handle_hi, u32 flags) -{ - arm_smccc_1_1_smc(FFA_MEM_RECLAIM, - handle_lo, handle_hi, flags, - 0, 0, 0, 0, - res); -} - -static void spmd_retrieve_req(struct arm_smccc_res *res, u32 len) -{ - arm_smccc_1_1_smc(FFA_FN64_MEM_RETRIEVE_REQ, - len, len, - 0, 0, 0, 0, 0, - res); -} - static void do_ffa_rxtx_map(struct arm_smccc_res *res, struct kvm_cpu_context *ctxt) { @@ -363,66 +346,6 @@ out: return; } -static void do_ffa_mem_reclaim(struct arm_smccc_res *res, - struct kvm_cpu_context *ctxt) -{ - DECLARE_REG(u32, handle_lo, ctxt, 1); - DECLARE_REG(u32, handle_hi, ctxt, 2); - DECLARE_REG(u32, flags, ctxt, 3); - struct ffa_composite_mem_region *reg; - struct ffa_mem_region *buf; - int ret = 0; - u32 offset; - u64 handle; - - handle = PACK_HANDLE(handle_lo, handle_hi); - - hyp_spin_lock(&host_kvm.ffa.lock); - - buf = ffa_buffers.tx; - *buf = (struct ffa_mem_region) { - .sender_id = HOST_FFA_ID, - .handle = handle, - }; - - spmd_retrieve_req(res, sizeof(*buf)); - buf = ffa_buffers.rx; - if (res->a0 != FFA_MEM_RETRIEVE_RESP) - goto out_unlock; - - /* Check for fragmentation */ - if (res->a1 != res->a2) { - ret = FFA_RET_ABORTED; - goto out_unlock; - } - - offset = buf->ep_mem_access[0].composite_off; - /* - * We can trust the SPMD to get this right, but let's at least - * check that we end up with something that doesn't look _completely_ - * bogus. - */ - if (WARN_ON(offset > KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE)) { - ret = FFA_RET_ABORTED; - goto out_unlock; - } - - reg = (void *)buf + offset; - spmd_mem_reclaim(res, handle_lo, handle_hi, flags); - if (res->a0 != FFA_SUCCESS) - goto out_unlock; - - /* If the SPMD was happy, then we should be too. */ - WARN_ON(ffa_host_unshare_ranges(reg->constituents, - reg->addr_range_cnt)); -out_unlock: - hyp_spin_unlock(&host_kvm.ffa.lock); - - if (ret) - ffa_to_smccc_res(res, ret); - return; -} - static bool ffa_call_unsupported(u64 func_id) { switch (func_id) { @@ -503,11 +426,9 @@ bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt) case FFA_FN64_MEM_SHARE: do_ffa_mem_share(&res, host_ctxt); goto out_handled; - case FFA_MEM_RECLAIM: - do_ffa_mem_reclaim(&res, host_ctxt); - goto out_handled; case FFA_MEM_LEND: case FFA_FN64_MEM_LEND: + case FFA_MEM_RECLAIM: case FFA_MEM_FRAG_TX: break; }