Commit 3061725d authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: pkvm: Consolidate include files 



kvm_fixed_config.h is pkvm specific, and would be better placed
near its users. At the same time, include/nvhe/sys_regs.h is now
almost empty.

Merge the two into arch/arm64/kvm/hyp/include/nvhe/fixed_config.h.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Tested-by: default avatarFuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20211013120346.2926621-9-maz@kernel.org
parent 271b7286

arch/arm64/include/asm/kvm_fixed_config.h→arch/arm64/kvm/hyp/include/nvhe/fixed_config.h

+5 −0
Original line number Diff line number Diff line
@@ -192,4 +192,9 @@ 
	ARM64_FEATURE_MASK(ID_AA64ISAR1_I8MM) \

	)



u64 pvm_read_id_reg(const struct kvm_vcpu *vcpu, u32 id);

bool kvm_handle_pvm_sysreg(struct kvm_vcpu *vcpu, u64 *exit_code);

int kvm_check_pvm_sysreg_table(void);

void inject_undef64(struct kvm_vcpu *vcpu);



#endif /* __ARM64_KVM_FIXED_CONFIG_H__ */

arch/arm64/kvm/hyp/include/nvhe/sys_regs.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2021 Google LLC

 * Author: Fuad Tabba <tabba@google.com>

 */



#ifndef __ARM64_KVM_NVHE_SYS_REGS_H__

#define __ARM64_KVM_NVHE_SYS_REGS_H__



#include <asm/kvm_host.h>



u64 pvm_read_id_reg(const struct kvm_vcpu *vcpu, u32 id);

bool kvm_handle_pvm_sysreg(struct kvm_vcpu *vcpu, u64 *exit_code);

int kvm_check_pvm_sysreg_table(void);

void inject_undef64(struct kvm_vcpu *vcpu);



#endif /* __ARM64_KVM_NVHE_SYS_REGS_H__ */

arch/arm64/kvm/hyp/nvhe/pkvm.c

+1 −2
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ 


#include <linux/kvm_host.h>

#include <linux/mm.h>

#include <asm/kvm_fixed_config.h>

#include <nvhe/sys_regs.h>

#include <nvhe/fixed_config.h>

#include <nvhe/trap_handler.h>



/*

arch/arm64/kvm/hyp/nvhe/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 
#include <asm/kvm_pgtable.h>



#include <nvhe/early_alloc.h>

#include <nvhe/fixed_config.h>

#include <nvhe/gfp.h>

#include <nvhe/memory.h>

#include <nvhe/mem_protect.h>

#include <nvhe/mm.h>

#include <nvhe/sys_regs.h>

#include <nvhe/trap_handler.h>



struct hyp_pool hpool;

arch/arm64/kvm/hyp/nvhe/switch.c

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <asm/kprobes.h>

#include <asm/kvm_asm.h>

#include <asm/kvm_emulate.h>

#include <asm/kvm_fixed_config.h>

#include <asm/kvm_hyp.h>

#include <asm/kvm_mmu.h>

#include <asm/fpsimd.h>
@@ -28,8 +27,8 @@ 
#include <asm/processor.h>

#include <asm/thread_info.h>



#include <nvhe/fixed_config.h>

#include <nvhe/mem_protect.h>

#include <nvhe/sys_regs.h>



/* Non-VHE specific context */

DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data);