Commit 87a45e07 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S: Replace reset_msr mmu op with inject_interrupt arch op 



reset_msr sets the MSR for interrupt injection, but it's cleaner and
more flexible to provide a single op to set both MSR and PC for the
interrupt.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 9ee6471e

arch/powerpc/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -401,7 +401,6 @@ struct kvmppc_mmu { 
	u32  (*mfsrin)(struct kvm_vcpu *vcpu, u32 srnum);

	int  (*xlate)(struct kvm_vcpu *vcpu, gva_t eaddr,

		      struct kvmppc_pte *pte, bool data, bool iswrite);

	void (*reset_msr)(struct kvm_vcpu *vcpu);

	void (*tlbie)(struct kvm_vcpu *vcpu, ulong addr, bool large);

	int  (*esid_to_vsid)(struct kvm_vcpu *vcpu, ulong esid, u64 *vsid);

	u64  (*ea_to_vp)(struct kvm_vcpu *vcpu, gva_t eaddr, bool data);

arch/powerpc/include/asm/kvm_ppc.h

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ struct kvmppc_ops { 
			   union kvmppc_one_reg *val);

	void (*vcpu_load)(struct kvm_vcpu *vcpu, int cpu);

	void (*vcpu_put)(struct kvm_vcpu *vcpu);

	void (*inject_interrupt)(struct kvm_vcpu *vcpu, int vec, u64 srr1_flags);

	void (*set_msr)(struct kvm_vcpu *vcpu, u64 msr);

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

	struct kvm_vcpu *(*vcpu_create)(struct kvm *kvm, unsigned int id);

arch/powerpc/kvm/book3s.c

+1 −26
Original line number Diff line number Diff line
@@ -74,27 +74,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 
	{ NULL }

};



void kvmppc_unfixup_split_real(struct kvm_vcpu *vcpu)

{

	if (vcpu->arch.hflags & BOOK3S_HFLAG_SPLIT_HACK) {

		ulong pc = kvmppc_get_pc(vcpu);

		ulong lr = kvmppc_get_lr(vcpu);

		if ((pc & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS)

			kvmppc_set_pc(vcpu, pc & ~SPLIT_HACK_MASK);

		if ((lr & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS)

			kvmppc_set_lr(vcpu, lr & ~SPLIT_HACK_MASK);

		vcpu->arch.hflags &= ~BOOK3S_HFLAG_SPLIT_HACK;

	}

}

EXPORT_SYMBOL_GPL(kvmppc_unfixup_split_real);



static inline unsigned long kvmppc_interrupt_offset(struct kvm_vcpu *vcpu)

{

	if (!is_kvmppc_hv_enabled(vcpu->kvm))

		return to_book3s(vcpu)->hior;

	return 0;

}



static inline void kvmppc_update_int_pending(struct kvm_vcpu *vcpu,

			unsigned long pending_now, unsigned long old_pending)

{
@@ -134,11 +113,7 @@ static inline bool kvmppc_critical_section(struct kvm_vcpu *vcpu) 


void kvmppc_inject_interrupt(struct kvm_vcpu *vcpu, int vec, u64 flags)

{

	kvmppc_unfixup_split_real(vcpu);

	kvmppc_set_srr0(vcpu, kvmppc_get_pc(vcpu));

	kvmppc_set_srr1(vcpu, (kvmppc_get_msr(vcpu) & SRR1_MSR_BITS) | flags);

	kvmppc_set_pc(vcpu, kvmppc_interrupt_offset(vcpu) + vec);

	vcpu->arch.mmu.reset_msr(vcpu);

	vcpu->kvm->arch.kvm_ops->inject_interrupt(vcpu, vec, flags);

}



static int kvmppc_book3s_vec2irqprio(unsigned int vec)

arch/powerpc/kvm/book3s_32_mmu.c

+0 −6
Original line number Diff line number Diff line
@@ -90,11 +90,6 @@ static u64 kvmppc_mmu_book3s_32_ea_to_vp(struct kvm_vcpu *vcpu, gva_t eaddr, 
	return (((u64)eaddr >> 12) & 0xffff) | (vsid << 16);

}



static void kvmppc_mmu_book3s_32_reset_msr(struct kvm_vcpu *vcpu)

{

	kvmppc_set_msr(vcpu, 0);

}



static hva_t kvmppc_mmu_book3s_32_get_pteg(struct kvm_vcpu *vcpu,

				      u32 sre, gva_t eaddr,

				      bool primary)
@@ -406,7 +401,6 @@ void kvmppc_mmu_book3s_32_init(struct kvm_vcpu *vcpu) 
	mmu->mtsrin = kvmppc_mmu_book3s_32_mtsrin;

	mmu->mfsrin = kvmppc_mmu_book3s_32_mfsrin;

	mmu->xlate = kvmppc_mmu_book3s_32_xlate;

	mmu->reset_msr = kvmppc_mmu_book3s_32_reset_msr;

	mmu->tlbie = kvmppc_mmu_book3s_32_tlbie;

	mmu->esid_to_vsid = kvmppc_mmu_book3s_32_esid_to_vsid;

	mmu->ea_to_vp = kvmppc_mmu_book3s_32_ea_to_vp;

arch/powerpc/kvm/book3s_64_mmu.c

+0 −15
Original line number Diff line number Diff line
@@ -24,20 +24,6 @@ 
#define dprintk(X...) do { } while(0)

#endif



static void kvmppc_mmu_book3s_64_reset_msr(struct kvm_vcpu *vcpu)

{

	unsigned long msr = vcpu->arch.intr_msr;

	unsigned long cur_msr = kvmppc_get_msr(vcpu);



	/* If transactional, change to suspend mode on IRQ delivery */

	if (MSR_TM_TRANSACTIONAL(cur_msr))

		msr |= MSR_TS_S;

	else

		msr |= cur_msr & MSR_TS_MASK;



	kvmppc_set_msr(vcpu, msr);

}



static struct kvmppc_slb *kvmppc_mmu_book3s_64_find_slbe(

				struct kvm_vcpu *vcpu,

				gva_t eaddr)
@@ -676,7 +662,6 @@ void kvmppc_mmu_book3s_64_init(struct kvm_vcpu *vcpu) 
	mmu->slbie = kvmppc_mmu_book3s_64_slbie;

	mmu->slbia = kvmppc_mmu_book3s_64_slbia;

	mmu->xlate = kvmppc_mmu_book3s_64_xlate;

	mmu->reset_msr = kvmppc_mmu_book3s_64_reset_msr;

	mmu->tlbie = kvmppc_mmu_book3s_64_tlbie;

	mmu->esid_to_vsid = kvmppc_mmu_book3s_64_esid_to_vsid;

	mmu->ea_to_vp = kvmppc_mmu_book3s_64_ea_to_vp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE