Move arm64 arch specific definitions in memory.h to asm/kvm_pkvm.h
and remove unnecessary asm/kvm_hyp.h including in page_alloc.c.
Then memory.h and page_alloc.c are arch agostic and can be moved
to general dir.
Signed-off-by: Jason Chen CJ <jason.cj.chen@xxxxxxxxx>
---
arch/arm64/include/asm/kvm_pkvm.h | 3 +++
arch/arm64/kvm/hyp/include/nvhe/memory.h | 4 +---
arch/arm64/kvm/hyp/nvhe/page_alloc.c | 1 -
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_pkvm.h b/arch/arm64/include/asm/kvm_pkvm.h
index 01129b0d4c68..2cc283feb97d 100644
--- a/arch/arm64/include/asm/kvm_pkvm.h
+++ b/arch/arm64/include/asm/kvm_pkvm.h
@@ -8,12 +8,15 @@
#include <linux/memblock.h>
#include <asm/kvm_pgtable.h>
+#include <asm/kvm_mmu.h>
/* Maximum number of VMs that can co-exist under pKVM. */
#define KVM_MAX_PVMS 255
#define HYP_MEMBLOCK_REGIONS 128
+#define __hyp_va(phys) ((void *)((phys_addr_t)(phys) - hyp_physvirt_offset))
+
int pkvm_init_host_vm(struct kvm *kvm);
int pkvm_create_hyp_vm(struct kvm *kvm);
void pkvm_destroy_hyp_vm(struct kvm *kvm);
diff --git a/arch/arm64/kvm/hyp/include/nvhe/memory.h b/arch/arm64/kvm/hyp/include/nvhe/memory.h
index ab205c4d6774..e7d05f41ddf2 100644
--- a/arch/arm64/kvm/hyp/include/nvhe/memory.h
+++ b/arch/arm64/kvm/hyp/include/nvhe/memory.h
@@ -2,7 +2,7 @@
#ifndef __KVM_HYP_MEMORY_H
#define __KVM_HYP_MEMORY_H
-#include <asm/kvm_mmu.h>
+#include <asm/kvm_pkvm.h>
#include <asm/page.h>
#include <linux/types.h>
@@ -15,8 +15,6 @@ struct hyp_page {
extern u64 __hyp_vmemmap;
#define hyp_vmemmap ((struct hyp_page *)__hyp_vmemmap)
-#define __hyp_va(phys) ((void *)((phys_addr_t)(phys) - hyp_physvirt_offset))
-
static inline void *hyp_phys_to_virt(phys_addr_t phys)
{
return __hyp_va(phys);
diff --git a/arch/arm64/kvm/hyp/nvhe/page_alloc.c b/arch/arm64/kvm/hyp/nvhe/page_alloc.c
index 803ba3222e75..ef164102ab6a 100644
--- a/arch/arm64/kvm/hyp/nvhe/page_alloc.c
+++ b/arch/arm64/kvm/hyp/nvhe/page_alloc.c
@@ -4,7 +4,6 @@
* Author: Quentin Perret <qperret@xxxxxxxxxx>
*/
-#include <asm/kvm_hyp.h>
#include <nvhe/gfp.h>
u64 __hyp_vmemmap;
--
2.25.1
