From 607636d2ebb2bd983850b4ac20affef8ff918981 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:42 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Add __pkvm_hyp_donate_host()" This reverts commit 394b00e804bca2a4e5aaf2ce1265ea37a4f88d64. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I2431d37b0e202fd38c5f7ffb84995d7aa6fccb9b --- arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 1 - arch/arm64/kvm/hyp/nvhe/mem_protect.c | 32 ------------------- 2 files changed, 33 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h index c1cea5a5dbc4..726e37d57af6 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -57,7 +57,6 @@ int __pkvm_prot_finalize(void); int __pkvm_host_share_hyp(u64 pfn); int __pkvm_host_unshare_hyp(u64 pfn); int __pkvm_host_donate_hyp(u64 pfn, u64 nr_pages); -int __pkvm_hyp_donate_host(u64 pfn, u64 nr_pages); bool addr_is_memory(phys_addr_t phys); int host_stage2_idmap_locked(phys_addr_t addr, u64 size, enum kvm_pgtable_prot prot); diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index 4b7a5cc58418..052d59b5b9e4 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -1069,35 +1069,3 @@ int __pkvm_host_donate_hyp(u64 pfn, u64 nr_pages) return ret; } - -int __pkvm_hyp_donate_host(u64 pfn, u64 nr_pages) -{ - int ret; - u64 host_addr = hyp_pfn_to_phys(pfn); - u64 hyp_addr = (u64)__hyp_va(host_addr); - struct pkvm_mem_donation donation = { - .tx = { - .nr_pages = nr_pages, - .initiator = { - .id = PKVM_ID_HYP, - .addr = hyp_addr, - .hyp = { - .completer_addr = host_addr, - }, - }, - .completer = { - .id = PKVM_ID_HOST, - }, - }, - }; - - host_lock_component(); - hyp_lock_component(); - - ret = do_donate(&donation); - - hyp_unlock_component(); - host_unlock_component(); - - return ret; -}