From a8bba661e3da5046a4e2df0fb54451b80776a4e4 Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Mon, 3 Apr 2023 10:09:36 +0000 Subject: [PATCH] ANDROID: KVM: arm64: Move kvm_pte_follow() to header We will soon need to use kvm_pte_follow() from outside pgtable.c, so move it to the header file as static inline. Bug: 264070847 Change-Id: I319dff1b352a4acd8d9a5cc74acb5f1758be358f Signed-off-by: Quentin Perret --- arch/arm64/include/asm/kvm_pgtable.h | 5 +++++ arch/arm64/kvm/hyp/pgtable.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h index f7d20769d799..55fa5403781a 100644 --- a/arch/arm64/include/asm/kvm_pgtable.h +++ b/arch/arm64/include/asm/kvm_pgtable.h @@ -167,6 +167,11 @@ struct kvm_pgtable_mm_ops { void (*icache_inval_pou)(void *addr, size_t size); }; +static inline kvm_pte_t *kvm_pte_follow(kvm_pte_t pte, struct kvm_pgtable_mm_ops *mm_ops) +{ + return mm_ops->phys_to_virt(kvm_pte_to_phys(pte)); +} + /** * enum kvm_pgtable_stage2_flags - Stage-2 page-table flags. * @KVM_PGTABLE_S2_NOFWB: Don't enforce Normal-WB even if the CPUs have diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index a5fbfeb85451..23df444d8f73 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -76,11 +76,6 @@ static u32 kvm_pgd_pages(u32 ia_bits, u32 start_level) return __kvm_pgd_page_idx(&pgt, -1ULL) + 1; } -static kvm_pte_t *kvm_pte_follow(kvm_pte_t pte, struct kvm_pgtable_mm_ops *mm_ops) -{ - return mm_ops->phys_to_virt(kvm_pte_to_phys(pte)); -} - static void kvm_clear_pte(kvm_pte_t *ptep) { WRITE_ONCE(*ptep, 0);