Commit 35906d23 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-riscv-fixes-6.0-1' of https://github.com/kvm-riscv/linux into HEAD 

KVM/riscv fixes for 6.0, take #1

- Fix unused variable warnings in vcpu_timer.c
- Move extern sbi_ext declarations to a header
parents 22c6a0ef 3e5e56c6

arch/riscv/include/asm/kvm_vcpu_sbi.h

+12 −0
Original line number Diff line number Diff line
@@ -33,4 +33,16 @@ void kvm_riscv_vcpu_sbi_system_reset(struct kvm_vcpu *vcpu, 
				     u32 type, u64 flags);

const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext(unsigned long extid);



#ifdef CONFIG_RISCV_SBI_V01

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01;

#endif

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_base;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_time;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_ipi;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_rfence;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_srst;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_hsm;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor;



#endif /* __RISCV_KVM_VCPU_SBI_H__ */

arch/riscv/kvm/vcpu_sbi.c

+1 −11
Original line number Diff line number Diff line
@@ -32,23 +32,13 @@ static int kvm_linux_err_map_sbi(int err) 
	};

}



#ifdef CONFIG_RISCV_SBI_V01

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01;

#else

#ifndef CONFIG_RISCV_SBI_V01

static const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01 = {

	.extid_start = -1UL,

	.extid_end = -1UL,

	.handler = NULL,

};

#endif

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_base;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_time;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_ipi;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_rfence;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_srst;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_hsm;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor;



static const struct kvm_vcpu_sbi_extension *sbi_ext[] = {

	&vcpu_sbi_ext_v01,

arch/riscv/kvm/vcpu_timer.c

+0 −4
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ static void kvm_riscv_vcpu_update_timedelta(struct kvm_vcpu *vcpu) 


void kvm_riscv_vcpu_timer_restore(struct kvm_vcpu *vcpu)

{

	struct kvm_vcpu_csr *csr;

	struct kvm_vcpu_timer *t = &vcpu->arch.timer;



	kvm_riscv_vcpu_update_timedelta(vcpu);
@@ -307,7 +306,6 @@ void kvm_riscv_vcpu_timer_restore(struct kvm_vcpu *vcpu) 
	if (!t->sstc_enabled)

		return;



	csr = &vcpu->arch.guest_csr;

#if defined(CONFIG_32BIT)

	csr_write(CSR_VSTIMECMP, (u32)t->next_cycles);

	csr_write(CSR_VSTIMECMPH, (u32)(t->next_cycles >> 32));
@@ -324,13 +322,11 @@ void kvm_riscv_vcpu_timer_restore(struct kvm_vcpu *vcpu) 


void kvm_riscv_vcpu_timer_save(struct kvm_vcpu *vcpu)

{

	struct kvm_vcpu_csr *csr;

	struct kvm_vcpu_timer *t = &vcpu->arch.timer;



	if (!t->sstc_enabled)

		return;



	csr = &vcpu->arch.guest_csr;

	t = &vcpu->arch.timer;

#if defined(CONFIG_32BIT)

	t->next_cycles = csr_read(CSR_VSTIMECMP);