Commit 23fe562e authored by Anup Patel's avatar Anup Patel Committed by Anup Patel
Browse files

RISC-V: KVM: Move sbi related struct and functions to kvm_vcpu_sbi.h 



Just like asm/kvm_vcpu_timer.h, we should have all sbi related struct
and functions in asm/kvm_vcpu_sbi.h.

Signed-off-by: default avatarAnup Patel <apatel@ventanamicro.com>
Reviewed-by: default avatarAtish Patra <atishp@rivosinc.com>
Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
parent e81af89b

arch/riscv/include/asm/kvm_host.h

+2 −8
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/hwcap.h>

#include <asm/kvm_vcpu_fp.h>

#include <asm/kvm_vcpu_insn.h>

#include <asm/kvm_vcpu_sbi.h>

#include <asm/kvm_vcpu_timer.h>



#define KVM_MAX_VCPUS			1024
@@ -94,10 +95,6 @@ struct kvm_arch { 
	struct kvm_guest_timer timer;

};



struct kvm_sbi_context {

	int return_handled;

};



struct kvm_cpu_trap {

	unsigned long sepc;

	unsigned long scause;
@@ -216,7 +213,7 @@ struct kvm_vcpu_arch { 
	struct kvm_csr_decode csr_decode;



	/* SBI context */

	struct kvm_sbi_context sbi_context;

	struct kvm_vcpu_sbi_context sbi_context;



	/* Cache pages needed to program page tables with spinlock held */

	struct kvm_mmu_memory_cache mmu_page_cache;
@@ -326,7 +323,4 @@ bool kvm_riscv_vcpu_has_interrupts(struct kvm_vcpu *vcpu, unsigned long mask); 
void kvm_riscv_vcpu_power_off(struct kvm_vcpu *vcpu);

void kvm_riscv_vcpu_power_on(struct kvm_vcpu *vcpu);



int kvm_riscv_vcpu_sbi_return(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_riscv_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run);



#endif /* __RISCV_KVM_HOST_H__ */

arch/riscv/include/asm/kvm_vcpu_sbi.h

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
#define KVM_SBI_VERSION_MAJOR 1

#define KVM_SBI_VERSION_MINOR 0



struct kvm_vcpu_sbi_context {

	int return_handled;

};



struct kvm_vcpu_sbi_extension {

	unsigned long extid_start;

	unsigned long extid_end;
@@ -31,7 +35,9 @@ void kvm_riscv_vcpu_sbi_forward(struct kvm_vcpu *vcpu, struct kvm_run *run); 
void kvm_riscv_vcpu_sbi_system_reset(struct kvm_vcpu *vcpu,

				     struct kvm_run *run,

				     u32 type, u64 flags);

int kvm_riscv_vcpu_sbi_return(struct kvm_vcpu *vcpu, struct kvm_run *run);

const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext(unsigned long extid);

int kvm_riscv_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run);



#ifdef CONFIG_RISCV_SBI_V01

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01;